[jboss-cvs] JBossAS SVN: r89929 - trunk/build.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jun 5 17:49:54 EDT 2009


Author: pgier
Date: 2009-06-05 17:49:53 -0400 (Fri, 05 Jun 2009)
New Revision: 89929

Modified:
   trunk/build/build.xml
Log:
Copy jars directly to common/lib instead of using intermediate step copying to server/all/lib

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-06-05 21:48:43 UTC (rev 89928)
+++ trunk/build/build.xml	2009-06-05 21:49:53 UTC (rev 89929)
@@ -221,21 +221,6 @@
   -->
   <target name="partition-build" depends="init">
 
-    <!-- move to the common library directory the jars common to all configs;
-         the minimal config currently is not point to it
-    -->
-    <move todir="${install.common.lib}">
-      <fileset dir="${install.all.lib}">
-        <exclude name="avalon-framework.jar"/>
-        <exclude name="hibernate-jbosscache2.jar"/>
-        <exclude name="jacorb.jar"/>
-        <exclude name="jbosscache-core.jar"/>
-        <exclude name="jbosscache-pojo.jar"/>
-        <exclude name="jgroups.jar"/>
-        <exclude name="jcip-annotations.jar"/>
-      </fileset>
-    </move>
-
     <!-- Copy server/all to server/default and then remove the services 
          outside of the scope of the default config
     -->
@@ -637,9 +622,9 @@
     <property name="jbossas-remoting.module.output" value="${project.root}/${jbossas-remoting.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${jbossas-remoting.module.output}/jboss-as-jbossas-remoting.jar"
-           tofile="${install.all.lib}/jbossas-remoting.jar" filtering="no"/>
+           tofile="${install.common.lib}/jbossas-remoting.jar" filtering="no"/>
 
   </target>
 
@@ -663,9 +648,9 @@
     <property name="jmx-remoting.module.output" value="${project.root}/${jmx-remoting.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${jmx-remoting.module.output}/jboss-as-jmx-remoting.jar"
-            tofile="${install.all.lib}/jboss-jmx-remoting.jar" filtering="no" />
+            tofile="${install.common.lib}/jboss-jmx-remoting.jar" filtering="no" />
   </target>
 
   <target name="module-jmx-remoting-all" depends="module-jmx-remoting">
@@ -900,13 +885,13 @@
     </copy>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
 
     <copy file="${server.module.output}/jboss-as-server-jboss.jar"
-            tofile="${install.all.lib}/jboss.jar" filtering="no"/>
+            tofile="${install.common.lib}/jboss.jar" filtering="no"/>
 
     <copy file="${server.module.output}/jboss-as-server-jmx-adaptor-plugin.jar"
-            tofile="${install.all.lib}/jmx-adaptor-plugin.jar" filtering="no"/>
+            tofile="${install.common.lib}/jmx-adaptor-plugin.jar" filtering="no"/>
 
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
@@ -1013,11 +998,11 @@
       </fileset>
     </copy>
 
-    <mkdir dir="${install.server}/all/lib"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${connector.module.output}/jboss-as-connector-jboss-common-jdbc-wrapper.jar"
-            tofile="${install.server}/all/lib/jboss-common-jdbc-wrapper.jar" filtering="no"/>
+            tofile="${install.common.lib}/jboss-common-jdbc-wrapper.jar" filtering="no"/>
     <copy file="${connector.module.output}/jboss-as-connector-jboss-jca.jar"
-            tofile="${install.server}/all/lib/jboss-jca.jar" filtering="no"/>
+            tofile="${install.common.lib}/jboss-jca.jar" filtering="no"/>
 
     <!-- Copy the dtds -->
     <mkdir dir="${install.dtd}"/>
@@ -1054,7 +1039,7 @@
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy file="${connector.module.output}/jboss-as-connector-jbosscx-client.jar"
-            tofile="${install.server}/all/lib/jbosscx-client.jar" filtering="no"/>
+            tofile="${install.common.lib}/jbosscx-client.jar" filtering="no"/>
 
   </target>
 
@@ -1087,10 +1072,10 @@
      <!--
            jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
      -->
-     <mkdir dir="${install.all.lib}"/>
+     <mkdir dir="${install.common.lib}"/>
      
      <copy file="${messaging.module.output}/jboss-as-messaging.jar"
