[Jboss-cvs] JBossAS SVN: r54981 - trunk/build

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

Author: scott.stark at jboss.org
Date: 2006-08-01 11:55:34 -0400 (Tue, 01 Aug 2006)
New Revision: 54981

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
Synch up with the binary versions used in jboss4.0.x

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-08-01 15:53:09 UTC (rev 54980)
+++ trunk/build/build-distr.xml	2006-08-01 15:55:34 UTC (rev 54981)
@@ -1716,7 +1716,7 @@
   <target name="_module-hibernate-int-most">
     <property name="_module.name" value="hibernate-int" override="true"/>
     <property name="_module.output" override="true"
-              value="${project.root}/${_module.name}/output"/>
+        value="${project.root}/${_module.name}/output"/>
 
     <mkdir dir="${install.all.lib}"/>
 
@@ -1730,35 +1730,37 @@
       <fileset dir="${hibernate.lib}" includes="*.jar" />
     </copy>
 
+    <!-- ASM jars (cglib dependency)
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${asm.asm.lib}" includes="*.jar" />
     </copy>
+    -->
 
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar" />
-    </copy>
-
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.annotations.lib}" includes="*.jar" />
-    </copy>
-
     <!-- ANTLR jar -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${antlr.antlr.lib}" includes="*.jar" />
     </copy>
+    <!-- Copy the generated client libraries -->
+    <mkdir dir="${install.client}"/>
+    <copy todir="${install.client}" filtering="no">
+      <fileset dir="${antlr.antlr.lib}" includes="*.jar" />
+    </copy>
 
-    <!-- CGLIB jar -->
+    <!-- CGLIB jar
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${cglib.lib}" includes="*.jar"/>
     </copy>
+    -->
 
     <!-- Commons collections jar -->
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${apache.collections.lib}" includes="commons-collections*"/>
+      <fileset dir="${apache.collections.lib}" includes="*.jar"/>
     </copy>
 
   </target>
 
+
+
   <target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
     <!-- Copy the generated javadocs -->
     <mkdir dir="${install.api}/${_module.name}"/>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2006-08-01 15:53:09 UTC (rev 54980)
+++ trunk/build/build-thirdparty.xml	2006-08-01 15:55:34 UTC (rev 54981)
@@ -50,19 +50,16 @@
       <componentref name="apache-bcel" version="5.1"/>
       <componentref name="apache-beanutils" version="1.7.0"/>
       <componentref name="apache-bsf" version="2.3.0"/>
-      <componentref name="apache-codec" version="1.2.0"/>
-      <componentref name="apache-collections" version="2.1"/>
+      <componentref name="apache-codec" version="1.3.0"/>
+      <componentref name="apache-collections" version="3.1"/>
       <componentref name="apache-digester" version="1.6"/>
       <componentref name="apache-discovery" version="0.2"/>
       <componentref name="apache-fileupload" version="1.0"/>
       <componentref name="apache-httpclient" version="2.0.2"/>
       <componentref name="apache-jaxme" version="0.2-cvs"/>      
-      <componentref name="apache-lang" version="2.0"/>
       <componentref name="apache-log4j" version="1.2.8"/>
       <componentref name="apache-logging" version="1.0.5.GA-jboss"/>
-      <componentref name="apache-logging-api" version="1.0.3"/>
-      <componentref name="apache-myfaces" version="1.1.1"/>
-      <componentref name="apache-oro" version="2.0.8"/>
+      <componentref name="apache-myfaces" version="1.1.3"/>
       <componentref name="apache-pool" version="1.0.1"/>
       <componentref name="apache-scout" version="0.7rc1"/>
       <componentref name="apache-slide" version="2.0"/>
@@ -70,16 +67,16 @@
       <componentref name="apache-taglibs" version="1.1.2"/>
       <componentref name="apache-tomcat" version="6.0-snapshot"/>
       <componentref name="apache-validator" version="1.1.3"/>
-      <componentref name="apache-velocity" version="1.4"/>
+      <componentref name="apache-velocity" version="1.4jboss"/>
       <componentref name="apache-vfs" version="1.0-dev"/>
       <componentref name="apache-xalan" version="j_2.7.0"/>
       <componentref name="apache-xerces" version="2.7.1"/>
       <componentref name="apache-xmlsec" version="1.3.0"/>
       <componentref name="asm" version="1.5.3"/>
       <componentref name="beanshell" version="1.3.0"/>
-      <componentref name="cglib" version="2.1.3"/>
+      <componentref name="cglib" version="2.1.3.nodep"/>
       <componentref name="codehaus-stax" version="1.1.1"/>
-      <componentref name="dom4j" version="1.5"/>
+      <componentref name="dom4j" version="1.6.1jboss"/>
       <componentref name="easymock" version="1.1"/>
       <componentref name="ehcache" version="1.2.0.GA"/>
       <componentref name="gjt-jpl-util" version="1.0"/>
@@ -118,7 +115,6 @@
       <componentref name="oswego-concurrent" version="1.3.4"/>
       <componentref name="quartz" version="1.5.2"/>
       <componentref name="qdox" version="1.4"/>
-      <componentref name="retrotranslator" version="0.9.6jboss"/>
       <componentref name="sleepycat" version="1.7.0"/>
       <componentref name="spring" version="2.0m3"/>
       <componentref name="struts-test-case" version="2.1.3"/>