[jboss-cvs] JBossAS SVN: r90596 - in trunk: thirdparty and 1 other directories.

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

Author: pgier
Date: 2009-06-25 11:03:20 -0400 (Thu, 25 Jun 2009)
New Revision: 90596

Modified:
   trunk/testsuite/build.xml
   trunk/thirdparty/pom.xml
   trunk/tools/etc/buildmagic/aliases.ent
Log:
[JBBUILD-531] Remove use of testsuite-libraries.ent

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-06-25 15:02:24 UTC (rev 90595)
+++ trunk/testsuite/build.xml	2009-06-25 15:03:20 UTC (rev 90596)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE project [
    <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
-   <!ENTITY testsuite-libraries SYSTEM "../thirdparty/testsuite-libraries.ent">
    <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
 ]>
 
@@ -111,7 +110,6 @@
    <!-- ========= -->
 
    &libraries;
-   &testsuite-libraries;
 
   <!-- ======= -->
   <!-- Modules -->
@@ -125,6 +123,7 @@
     <path id="library.classpath">
       <path refid="apache.avalon.classpath"/>
       <path refid="apache.commons.classpath"/>
+      <fileset refid="apache-httpclient:commons-httpclient:jar"/>
       <path refid="apache.codec.classpath"/>
       <path refid="apache.log4j.classpath"/>
       <path refid="apache.jaxme.classpath"/>
@@ -132,7 +131,7 @@
       <path refid="apache.xerces.classpath"/>
       <path refid="org.apache.classpath"/>
       <path refid="dom4j.dom4j.classpath"/>
-      <path refid="httpunit.httpunit.classpath"/>
+      <fileset refid="httpunit:httpunit:jar"/>
       <path refid="ibm.wsdl4j.classpath"/>
       <path refid="jacorb.jacorb.classpath"/>
       <path refid="jboss.cache.jbosscache.core.classpath"/>
@@ -369,12 +368,13 @@
       <propertyref prefix="jbosstest."/>
    </propertyset>
 
-  <target name="init-maven-ant-tasks">
+  <target name="init-maven-ant-tasks" unless="maven.ant.tasks.initialized">
     <path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.1.0-SNAPSHOT.jar" />
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="antlib:org.apache.maven.artifact.ant"
              classpathref="maven-ant-tasks.classpath" />
 
+    <property name="maven.ant.tasks.initialized" value="true"/>
   </target>
                
   <target name="init-dependencies" depends="init-maven-ant-tasks">

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-06-25 15:02:24 UTC (rev 90595)
+++ trunk/thirdparty/pom.xml	2009-06-25 15:03:20 UTC (rev 90596)
@@ -81,21 +81,6 @@
               <copySources>true</copySources>
             </configuration>
           </execution>
-          <execution>
-            <id>build-thirparty-testsuite</id>
-            <goals>
-              <goal>build-thirdparty</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <librariesEnt>${basedir}/testsuite-libraries.ent</librariesEnt>
-              <aliasesEnt>${basedir}/../tools/etc/buildmagic/aliases.ent</aliasesEnt>
-              <includedScopes>
-                <scope>test</scope>
-              </includedScopes>
-              <copySources>true</copySources>
-            </configuration>
-          </execution>
         </executions>
         <configuration>
           <mappedDependencies>

Modified: trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- trunk/tools/etc/buildmagic/aliases.ent	2009-06-25 15:02:24 UTC (rev 90595)
+++ trunk/tools/etc/buildmagic/aliases.ent	2009-06-25 15:03:20 UTC (rev 90596)
@@ -4,7 +4,6 @@
 <path id="apache.commons.classpath">
   <pathelement path="${apache.collections.lib}/commons-collections.jar"/>
   <pathelement path="${apache.logging.lib}/commons-logging.jar"/>
-  <pathelement path="${apache.httpclient.lib}/commons-httpclient.jar"/>
   <pathelement path="${apache.discovery.lib}/commons-discovery.jar"/>
   <pathelement path="${apache.fileupload.lib}/commons-fileupload.jar"/>
   <pathelement path="${apache.lang.lib}/commons-lang.jar"/>