-           tofile="${install.all.lib}/jboss-messaging-int.jar" filtering="no" />
+           tofile="${install.common.lib}/jboss-messaging-int.jar" filtering="no" />
     
      <!--
           Security metadata, same for "all" and "default" configurations.
@@ -1217,9 +1202,9 @@
     <property name="security.module.output" value="${project.root}/${security.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${security.module.output}/jboss-as-security.jar"
-            tofile="${install.all.lib}/jbosssx-server.jar" filtering="no"/>
+            tofile="${install.common.lib}/jbosssx-server.jar" filtering="no"/>
 
     <copy file="${security.module.output}/jboss-as-security-client.jar"
             tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
@@ -1260,9 +1245,9 @@
     <property name="cluster.module.output" value="${project.root}/${cluster.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${cluster.module.output}/jboss-as-cluster.jar"
-            tofile="${install.all.lib}/jbossha.jar" filtering="no" />
+            tofile="${install.common.lib}/jbossha.jar" filtering="no" />
 
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
@@ -1341,8 +1326,8 @@
     <property name="varia.module.output" value="${project.root}/${varia.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
+    <mkdir dir="${install.common.lib}"/>
+    <copy todir="${install.common.lib}" filtering="no">
       <fileset dir="${varia.module.output}">
         <include name="jboss-as-varia-mail-plugin.jar"/>
         <include name="jboss-as-varia-scheduler-plugin.jar"/>
@@ -1462,10 +1447,6 @@
       </fileset>
     </copy>
 
-    <!-- copy the jboss-monitoring JAR -->
-    <copy file="${varia.module.output}/jboss-as-varia-jboss-monitoring.jar" 
-            tofile="${install.server}/all/lib/jboss-monitoring.jar"/>
-
     <!-- copy the binding-manager sample file and JAR
       <copy file="${project.root}/varia/output/lib/bindingservice-plugin.jar" todir="${install.server}/all/lib"/>
       -->
@@ -1576,11 +1557,11 @@
 
     <!-- Copy the jboss-iiop.jar -->
     <copy file="${iiop.module.output}/jboss-as-iiop.jar"
-            tofile="${install.all.lib}/jboss-iiop.jar" filtering="no" />
+            tofile="${install.common.lib}/jboss-iiop.jar" filtering="no" />
 
     <!-- Copy the jboss-iiop-client.jar -->
     <copy file="${iiop.module.output}/jboss-as-iiop-client.jar"
-            tofile="${install.all.lib}/jboss-iiop-client.jar" filtering="no" />
+            tofile="${install.common.lib}/jboss-iiop-client.jar" filtering="no" />
 
     <!-- Copy jndi.properties file -->
     <mkdir dir="${install.server}/all/conf"/>
@@ -1619,11 +1600,11 @@
     <property name="management.module.output" value="${project.root}/${management.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${management.module.output}/jboss-as-management.jar"
-            tofile="${install.all.lib}/jboss-management.jar" filtering="no" />
+            tofile="${install.common.lib}/jboss-management.jar" filtering="no" />
     <copy file="${management.module.output}/jboss-as-management-jsr77.jar"
-            tofile="${install.all.lib}/jboss-jsr77.jar" filtering="no" />
+            tofile="${install.common.lib}/jboss-jsr77.jar" filtering="no" />
 
     <mkdir dir="${install.examples}/jmx"/>
     <copy file="${management.module.output}/jboss-as-management-ejb-management.jar"
@@ -1735,9 +1716,9 @@
     <property name="deployment.module.output" value="${project.root}/${deployment.module.name}/target"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
     <copy file="${deployment.module.output}/jboss-as-deployment-jboss-jsr88.jar"
-        tofile="${install.all.lib}/jboss-jsr88.jar" filtering="no"/>
+        tofile="${install.common.lib}/jboss-jsr88.jar" filtering="no"/>
 
     <copy todir="${install.all.deploy}" filtering="no">
       <fileset dir="${deployment.module.output}/etc">
@@ -1883,11 +1864,11 @@
     <property name="hibernate.module.name" value="hibernate-int"/>
     <property name="hibernate.module.output" value="${project.root}/${hibernate.module.name}/target"/>
 
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
 
     <!-- The hibernate-int module output -->
     <copy file="${hibernate.module.output}/jboss-as-hibernate-int.jar"
