[jboss-cvs] JBossAS SVN: r88650 - in trunk: server/src/etc/conf/all/bootstrap and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 11 12:32:31 EDT 2009
Author: pgier
Date: 2009-05-11 12:32:31 -0400 (Mon, 11 May 2009)
New Revision: 88650
Added:
trunk/tools/maven/ant-tasks/
trunk/tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
Log:
[JBBUILD-519] Use maven ant tasks to copy distribution jars directly from local maven repo.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-05-11 15:50:49 UTC (rev 88649)
+++ trunk/build/build-distr.xml 2009-05-11 16:32:31 UTC (rev 88650)
@@ -3,11 +3,20 @@
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
]>
-<project name="JBoss/Build">
+<project name="JBoss Distribution Build" xmlns:maven="antlib:org.apache.maven.artifact.ant">
&libraries;
<!-- ================================================================== -->
+ <!-- Init the maven ant tasks -->
+ <!-- ================================================================== -->
+
+ <path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <!-- ================================================================== -->
<!-- Module Pass-through Hooks -->
<!-- ================================================================== -->
@@ -1756,244 +1765,147 @@
<!-- Thirdparty dependencies consumed directly from the repository -->
<!-- ============================================================== -->
- <target name="thirdparty">
- <!-- Copy thirdparty libraries -->
+ <target name="thirdparty" description="Copy thirdparty dependencies from the repository">
+
+ <!--
+ - Initialize properties for each dependency in the thirdparty pom
+ - The properties take the form "groupId:artifactId:packaging"
+ -->
+ <maven:dependencies filesetId="pom.dependencies"
+ versionsId="pom.dependencies.versions"
+ scopes="compile, runtime" type="pom, jar">
+ <pom file="../thirdparty/pom.xml"/>
+ </maven:dependencies>
+
+ <!-- Copy thirdparty libraries to server/all/lib -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.cache.jbosscache.core.lib}">
- <include name="jbosscache-core.jar"/>
- </fileset>
- <fileset dir="${jboss.cache.jbosscache.pojo.lib}">
- <include name="jbosscache-pojo.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.negotiation.lib}">
- <include name="jboss-negotiation.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.security.spi.lib}">
- <include name="jboss-security-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jbosssx.lib}">
- <include name="jbosssx.jar"/>
- </fileset>
- <fileset dir="${jboss.security.lib}">
- <include name="jbossxacml.jar"/>
- </fileset>
- <fileset dir="${org.slf4j.lib}">
- <include name="slf4j-api.jar"/>
- </fileset>
- <fileset dir="${org.jboss.slf4j.lib}">
- <include name="slf4j-jboss-logging.jar"/>
- </fileset>
+ <fileset file="${org.jboss.cache:jbosscache-core:jar}"/>
+ <fileset file="${org.jboss.cache:jbosscache-pojo:jar}"/>
+ <fileset file="${org.jboss.security:jboss-negotiation:jar}"/>
+ <fileset file="${org.jboss.security:jboss-security-spi:jar}"/>
+ <fileset file="${org.jboss.security:jbosssx:jar}"/>
+ <fileset file="${org.jboss.security:jbossxacml:jar}"/>
+ <fileset file="${org.slf4j:slf4j-api:jar}"/>
+ <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
</copy>
- <!-- Copy the generated libraries -->
+ <!-- Copy the generated libraries to lib-->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
- <fileset dir="${javassist.javassist.lib}">
- <include name="javassist.jar"/>
- </fileset>
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-aop.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.bootstrap.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar" />
- <fileset dir="${jboss.common.core.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${jboss.common.logging.spi.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${jboss.common.logging.log4j.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${jboss.common.logging.jdk.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${org.jboss.logbridge.lib}">
- <include name="jboss-logbridge.jar"/>
- </fileset>
- <fileset dir="${org.jboss.logmanager.lib}">
- <include name="jboss-logmanager.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossxb.lib}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss.integration.lib}">
- <include name="jboss-classloading-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.profileservice.spi.lib}">
- <include name="jboss-profileservice-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.reflect.lib}">
- <include name="jboss-reflect.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.mdr.lib}">
- <include name="jboss-mdr.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.man.lib}">
- <include name="jboss-metatype.jar"/>
- <include name="jboss-managed.jar"/>
- </fileset>
- <fileset dir="${oswego.concurrent.lib}">
- <include name="concurrent.jar"/>
- </fileset>
- <fileset dir="${dom4j.dom4j.lib}">
- <include name="dom4j.jar"/>
- </fileset>
- <fileset dir="${jboss.mx.lib}">
- <include name="jboss-j2se.jar"/>
- <include name="jboss-mbeans.jar"/>
- <include name="jboss-jmx.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.cl.lib}">
- <include name="jboss-classloader.jar"/>
- <include name="jboss-classloading.jar"/>
- <include name="jboss-classloading-vfs.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.deployers.lib}">
- <include name="jboss-deployers-client.jar"/>
- <include name="jboss-deployers-client-spi.jar"/>
- <include name="jboss-deployers-core.jar"/>
- <include name="jboss-deployers-core-spi.jar"/>
- <include name="jboss-deployers-impl.jar"/>
- <include name="jboss-deployers-spi.jar"/>
- <include name="jboss-deployers-structure-spi.jar"/>
- <include name="jboss-deployers-vfs.jar"/>
- <include name="jboss-deployers-vfs-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="jboss-aop-mc-int.jar"/>
- <include name="jboss-dependency.jar"/>
- <include name="jboss-kernel.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.vfs.lib}">
- <include name="jboss-vfs.jar"/>
- </fileset>
- <fileset dir="${osgi.osgi.lib}">
- <include name="osgi.core.jar"/>
- </fileset>
- <fileset dir="${trove.trove.lib}">
- <include name="trove.jar"/>
- </fileset>
- <fileset dir="${sun.jaxb.lib}">
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <fileset dir="${woodstox.woodstox.lib}">
- <include name="wstx.jar"/>
- </fileset>
+ <fileset file="${javassist:javassist:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop:jar}"/>
+ <fileset file="${org.jboss.bootstrap:jboss-bootstrap:jar}"/>
+ <fileset file="${org.jboss:jboss-common-core:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-spi:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-jdk:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
+ <fileset file="${org.jboss.logbridge:jboss-logbridge:jar}"/>
+ <fileset file="${org.jboss.logmanager:jboss-logmanager:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-classloading-spi:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-profileservice-spi:jar}"/>
+ <fileset file="${org.jboss:jboss-reflect:jar}"/>
+ <fileset file="${org.jboss:jboss-mdr:jar}"/>
+ <fileset file="${org.jboss.man:jboss-managed:jar}"/>
+ <fileset file="${org.jboss.man:jboss-metatype:jar}"/>
+ <fileset file="${oswego-concurrent:concurrent:jar}"/>
+ <fileset file="${dom4j:dom4j:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-j2se:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-mbeans:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-jmx:jar}"/>
+ <fileset file="${org.jboss.cl:jboss-classloader:jar}"/>
+ <fileset file="${org.jboss.cl:jboss-classloading:jar}"/>
+ <fileset file="${org.jboss.cl:jboss-classloading-vfs:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-impl:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-structure-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs-spi:jar}"/>
+ <fileset file="${org.jboss.microcontainer:jboss-aop-mc-int:jar}"/>
+ <fileset file="${org.jboss.microcontainer:jboss-dependency:jar}"/>
+ <fileset file="${org.jboss.microcontainer:jboss-kernel:jar}"/>
+ <fileset file="${org.jboss:jboss-vfs:jar}"/>
+ <fileset file="${org.osgi:osgi_R4_core:jar}"/>
+ <fileset file="${trove:trove:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-impl:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
+ <fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ 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
+ - in the scripts, this should be added to the list of lib jars above
+ -->
+ <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">
- <fileset dir="${apache.logging.lib}">
- <include name="commons-logging.jar"/>
- </fileset>
- <fileset dir="${org.apache.lib}">
- <include name="xmlsec.jar"/>
- </fileset>
- <fileset dir="${ibm.wsdl4j.lib}">
- <include name="wsdl4j.jar"/>
- </fileset>
- <fileset dir="${javassist.javassist.lib}">
- <include name="javassist.jar"/>
- </fileset>
- <fileset dir="${jboss.common.core.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${jboss.common.logging.spi.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${jboss.common.logging.log4j.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${jboss.common.logging.jdk.lib}">
- <exclude name="*-sources.jar"/>
- </fileset>
- <fileset dir="${org.slf4j.lib}">
- <include name="slf4j-api.jar"/>
- </fileset>
- <fileset dir="${org.jboss.slf4j.lib}">
- <include name="slf4j-jboss-logging.jar"/>
- </fileset>
- <fileset dir="${jboss.integration.lib}">
- <include name="jboss-integration.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.ejb3.ext.api.lib}">
- <include name="jboss-ejb3-ext-api.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.jboss.security.spi.lib}">
- <include name="jboss-security-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jnp.client.lib}">
- <include name="jnp-client.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossxb.lib}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss.jbosssx.lib}">
- <include name="jbosssx-client.jar"/>
- </fileset>
- <fileset dir="${jboss.mx.lib}">
- <include name="jboss-j2se.jar"/>
- <include name="jboss-jmx.jar"/>
- </fileset>
- <fileset dir="${jboss.metadata.lib}">
- <include name="jboss-metadata.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.mdr.lib}">
- <include name="jboss-mdr.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.deployers.lib}">
- <include name="jboss-deployers-core.jar"/>
- <include name="jboss-deployers-core-spi.jar"/>
- <include name="jboss-deployers-client.jar"/>
- <include name="jboss-deployers-client-spi.jar"/>
- <include name="jboss-deployers-vfs.jar"/>
- <include name="jboss-deployers-vfs-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.remoting.lib}">
- <include name="jboss-remoting.jar"/>
- </fileset>
- <fileset dir="${jboss.serialization.lib}">
- <include name="jboss-serialization.jar"/>
- </fileset>
- <fileset dir="${org.jboss.cluster.lib}">
- <include name="jboss-ha-client.jar"/>
- </fileset>
- <fileset dir="${sun.jaf.lib}">
- <include name="activation.jar"/>
- </fileset>
- <fileset dir="${sun.javamail.lib}">
- <include name="mail.jar"/>
- </fileset>
- <fileset dir="${sun.jaxb.lib}">
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <fileset dir="${sun.jaxws.lib}">
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- </fileset>
- <fileset dir="${trove.trove.lib}">
- <include name="trove.jar"/>
- </fileset>
- <fileset dir="${woodstox.woodstox.lib}">
- <include name="wstx.jar"/>
- </fileset>
- <fileset dir="${wscommons.policy.lib}">
- <include name="policy.jar"/>
- </fileset>
+ <fileset file="${commons-logging:commons-logging:jar}"/>
+ <fileset file="${org.apache:xmlsec:jar}"/>
+ <fileset file="${wsdl4j:wsdl4j:jar}"/>
+ <fileset file="${javassist:javassist:jar}"/>
+ <fileset file="${org.jboss:jboss-common-core:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-spi:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-jdk:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
+ <fileset file="${org.slf4j:slf4j-api:jar}"/>
+ <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-integration:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
+ <fileset file="${org.jboss.javaee:jboss-jaspi-api:jar}"/>
+ <fileset file="${org.jboss.javaee:jboss-javaee:jar}"/>
+ <fileset file="${org.jboss.security:jboss-security-spi:jar}"/>
+ <fileset file="${org.jboss.naming:jnp-client:jar}"/>
+ <fileset file="${org.jboss.security:jbosssx-client:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-j2se:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-jmx:jar}"/>
+ <fileset file="${org.jboss.metadata:jboss-metadata:jar}"/>
+ <fileset file="${org.jboss:jboss-mdr:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs-spi:jar}"/>
+ <fileset file="${org.jboss.remoting:jboss-remoting:jar}"/>
+ <fileset file="${jboss:jboss-serialization:jar}"/>
+ <fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
+ <fileset file="${javax.activation:activation:jar}"/>
+ <fileset file="${javax.mail:mail:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-impl:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
+ <fileset file="${sun-jaxws:jaxws-tools:jar}"/>
+ <fileset file="${sun-jaxws:jaxws-rt:jar}"/>
+ <fileset file="${sun-jaxws:stax-ex:jar}"/>
+ <fileset file="${sun-jaxws:streambuffer:jar}"/>
+ <fileset file="${trove:trove:jar}"/>
+ <fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
+ <fileset file="${wscommons-policy:policy:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ 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
+ - in the scripts, this should be added to the list of client jars above
+ -->
+ <copy file="${org.jboss:jbossxb:jar}"
+ tofile="${install.client}/jboss-xml-binding.jar"/>
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-05-11 15:50:49 UTC (rev 88649)
+++ trunk/build/build.xml 2009-05-11 16:32:31 UTC (rev 88650)
@@ -14,8 +14,7 @@
<!-- $Id$ -->
-<project default="main" name="JBoss Build"
- xmlns:maven="antlib:org.apache.maven.artifact.ant">
+<project default="main" name="JBoss Distribution Build">
<!-- ================================================================== -->
<!-- Setup -->
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2009-05-11 15:50:49 UTC (rev 88649)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2009-05-11 16:32:31 UTC (rev 88650)
@@ -21,7 +21,7 @@
<!-- JAXB impl here, api is in endorsed -->
<root>${jboss.lib.url}jaxb-impl.jar</root>
<!-- STAX2 impl here, api is in endorsed -->
- <root>${jboss.lib.url}wstx.jar</root>
+ <root>${jboss.lib.url}wstx-lgpl.jar</root>
</classloader>
<!-- use legacy ordering -->
Added: trunk/tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list