[jboss-cvs] JBossAS SVN: r88677 - trunk/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 11 18:14:56 EDT 2009
Author: pgier
Date: 2009-05-11 18:14:55 -0400 (Mon, 11 May 2009)
New Revision: 88677
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:42:56 UTC (rev 88676)
+++ trunk/build/build-distr.xml 2009-05-11 22:14:55 UTC (rev 88677)
@@ -153,22 +153,6 @@
<!-- Copy the generated libraries -->
<unjar src="${_module.output}/jboss-as-aspects-jboss-aop-jboss5-deployer.jar" dest="${install.server}/all/deployers/${aop.deployer}"/>
- <mkdir dir="${install.lib}"/>
- <!--<copy todir="${install.lib}" filtering="no">
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-asi.jar"/>
- </fileset>
- </copy>-->
-
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-aop-asintegration-core.jar"/>
- <include name="jboss-aop-asintegration-jmx.jar"/>
- <include name="jboss-aop-asintegration-mc.jar"/>
- <include name="jboss-aop-deployers.jar"/>
- </fileset>
- </copy>
-
<copy file="${_module.output}/jboss-as-aspects-jboss-aop-jboss5.jar"
tofile="${install.lib}/jboss-aop-jboss5.jar" filtering="no" />
@@ -177,11 +161,6 @@
<copy file="${_module.output}/jboss-as-aspects-jboss-aspect-jdk50-client.jar"
tofile="${install.client}/jboss-aspect-jdk50-client.jar" filtering="no" />
- <!-- Copy the third party libraries -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${org.jboss.aspects.lib}" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- </copy>
</target>
<target name="_module-aspects-all" depends="_module-aspects-most">
@@ -229,30 +208,6 @@
</fileset>
</chmod>
- <!-- Copy thirdparty code -->
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${gnu.getopt.lib}">
- <include name="getopt.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${apache.log4j.lib}">
- <include name="log4j.jar"/>
- </fileset>
- </copy>
- <copy file="${snmptrapappender.snmptrapappender.lib}/snmpTrapAppender.jar" tofile="${install.all.lib}/log4j-snmp-appender.jar">
- </copy>
-
- <!-- Copy thirdparty client code -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${apache.log4j.lib}">
- <include name="log4j.jar"/>
- </fileset>
- <fileset dir="${gnu.getopt.lib}">
- <include name="getopt.jar"/>
- </fileset>
- </copy>
-
</target>
<target name="_module-main-all" depends="_module-main-most">
@@ -301,6 +256,10 @@
</copy>
</target>
+ <!-- ========== -->
+ <!-- System JMX -->
+ <!-- ========== -->
+
<target name="_module-system-jmx-most">
<property name="_module.name" value="system-jmx" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
@@ -370,25 +329,6 @@
<copy file="${_module.output}/jboss-as-server-shutdown.jar"
tofile="${install.bin}/shutdown.jar" filtering="no"/>
- <!-- Copy thirdparty code -->
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${oswego.concurrent.lib}">
- <include name="concurrent.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${apache.bcel.lib}">
- <include name="bcel.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy thirdparty client code -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${oswego.concurrent.lib}">
- <include name="concurrent.jar"/>
- </fileset>
- </copy>
-
<!-- Default server config -->
<mkdir dir="${install.server}/all/deploy"/>
@@ -512,11 +452,6 @@
<copy file="${_module.output}/jboss-as-connector-jbosscx-client.jar"
tofile="${install.server}/all/lib/jbosscx-client.jar" filtering="no"/>
- <!-- QUARTZ jar -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
- </copy>
-
</target>
<target name="_module-connector-all" depends="_module-connector-most">
@@ -553,12 +488,6 @@
<copy file="${_module.output}/jboss-as-messaging.jar"
tofile="${install.all.lib}/jboss-messaging-int.jar" filtering="no" />
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.messaging.lib}">
- <include name="jboss-messaging.jar"/>
- </fileset>
- </copy>
-
<!--
Security metadata, same for "all" and "default" configurations.
-->
@@ -570,13 +499,6 @@
</copy>
<!--
- Generated client libraries, same for "all" and "default" configurations.
- -->
- <mkdir dir="${install.client}"/>
- <copy file="${jboss.messaging.lib}/jboss-messaging-client.jar"
- todir="${install.client}" filtering="no" />
-
- <!--
Clustered Config, using HSQLDB (but not supposed to go into production mode, since clustering requires a shared DB)
-->
<mkdir dir="${install.all.deploy}/messaging"/>
@@ -1688,7 +1610,8 @@
<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="${log4j:log4j:jar}"/>
+ <fileset file="${quartz:quartz:jar}"/>
<fileset file="${commons-logging:commons-logging:jar}"/>
<fileset file="${jaxen:jaxen:jar}"/>
<fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
@@ -1732,12 +1655,20 @@
<fileset file="${org.hibernate:hibernate-annotations:jar}"/>
<fileset file="${org.hibernate:hibernate-validator:jar}"/>
<fileset file="${org.jboss.jpa:jboss-jpa-deployers:jar}"/>
-
+ <fileset file="${org.jboss.aspects:jboss-current-invocation-aspects:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-remoting-aspects:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-security-aspects:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-transaction-aspects:jar}"/>
+ <fileset file="${bcel:bcel:jar}"/>
+ <fileset file="${jboss.messaging:jboss-messaging:jar}"/>
<mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
</copy>
+ <copy file="${snmptrapappender:snmpTrapAppender:jar}"
+ tofile="${install.all.lib}/log4j-snmp-appender.jar"/>
+
<!-- Copy the generated libraries to lib-->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -1782,6 +1713,11 @@
<fileset file="${sun-jaxb:jaxb-impl:jar}"/>
<fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
<fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-asintegration-core:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-asintegration-jmx:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-asintegration-mc:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-deployers:jar}"/>
+ <fileset file="${gnu-getopt:getopt:jar}"/>
<mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
@@ -1850,7 +1786,10 @@
<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}"/>
-
+ <fileset file="${log4j:log4j:jar}"/>
+ <fileset file="${gnu-getopt:getopt:jar}"/>
+ <fileset file="${oswego-concurrent:concurrent:jar}"/>
+ <fileset file="${jboss.messaging:jboss-messaging-client:jar}"/>
<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