[jboss-cvs] JBossAS SVN: r87393 - in trunk: main and 1 other directory.

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

Author: pgier
Date: 2009-04-15 18:12:41 -0400 (Wed, 15 Apr 2009)
New Revision: 87393

Modified:
   trunk/build/build-distr.xml
   trunk/main/pom.xml
Log:
[JBBUILD-520] Remove intermediate build directory for main module.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-04-15 21:23:04 UTC (rev 87392)
+++ trunk/build/build-distr.xml	2009-04-15 22:12:41 UTC (rev 87393)
@@ -292,35 +292,28 @@
 
   <target name="_module-main-most">
     <property name="_module.name" value="main" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
 
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.lib}"/>
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="log4j-boot.jar"/>
-        <include name="jboss-main.jar"/>
-      </fileset>
-    </copy>
+    <copy file="${_module.output}/jboss-as-main.jar" 
+      tofile="${install.lib}/jboss-main.jar" filtering="no"/>
+    <copy file="${_module.output}/jboss-as-main-log4j-boot.jar" 
+      tofile="${install.lib}/log4j-boot.jar" filtering="no"/>
 
     <!-- Copy the generated client -->
     <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="*-client.jar"/>
-      </fileset>
-    </copy>
-
+    <copy file="${_module.output}/jboss-as-main-client.jar" 
+      tofile="${install.client}/jboss-main-client.jar" filtering="no"/>
+    
     <!-- Copy the generated scripts & runnable jars -->
     <mkdir dir="${install.bin}"/>
     <copy todir="${install.bin}" filtering="no">
       <fileset dir="${_module.output}/bin">
         <include name="**/*"/>
       </fileset>
-      <fileset dir="${_module.output}/lib">
-        <include name="run.jar"/>
-      </fileset>
     </copy>
+    <copy file="${_module.output}/jboss-as-main-run.jar" tofile="${install.bin}/run.jar"/>
     <chmod perm="+x">
       <fileset dir="${install.bin}">
         <include name="**/*.sh"/>

Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml	2009-04-15 21:23:04 UTC (rev 87392)
+++ trunk/main/pom.xml	2009-04-15 22:12:41 UTC (rev 87393)
@@ -14,6 +14,7 @@
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (main module)</description>
   <build>
+    <finalName>${artifactId}</finalName>
     <sourceDirectory>src/main</sourceDirectory>
     <plugins>
       <plugin>
@@ -95,78 +96,49 @@
                 <filter token="os.arch" value="${os.arch}"/>
                 <filter token="os.version" value="${os.version}"/>
                                 
-                <mkdir dir="output/etc"/>
-                <copy todir="output/etc" filtering="yes">
+                <mkdir dir="target/etc"/>
+                <copy todir="target/etc" filtering="yes">
                   <fileset dir="src/etc">
                   </fileset>
                 </copy>
 
-                <mkdir dir="output/resources"/>
-                <copy todir="output/resources" filtering="yes">
+                <mkdir dir="target/resources"/>
+                <copy todir="target/resources" filtering="yes">
                   <fileset dir="src/resources">
                   </fileset>
                 </copy>
 
-                <jar destfile="target/${artifactId}-${version}-run.jar"
-                     basedir="output/resources"
+                <jar destfile="target/jboss-as-main-run.jar"
+                     basedir="target/resources"
                      includes="org/jboss/version.properties"
                      update="true"/>
                 
-                <mkdir dir="output/bin"/>
-                <copy todir="output/bin" filtering="yes">
+                <mkdir dir="target/bin"/>
+                <copy todir="target/bin" filtering="yes">
                   <fileset dir="src/bin">
                     <include name="**/*"/>
                   </fileset>
                 </copy>
                 
-                <fixcrlf srcdir="output/bin"
+                <fixcrlf srcdir="target/bin"
                   eol="lf" eof="remove"
                   includes="**/*.sh, **/*.conf"/>
               
-                <fixcrlf srcdir="output/bin"
+                <fixcrlf srcdir="target/bin"
                   eol="crlf" eof="remove"
                   includes="**/*.bat, **/*.cmd"/>
               
                 <chmod perm="+x">
-                  <fileset dir="output/bin">
+                  <fileset dir="target/bin">
                     <include name="**/*.sh"/>
                   </fileset>
                 </chmod>
                 
-                <mkdir dir="output/lib"/>
-                <copy file="target/${artifactId}-${version}.jar"
-                      tofile="output/lib/jboss-main.jar"/>
-                <copy file="target/${artifactId}-${version}-client.jar"
-                      tofile="output/lib/jboss-main-client.jar"/>
-                <copy file="target/${artifactId}-${version}-log4j-boot.jar"
-                      tofile="output/lib/log4j-boot.jar"/>
-                <copy file="target/${artifactId}-${version}-run.jar"
-                      tofile="output/lib/run.jar"/>
               </tasks>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-output</id>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>output</directory>
-                </fileset>
-              </filesets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>