[jboss-cvs] JBossAS SVN: r103918 - trunk/dist/src/assembly.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-04-13 12:32:31 -0400 (Tue, 13 Apr 2010)
New Revision: 103918

Modified:
   trunk/dist/src/assembly/jboss-dist-src.xml
   trunk/dist/src/assembly/jboss-dist.xml
Log:
[JBAS-7931] Properly package the AS distribution ZIP

Modified: trunk/dist/src/assembly/jboss-dist-src.xml
===================================================================
--- trunk/dist/src/assembly/jboss-dist-src.xml	2010-04-13 16:04:21 UTC (rev 103917)
+++ trunk/dist/src/assembly/jboss-dist-src.xml	2010-04-13 16:32:31 UTC (rev 103918)
@@ -7,7 +7,7 @@
   <fileSets>
     <fileSet>
       <directory>..</directory>
-      <outputDirectory>${project.build.dir}/jboss-${project.version}-src</outputDirectory>
+      <outputDirectory>jboss-${project.version}-src</outputDirectory>
       <excludes>
         <exclude>**/target/**</exclude>
         <exclude>**/output/**</exclude>
@@ -16,7 +16,7 @@
     </fileSet>
     <fileSet>
       <directory>..</directory>
-      <outputDirectory>${project.build.dir}/jboss-${project.version}-src</outputDirectory>
+      <outputDirectory>jboss-${project.version}-src</outputDirectory>
       <includes>
         <include>tools/**/bin/*</include>
       </includes>

Modified: trunk/dist/src/assembly/jboss-dist.xml
===================================================================
--- trunk/dist/src/assembly/jboss-dist.xml	2010-04-13 16:04:21 UTC (rev 103917)
+++ trunk/dist/src/assembly/jboss-dist.xml	2010-04-13 16:32:31 UTC (rev 103918)
@@ -7,7 +7,7 @@
   <fileSets>
     <fileSet>
       <directory>${basedir}/../build/target/jboss-${project.version}</directory>
-      <outputDirectory>${project.build.dir}/jboss-${project.version}</outputDirectory>
+      <outputDirectory>jboss-${project.version}</outputDirectory>
       <excludes>
         <exclude>**/data/**</exclude>
         <exclude>**/log/**</exclude>
@@ -18,7 +18,7 @@
     </fileSet>
     <fileSet>
       <directory>${basedir}/../build/target/jboss-${project.version}</directory>
-      <outputDirectory>${project.build.dir}/jboss-${project.version}</outputDirectory>
+      <outputDirectory>jboss-${project.version}</outputDirectory>
       <includes>
         <include>bin/*</include>
       </includes>
@@ -26,7 +26,7 @@
     </fileSet>
     <fileSet>
       <directory>docs</directory>
-      <outputDirectory>${project.build.dir}/jboss-${project.version}</outputDirectory>
+      <outputDirectory>jboss-${project.version}</outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>