[jboss-cvs] JBossAS SVN: r88674 - trunk/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 11 17:27:47 EDT 2009
Author: pgier
Date: 2009-05-11 17:27:47 -0400 (Mon, 11 May 2009)
New Revision: 88674
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 21:04:15 UTC (rev 88673)
+++ trunk/build/build-distr.xml 2009-05-11 21:27:47 UTC (rev 88674)
@@ -26,26 +26,6 @@
-->
<!-- ======== -->
- <!-- Test -->
- <!-- ======== -->
-
- <target name="_module-test-most">
- <property name="_module.name" value="test" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
- </target>
-
- <target name="_module-test-all" depends="_module-test-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- ======== -->
<!-- Remoting -->
<!-- ======== -->
@@ -58,18 +38,6 @@
<copy file="${_module.output}/jboss-as-jbossas-remoting.jar"
tofile="${install.all.lib}/jbossas-remoting.jar" filtering="no"/>
- <!-- Copy the third party libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.remoting.lib}">
- <include name="jboss-remoting.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.serialization.lib}">
- <include name="jboss-serialization.jar"/>
- </fileset>
- </copy>
</target>
<target name="_module-remoting-all" depends="_module-jbossas-remoting-most">
@@ -149,81 +117,17 @@
</fileset>
</copy>
- <copy todir="${install.server}/all/deployers" filtering="no">
- <fileset dir="${_module.output}">
- <include name="ejb3.deployer/**"/>
- </fileset>
- </copy>
-
- <!-- Copy the third party libraries -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.jboss.ejb3.cache.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.common.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.core.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.deployers.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.interceptors.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.metadata.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.mc.int.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.proxy.impl.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.proxy.spi.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.proxy.clustered.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
- <fileset dir="${jboss.jboss.ejb3.timerservice.spi.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.ejb3.transactions.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${hibernate.annotations.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${hibernate.validator.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- <fileset dir="${jboss.jboss.jpa.deployers.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- </copy>
-
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy file="${_module.output}/jboss-as-ejb3-client.jar"
tofile="${install.client}/jboss-appclient.jar" filtering="no" />
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${hibernate.entitymanager.lib}">
- <include name="ejb3-persistence.jar"/>
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${_module.output}">
+ <include name="ejb3.deployer/**"/>
</fileset>
- <fileset dir="${hibernate.annotations.lib}">
- <include name="hibernate-annotations.jar"/>
- </fileset>
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-aop-client.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar" excludes="*sources.jar"/>
- <!-- For JSR-250 impl -->
- <fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.common.lib}" includes="*-client.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.core.lib}" includes="*-client.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.proxy.impl.lib}" includes="*-client.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.proxy.spi.lib}" includes="*-client.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.proxy.clustered.lib}" includes="*-client.jar" excludes="*sources.jar"/>
- <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*-client.jar" excludes="*sources.jar"/>
</copy>
+
</target>
<target name="_module-ejb3-all" depends="_module-ejb3-most">
@@ -1804,6 +1708,31 @@
<fileset file="${jboss.jbossts:jbossjta-integration:jar}"/>
<fileset file="${jboss.jbossts:jbossts-common:jar}"/>
+ <fileset file="${org.jboss.remoting:jboss-remoting:jar}"/>
+ <fileset file="${jboss:jboss-serialization:jar}"/>
+
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-cache:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-common:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-core:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-deployers:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-interceptors:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-metadata:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-mc-int:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-impl:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-spi:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-security:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-transactions:jar}"/>
+ <fileset file="${org.hibernate:hibernate-commons-annotations:jar}"/>
+ <fileset file="${org.hibernate:ejb3-persistence:jar}"/>
+ <fileset file="${org.hibernate:hibernate-entitymanager:jar}"/>
+ <fileset file="${org.hibernate:hibernate-annotations:jar}"/>
+ <fileset file="${org.hibernate:hibernate-validator:jar}"/>
+ <fileset file="${org.jboss.jpa:jboss-jpa-deployers:jar}"/>
+
<mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
@@ -1909,6 +1838,19 @@
<fileset file="${trove:trove:jar}"/>
<fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
<fileset file="${wscommons-policy:policy:jar}"/>
+ <fileset file="${org.hibernate:ejb3-persistence:jar}"/>
+ <fileset file="${org.hibernate:hibernate-annotations:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
+ <!-- For JSR-250 impl -->
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-common:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-core:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-security:jar:client}"/>
+
<mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
More information about the jboss-cvs-commits
mailing list