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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon May 11 16:34:03 EDT 2009


Author: pgier
Date: 2009-05-11 16:34:02 -0400 (Mon, 11 May 2009)
New Revision: 88670

Modified:
   trunk/build/build-distr.xml
Log:
[JBBUILD-519] Use maven ant tasks to copy thirdparty jars directly from local maven repo.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-05-11 19:26:42 UTC (rev 88669)
+++ trunk/build/build-distr.xml	2009-05-11 20:34:02 UTC (rev 88670)
@@ -1760,9 +1760,18 @@
       -->
     <maven:dependencies filesetId="pom.dependencies"
                         versionsId="pom.dependencies.versions"
-                        scopes="compile, runtime" type="pom, jar">
+                        scopes="compile, runtime" type="pom, jar, zip">
       <pom file="../thirdparty/pom.xml"/>
     </maven:dependencies>
+    
+    <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
+    <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
+    <maven:dependencies>
+      <dependency groupId="jboss.jbossts" artifactId="jbossts-tools" 
+                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
+      <dependency groupId="org.jboss.jaxr" artifactId="juddi-service" 
+                  version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
+    </maven:dependencies>
 
     <!-- Copy thirdparty libraries to server/all/lib -->
     <mkdir dir="${install.all.lib}"/>
@@ -1775,6 +1784,26 @@
       <fileset file="${org.jboss.security:jbossxacml:jar}"/>
       <fileset file="${org.slf4j:slf4j-api:jar}"/>
       <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
+      
+      <fileset file="${commons-logging:commons-logging:jar}"/>
+      <fileset file="${jaxen:jaxen:jar}"/>
+      <fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
+      <fileset file="${org.jboss.cluster:jboss-ha-server-api:jar}"/>
+      <fileset file="${org.jboss.cluster:jboss-ha-server-cache-spi:jar}"/>
+      <fileset file="${org.jboss.cluster:jboss-ha-server-cache-jbc:jar}"/>
+      <fileset file="${org.jboss.integration:jboss-integration:jar}"/>
+      <fileset file="${org.jboss.metadata:jboss-metadata:jar}"/>
+      <fileset file="${org.jboss.javaee:jboss-jaspi-api:jar}"/>
+      <fileset file="${org.jboss.javaee:jboss-javaee:jar}"/>
+      <fileset file="${org.jboss.naming:jnpserver:jar}"/>
+      <fileset file="${jgroups:jgroups:jar}"/>
+      <fileset file="${net.jcip:jcip-annotations:jar}"/>
+
+      <!-- copy binary release of JBossTS (JTA part) from thirdparty repo -->
+      <fileset file="${jboss.jbossts:jbossjta:jar}"/>
+      <fileset file="${jboss.jbossts:jbossjta-integration:jar}"/>
+      <fileset file="${jboss.jbossts:jbossts-common:jar}"/>
+      
       <mapper classpathref="maven-ant-tasks.classpath"
               classname="org.apache.maven.artifact.ant.VersionMapper"
               from="${pom.dependencies.versions}" to="flatten" />
@@ -1836,7 +1865,6 @@
     <copy file="${org.jboss:jbossxb:jar}"
           tofile="${install.lib}/jboss-xml-binding.jar"/>
 
-    
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -1885,7 +1913,6 @@
               classname="org.apache.maven.artifact.ant.VersionMapper"
               from="${pom.dependencies.versions}" to="flatten" />
     </copy>
-    
     <!-- 
       -  Note: this is copied separately because the name (jboss-xml-binding) is 
       -  hardcoded in the wsconsume scripts.  Once this is changed
@@ -1897,102 +1924,57 @@
     <!-- Copy thirdparty code to lib/endorsed -->
     <mkdir dir="${install.lib}/endorsed"/>
     <copy todir="${install.lib}/endorsed" filtering="no">
-      <fileset dir="${apache.xerces.lib}">
-        <!-- http://jira.jboss.org/jira/browse/JBAS-5487
-        <include name="xml-apis.jar"/-->
-        <include name="xercesImpl.jar"/>
-        <include name="resolver.jar"/>
-      </fileset>
-      <fileset dir="${apache.xalan.lib}">
-        <include name="xalan.jar"/>
-        <include name="serializer.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${stax.api.lib}">
-        <include name="stax-api.jar"/>
-      </fileset>
+      <fileset file="${xerces:xercesImpl:jar}"/>
+      <fileset file="${apache-xerces:resolver:jar}"/>
+      <fileset file="${apache-xalan:xalan:jar}"/>
+      <fileset file="${apache-xalan:serializer:jar}"/>
+      <fileset file="${sun-jaxb:jaxb-api:jar}"/>
+      <fileset file="${javax.activation:activation:jar}"/>
+      <fileset file="${stax:stax-api:jar}"/>
+      <mapper classpathref="maven-ant-tasks.classpath"
+              classname="org.apache.maven.artifact.ant.VersionMapper"
+              from="${pom.dependencies.versions}" to="flatten" />
     </copy>
