[jboss-cvs] JBossAS SVN: r88447 - in trunk: tools/lib and 1 other directory.

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

Author: pgier
Date: 2009-05-08 11:22:23 -0400 (Fri, 08 May 2009)
New Revision: 88447

Removed:
   trunk/tools/lib/ant-contrib-1.0b3.jar
Modified:
   trunk/build/build.xml
Log:
Remove ant-contrib and other unused build code.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-05-08 15:21:04 UTC (rev 88446)
+++ trunk/build/build.xml	2009-05-08 15:22:23 UTC (rev 88447)
@@ -14,7 +14,8 @@
 
 <!-- $Id$ -->
 
-<project default="main" name="JBoss/Build">
+<project default="main" name="JBoss Build"
+         xmlns:maven="antlib:org.apache.maven.artifact.ant">
 
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
@@ -29,13 +30,6 @@
 
   &buildmagic;
 
-  <!-- Add the antcontrib tasks -->
-  <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-    <classpath>
-      <pathelement location="${basedir}/../tools/lib/ant-contrib-1.0b3.jar"/>
-    </classpath>
-  </taskdef>
-  
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
   <!-- ================================================================== -->
@@ -337,18 +331,6 @@
      | finished with a given module.
    -->
 
-   <!-- ======== -->
-   <!-- Test     -->
-   <!-- ======== -->
-
-   <target name="_module-test-most">
-     <ant antfile="build-distr.xml" target="_module-test-most"/>
-   </target>
-
-   <target name="_module-test-all" depends="_module-test-most">
-     <ant antfile="build-distr.xml" target="_module-test-all"/>
-   </target>
-
   <!-- ======== -->
   <!-- Remoting -->
   <!-- ======== -->
@@ -992,27 +974,6 @@
     <echo message="Maven Home set to ${maven.home}"/>
   </target>
   
-   <!-- Call maven to create the thirdparty folder from artifacts in the maven repository -->
-   <target name="createthirdparty" unless="inhibit.downloads"
-      depends="maven-init, init, check.inhibit.downloads, set.proxy">
-     
-      <property name="thirdparty.maven.opts" value=""/>
-
-      <maven basedir="${basedir}/../thirdparty" 
-             options="${thirdparty.maven.opts}" 
-             goal="generate-resources"
-             resultproperty="maven.thirdparty.result"/>
-      
-      <fail message="Unable to build thirdparty directory.  See maven output for details.">
-        <condition>
-          <not>
-            <equals arg1="${maven.thirdparty.result}" arg2="0"/>
-          </not>
-        </condition>
-      </fail>
-      
-   </target>
-
   <!-- Call maven to build the mavenized modules -->
   <target name="maven-install" description="Run the install goal against the maven build"
           depends="maven-init">
@@ -1055,13 +1016,6 @@
      
   </target>
 
-   <!-- check if thirdparty libraries are to be downloaded -->
-   <target name="check.inhibit.downloads">
-      <condition property="inhibit.downloads">
-         <istrue value="${nodownload}"/>
-      </condition>
-   </target>
-
    <!-- check if the the user has specied proxy settings -->
    <target name="check.proxy">
       <condition property="hasproxy">

Deleted: trunk/tools/lib/ant-contrib-1.0b3.jar
===================================================================
(Binary files differ)