[jboss-cvs] JBossAS SVN: r99666 - in trunk: build/src/assembly and 1 other directories.

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

Author: pgier
Date: 2010-01-20 12:49:27 -0500 (Wed, 20 Jan 2010)
New Revision: 99666

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/build/src/assembly/jboss-dist.xml
   trunk/testsuite/imports/server-config.xml
Log:
[JBBUILD-585] Don't use the antrun plugin during a clean.  Move dist build into "target" dir instead of "output"

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-01-20 15:37:39 UTC (rev 99665)
+++ trunk/build/build.xml	2010-01-20 17:49:27 UTC (rev 99666)
@@ -86,7 +86,7 @@
     <property name="dist.module.name" value="jboss"/>
     <property name="dist.module.Name" value="JBoss Build"/>
     <property name="dist.module.version" value="${pom.project.version}"/>
-    <property name="dist.module.output" value="${basedir}/output"/>
+    <property name="dist.module.output" value="${basedir}/target"/>
 
     <!-- Install/Release structure -->
     <property name="install.id" value="${dist.module.name}-${dist.module.version}"/>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2010-01-20 15:37:39 UTC (rev 99665)
+++ trunk/build/pom.xml	2010-01-20 17:49:27 UTC (rev 99666)
@@ -711,14 +711,14 @@
       <artifactId>xercesImpl</artifactId>
       <optional>true</optional>
     </dependency>   
-      <dependency>
-       	<groupId>org.jboss.classpool</groupId>
-	<artifactId>jboss-classpool</artifactId>
-      </dependency>
-      <dependency>
-	<groupId>org.jboss.classpool</groupId>
-	<artifactId>jboss-classpool-jbosscl</artifactId>
-     </dependency> 
+    <dependency>
+     	<groupId>org.jboss.classpool</groupId>
+	    <artifactId>jboss-classpool</artifactId>
+    </dependency>
+    <dependency>
+	    <groupId>org.jboss.classpool</groupId>
+	    <artifactId>jboss-classpool-jbosscl</artifactId>
+    </dependency> 
     <!-- End dist dependencies -->
     
   </dependencies>
@@ -745,8 +745,8 @@
                   <goal>download-licenses</goal>
                 </goals>
                 <configuration>
-                  <outputDirectory>output/jboss-${project.version}/docs/licenses</outputDirectory>
-                  <licenseSummaryFile>output/jboss-${project.version}/docs/licenses/licenses.xml</licenseSummaryFile>
+                  <outputDirectory>${project.build.directory}/jboss-${project.version}/docs/licenses</outputDirectory>
+                  <licenseSummaryFile>${project.build.directory}/jboss-${project.version}/docs/licenses/licenses.xml</licenseSummaryFile>
                 </configuration>
               </execution>
             </executions>
@@ -770,20 +770,6 @@
                  </tasks>
                 </configuration>
               </execution>
-              <execution>
-                <id>clean</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <phase>clean</phase>
-                <configuration>
-                  <tasks>
-                    <ant antfile="build.xml">
-                      <target name="clean-dist"/>
-                    </ant>
-                 </tasks>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>

Modified: trunk/build/src/assembly/jboss-dist.xml
===================================================================
--- trunk/build/src/assembly/jboss-dist.xml	2010-01-20 15:37:39 UTC (rev 99665)
+++ trunk/build/src/assembly/jboss-dist.xml	2010-01-20 17:49:27 UTC (rev 99666)
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>output/jboss-${project.version}</directory>
+      <directory>${project.build.directory}/jboss-${project.version}</directory>
       <outputDirectory>/jboss-${project.version}</outputDirectory>
       <includes>
         <include>bin/*</include>

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2010-01-20 15:37:39 UTC (rev 99665)
+++ trunk/testsuite/imports/server-config.xml	2010-01-20 17:49:27 UTC (rev 99666)
@@ -10,7 +10,7 @@
       be valid for the platform.
    -->
    <property name="jboss.dist"
-      value="${project.root}${/}build${/}output${/}jboss-${version}"/>
+      value="${project.root}${/}build${/}target${/}jboss-${version}"/>
    <property name="jboss.test.deploy.dir"
       value="${project.root}${/}testsuite${/}output${/}lib"/>
    <!-- Override for non-Sun compatible JDK layouts -->