+    
     <!-- avoid the duplicate copying of jaxb/stax apis from jbossws macros -->
     <delete file="${install.lib}/jaxb-api.jar"/>
     <delete file="${install.lib}/stax-api.jar"/>
-    
-    <!-- Copy thirdparty code to server/all/lib -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${apache.logging.lib}">
-        <include name="commons-logging.jar"/>
-      </fileset>
-      <fileset dir="${jaxen.jaxen.lib}">
-        <include name="jaxen.jar"/>
-      </fileset>
-      <fileset dir="${org.jboss.cluster.lib}">
-        <include name="jboss-ha-client.jar"/>
-        <include name="jboss-ha-server-api.jar"/>
-        <include name="jboss-ha-server-cache-spi.jar"/>
-        <include name="jboss-ha-server-cache-jbc.jar"/>
-      </fileset>
-      <fileset dir="${jboss.integration.lib}">
-        <include name="jboss-integration.jar"/>
-      </fileset>
-      <fileset dir="${jboss.metadata.lib}">
-        <include name="jboss-metadata.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jboss.jaspi.api.lib}">
-        <include name="jboss-jaspi-api.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jboss.javaee.lib}">
-        <include name="jboss-javaee.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jnpserver.lib}">
-        <include name="jnpserver.jar"/>
-      </fileset>
-      <fileset dir="${jgroups.jgroups.lib}">
-        <include name="jgroups.jar"/>
-      </fileset>
-      <fileset dir="${net.jcip.lib}">
-        <include name="jcip-annotations.jar"/>
-      </fileset>
-    </copy>
+
     <!-- Unpack the javaee dtds/schemas from jboss-metadata.jar -->
     <mkdir dir="${install.dtd}"/>
     <mkdir dir="${install.schema}"/>
-    <unzip src="${jboss.metadata.lib}/jboss-metadata.jar" dest="${install.docs}">
+    <unzip src="${org.jboss.metadata:jboss-metadata:jar}" dest="${install.docs}">
       <patternset>
         <include name="dtd/*"/>
         <include name="schema/*"/>
       </patternset>
     </unzip>
 
-    <!-- copy binary release of JBossTS (JTA part) from thirdparty repo -->
-    <copy todir="${install.all.lib}" filtering="no">
-        <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
-            <include name="jbossjta.jar"/>
-            <include name="jbossjta-integration.jar"/>
-            <include name="jbossts-common.jar"/>
-        </fileset>
-    </copy>
     <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-    <!-- copy binary release of JBossTS (JTS part) from thirdparty repo -->
+
     <mkdir dir="${install.examples}/jts"/>
     <copy todir="${install.examples}/jts" filtering="no">
-        <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
-            <include name="jbossjts.jar"/>
-            <include name="jbossjts-integration.jar"/>
-            <include name="jbossjts-jacorb.jar"/>
-            <include name="jbossts-tools.sar"/>
-        </fileset>
+      <fileset file="${jboss.jbossts:jbossjts:jar}"/>
+      <fileset file="${jboss.jbossts:jbossjts-integration:jar}"/>
+      <fileset file="${jboss.jbossts:jbossjts-jacorb:jar}"/>
+      <fileset file="${jboss.jbossts:jbossts-tools:sar}"/>
+      <mapper classpathref="maven-ant-tasks.classpath"
+              classname="org.apache.maven.artifact.ant.VersionMapper"
+              from="${pom.dependencies.versions}" to="flatten" />
     </copy>
-    <copy todir="${install.examples}/jts" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjts-properties.xml"/>
+    
+    <unzip src="${jboss.jbossts:resources:jar}" dest="${install.examples}/jts">
+      <patternset>
+        <include name="resources/jbossjts-properties.xml"/>
+      </patternset>
+      <mapper type="flatten"/>
+    </unzip>
     <!-- copy JBossTS JTS install script and instructions from jbossas-jts module -->
     <copy todir="${install.examples}/jts" filtering="no">
-        <fileset dir="${project.root}/jbossas-jts">
-            <include name="README.txt"/>
-            <include name="build.xml"/>
-        </fileset>
+      <fileset dir="${project.root}/jbossas-jts">
+        <include name="README.txt"/>
+        <include name="build.xml"/>
+      </fileset>
     </copy>       
 
     <chmod perm="+x">
@@ -2002,11 +1984,8 @@
     </chmod>
    	
     <unzip dest="${install.server}/all/deployers">
-       <fileset dir="${webbeans.deployer.lib}">
-         <include name="webbeans-ri-int-deployer.zip"/>
-       </fileset>
+      <fileset file="${org.jboss.webbeans.integration:webbeans-ri-int-deployer:zip}"/>
     </unzip>
-   	
 
   </target>
 </project>




More information about the jboss-cvs-commits mailing list