[Jboss-cvs] JBossAS SVN: r57029 - branches/Branch_4_0/build

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

Author: dimitris at jboss.org
Date: 2006-09-20 18:01:08 -0400 (Wed, 20 Sep 2006)
New Revision: 57029

Modified:
   branches/Branch_4_0/build/build-distr.xml
   branches/Branch_4_0/build/build-thirdparty.xml
Log:
JBAS-3666, remove the dom4j dependency from the jmx module, bundle a jarjar'ed dom4j in jboss-jmx.jar. dom4j moved from root lib to server/all|default/lib

Modified: branches/Branch_4_0/build/build-distr.xml
===================================================================
--- branches/Branch_4_0/build/build-distr.xml	2006-09-20 20:38:39 UTC (rev 57028)
+++ branches/Branch_4_0/build/build-distr.xml	2006-09-20 22:01:08 UTC (rev 57029)
@@ -541,9 +541,6 @@
       <fileset dir="${oswego.concurrent.lib}">
         <include name="concurrent.jar"/>
       </fileset>
-      <fileset dir="${dom4j.dom4j.lib}">
-        <include name="dom4j.jar"/>
-      </fileset>
     </copy>
 
     <!-- Copy the generated client libraries -->
@@ -1227,7 +1224,7 @@
          <include name="jsr88-service.xml"/>
        </fileset>
      </copy>
-
+    
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -1471,6 +1468,10 @@
       <fileset dir="${cglib.lib}">
         <include name="cglib.jar"/>
       </fileset>
+      <!-- Used by deployment & console modules -->
+      <fileset dir="${dom4j.dom4j.lib}">
+        <include name="dom4j.jar"/>
+      </fileset>
     </copy>
 
     <!-- install thirdparty items to install/bin -->

Modified: branches/Branch_4_0/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_0/build/build-thirdparty.xml	2006-09-20 20:38:39 UTC (rev 57028)
+++ branches/Branch_4_0/build/build-thirdparty.xml	2006-09-20 22:01:08 UTC (rev 57029)
@@ -74,7 +74,7 @@
       <componentref name="apache-xmlsec" version="1.3.0"/>
       <componentref name="cglib" version="2.1.3.nodep"/>
       <componentref name="beanshell" version="1.3.0"/>
-      <componentref name="dom4j" version="1.6.1jboss"/>
+      <componentref name="dom4j" version="1.6.1"/>
       <componentref name="gjt-jpl-util" version="1.0"/>
       <componentref name="gnu-getopt" version="1.0.10"/>
       <componentref name="hibernate" version="3.2.0.CR4"/>
@@ -84,17 +84,17 @@
       <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
       <componentref name="jacorb" version="2.2.4jboss.patch1"/>
       <componentref name="javassist" version="3.3.0.GA"/>
-      <componentref name="jaxen" version="1.1beta4"/>
       <componentref name="jboss/aop" version="1.5.1.GA"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="1.4.0.SP1"/>
-      <componentref name="jboss/microcontainer" version="1.0.2"/>
+      <componentref name="jboss/common" version="snapshot-Branch_1_0"/>
+      <componentref name="jboss/dom4j-jarjar" version="1.6.1"/>        
       <componentref name="jboss/jbossretro-rt" version="1.0.2.GA"/>
       <componentref name="jboss/jbossws" version="1.0.3.GA"/>
       <componentref name="jboss/jbossws14" version="1.0.3.GA"/>
       <componentref name="jboss/jboss-ws4ee" version="4.0.4.SP1"/>
       <componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
-      <componentref name="jboss/common" version="1.0.0.CR1"/>
+      <componentref name="jboss/microcontainer" version="1.0.2"/>      
       <componentref name="jboss/remoting" version="1.4.3.GA"/>
       <componentref name="jboss/serialization" version="1.0.2.GA"/>
       <componentref name="jfreechart" version="0.9.20"/>