[jboss-cvs] JBossAS SVN: r59213 - branches/Branch_4_2/build

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

Author: dimitris at jboss.org
Date: 2006-12-22 06:01:34 -0500 (Fri, 22 Dec 2006)
New Revision: 59213

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build.xml
Log:
JBAS-3955, commons-codec moves to server/xxx/lib as a dependency of commons-httpclient

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2006-12-22 11:01:05 UTC (rev 59212)
+++ branches/Branch_4_2/build/build-distr.xml	2006-12-22 11:01:34 UTC (rev 59213)
@@ -1374,6 +1374,9 @@
       <fileset dir="${apache.httpclient.lib}">
         <include name="commons-httpclient.jar"/>
       </fileset>
+      <fileset dir="${apache.codec.lib}">
+        <include name="commons-codec.jar"/>
+      </fileset>
       <fileset dir="${apache.logging.lib}">
         <include name="commons-logging.jar"/>
       </fileset>
@@ -1422,9 +1425,12 @@
       <fileset dir="${sun.javamail.lib}">
         <include name="mail.jar"/>
       </fileset>
-       <fileset dir="${apache.httpclient.lib}">
-         <include name="commons-httpclient.jar"/>
-       </fileset>
+      <fileset dir="${apache.httpclient.lib}">
+        <include name="commons-httpclient.jar"/>
+      </fileset>
+      <fileset dir="${apache.codec.lib}">
+        <include name="commons-codec.jar"/>
+      </fileset>
       <fileset dir="${jboss.common.lib}">
         <include name="jboss-common-client.jar"/>
         <include name="namespace.jar"/>
@@ -1447,38 +1453,40 @@
 
     <!-- copy thirdparty items to install/all/lib -->
     <mkdir dir="${install.all.lib}"/>
-      <copy todir="${install.all.lib}" filtering="no">
-        <fileset dir="${jboss.remoting.lib}">
-          <include name="jboss-remoting.jar"/>
-        </fileset>
-        <fileset dir="${jboss.serialization.lib}">
-          <include name="jboss-serialization.jar"/>
-        </fileset>
-        <fileset dir="${jboss.cache.lib}">
-          <include name="jboss-cache.jar"/>
-        </fileset>
-        <fileset dir="${javassist.javassist.lib}">
-          <include name="javassist.jar"/>
-        </fileset>
-        <fileset dir="${jboss.jbossretro.rt.lib}">
-          <include name="jbossretro-rt.jar"/>
-        </fileset>
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${jboss.remoting.lib}">
+        <include name="jboss-remoting.jar"/>
+      </fileset>
+      <fileset dir="${jboss.serialization.lib}">
+        <include name="jboss-serialization.jar"/>
+      </fileset>
+      <fileset dir="${jboss.cache.lib}">
+        <include name="jboss-cache.jar"/>
+      </fileset>
+      <fileset dir="${javassist.javassist.lib}">
+        <include name="javassist.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossretro.rt.lib}">
+        <include name="jbossretro-rt.jar"/>
+      </fileset>
       <fileset dir="${jboss.jbossws14.lib}">
         <include name="jboss-jaxrpc.jar"/>
         <include name="jboss-saaj.jar"/>
       </fileset>
-        <fileset dir="${jboss.backport.concurrent.lib}">
-          <include name="jboss-backport-concurrent.jar"/>
-        </fileset>
-        <fileset dir="${apache.httpclient.lib}">
-          <include name="commons-httpclient.jar"/>
-        </fileset>
-        <fileset dir="${apache.logging.lib}">
-          <include name="commons-logging.jar"/>
+      <fileset dir="${jboss.backport.concurrent.lib}">
+        <include name="jboss-backport-concurrent.jar"/>
       </fileset>
+      <fileset dir="${apache.httpclient.lib}">
+        <include name="commons-httpclient.jar"/>
+      </fileset>
+      <fileset dir="${apache.codec.lib}">
+        <include name="commons-codec.jar"/>
+      </fileset>
+      <fileset dir="${apache.logging.lib}">
+        <include name="commons-logging.jar"/>
+      </fileset>
       <!-- Here for backward compatibility in case clients directly
-      use cglib (seam for example).
-      -->
+           use cglib (seam for example). -->
       <fileset dir="${cglib.lib}">
         <include name="cglib.jar"/>
       </fileset>

Modified: branches/Branch_4_2/build/build.xml
===================================================================
--- branches/Branch_4_2/build/build.xml	2006-12-22 11:01:05 UTC (rev 59212)
+++ branches/Branch_4_2/build/build.xml	2006-12-22 11:01:34 UTC (rev 59213)
@@ -712,6 +712,7 @@
       <srcfiles dir="${install.client}">
         <include name="*-client.jar"/>
         <include name="commons-httpclient.jar"/>
+        <include name="commons-codec.jar"/>
         <include name="concurrent.jar"/>
         <include name="hibernate-annotations.jar"/>
         <include name="jboss-deployment.jar" />
@@ -744,6 +745,7 @@
       <fileset dir="${install.client}">
         <include name="*-client.jar"/>
         <include name="commons-httpclient.jar"/>
+        <include name="commons-codec.jar"/>
         <include name="concurrent.jar"/>
         <include name="hibernate-annotations.jar"/>
         <include name="jboss-deployment.jar" />