appassembler-maven-plugin up to 1.7, better x64 selection for deamon

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1583496 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 208654ec7ac37b16f8c0eaf6f5eee2246c120c83..1c3fff3cff3421e5034278b59124f3ad249ef987 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -98,8 +98,9 @@
        <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.0</version>
+        <version>1.7</version>
         <configuration>
+          <configurationDirectory>conf</configurationDirectory>  
           <daemons>
             <daemon>
               <id>archiva</id>
@@ -163,6 +164,7 @@
                     <include>solaris-sparc-32</include>
                     <include>solaris-sparc-64</include>
                     <include>windows-x86-32</include>
+                    <include>windows-x86-64</include>
                   </includes>
                 </generatorConfiguration>
               </generatorConfigurations>

diff --git a/archiva-jetty/src/main/assembly/bin.xml b/archiva-jetty/src/main/assembly/bin.xml
index 0e3206dfa03c49dbca95de11a02abe0da95a6aef..bdf8b7c7e7f11333885043fa81182a8c5671df8d 100644 (file)
--- a/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-jetty/src/main/assembly/bin.xml
@@ -82,6 +82,7 @@
       <outputDirectory>bin</outputDirectory>
       <includes>   
         <include>wrapper-windows-x86-32.exe</include>
+        <include>wrapper-windows-x86-64.exe</include>
       </includes>
       <fileMode>0755</fileMode>
     </fileSet>