-            todir="${install.all.lib}/" filtering="no" />
+            todir="${install.common.lib}/" filtering="no" />
 
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${hibernate.module.output}/resources">
@@ -1916,10 +1897,10 @@
     <property name="profileservice.module.name" value="profileservice"/>
     <property name="profileservice.module.output" value="${project.root}/${profileservice.module.name}/target"/>
 
-    <mkdir dir="${install.all.lib}"/>
+    <mkdir dir="${install.common.lib}"/>
 
     <!-- The profileservice module output -->
-    <copy todir="${install.all.lib}" filtering="no">
+    <copy todir="${install.common.lib}" filtering="no">
       <fileset dir="${profileservice.module.output}/" includes="jboss-as-profileservice.jar"/>
     </copy>
     <!-- Copy the profileservice hdscanner bean to deploy -->
@@ -1975,16 +1956,8 @@
       <fileset refid="org.jboss.ws:jbossws-common:jar"/>
       <fileset refid="org.jboss.ws:jbossws-framework:jar"/>
       <fileset refid="org.jboss.ws:jbossws-spi:jar"/>
-      <mapper refid="remove-versions" />
-    </copy>
-
-    <!-- Copy thirdparty libraries to server/all/lib -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
       <fileset refid="antlr:antlr:jar"/>
       <fileset refid="commons-collections:commons-collections:jar"/>
-      <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
-      <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
       <fileset refid="org.jboss.security:jboss-negotiation:jar"/>
       <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
       <fileset refid="org.jboss.security:jbosssx:jar"/>
@@ -2004,17 +1977,11 @@
       <fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
       <fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
       <fileset refid="org.jboss.naming:jnpserver:jar"/>
-      <fileset refid="jgroups:jgroups:jar"/>
-      <fileset refid="net.jcip:jcip-annotations:jar"/>
-
-      <!-- copy binary release of JBossTS (JTA part) from thirdparty repo -->
       <fileset refid="jboss.jbossts:jbossjta:jar"/>
       <fileset refid="jboss.jbossts:jbossjta-integration:jar"/>
       <fileset refid="jboss.jbossts:jbossts-common:jar"/>
-
       <fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
       <fileset refid="jboss:jboss-serialization:jar"/>
-
       <fileset refid="org.jboss.ejb3:jboss-ejb3-cache:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-common:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
@@ -2033,7 +2000,6 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
       <fileset refid="org.hibernate:hibernate-core:jar"/>
       <fileset refid="org.hibernate:hibernate-jmx:jar"/>
-      <fileset refid="org.hibernate:hibernate-jbosscache2:jar"/>
       <fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
       <fileset refid="org.hibernate:ejb3-persistence:jar"/>
       <fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
@@ -2054,13 +2020,24 @@
       <fileset refid="jboss.web:el-api:jar"/>
       <fileset refid="jboss.web:jsp-api:jar"/>
       <fileset refid="jboss.web:servlet-api:jar"/>
-      <fileset refid="jacorb:jacorb:jar"/>
-      <fileset refid="apache-avalon:avalon-framework:jar"/>
       <mapper refid="remove-versions" />
     </copy>
+
     <copy file="${snmptrapappender:snmpTrapAppender:jar}"
-            tofile="${install.all.lib}/log4j-snmp-appender.jar"/>
+            tofile="${install.common.lib}/log4j-snmp-appender.jar"/>
 
+    <!-- Copy thirdparty libraries to server/all/lib -->
+    <mkdir dir="${install.all.lib}"/>
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset refid="apache-avalon:avalon-framework:jar"/>
+      <fileset refid="jacorb:jacorb:jar"/>
+      <fileset refid="jgroups:jgroups:jar"/>
+      <fileset refid="net.jcip:jcip-annotations:jar"/>
+      <fileset refid="org.hibernate:hibernate-jbosscache2:jar"/>
+      <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
+      <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
+      <mapper refid="remove-versions" />
+    </copy>
 
     <!-- Copy the generated libraries to lib-->
     <mkdir dir="${install.lib}"/>




More information about the jboss-cvs-commits mailing list