[jboss-cvs] JBossAS SVN: r88841 - in trunk: component-matrix and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 13 18:51:37 EDT 2009
Author: pgier
Date: 2009-05-13 18:51:36 -0400 (Wed, 13 May 2009)
New Revision: 88841
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.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-13 22:24:01 UTC (rev 88840)
+++ trunk/build/build-distr.xml 2009-05-13 22:51:36 UTC (rev 88841)
@@ -589,13 +589,6 @@
<copy file="${_module.output}/jboss-as-security.jar"
tofile="${install.all.lib}/jbosssx-server.jar" filtering="no"/>
- <!-- Copy client library to client dir -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${jboss.jbosssx.client.lib}">
- <include name="jbosssx-client.jar"/>
- </fileset>
- </copy>
-
<copy file="${_module.output}/jboss-as-security-client.jar"
tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
@@ -768,9 +761,6 @@
<!-- Client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
- <fileset dir="${apache.scout.lib}">
- <include name="scout.jar"/>
- </fileset>
<fileset dir="${_module.output}">
<include name="jboss-as-varia-jbossjmx-ant.jar"/>
<include name="jboss-as-varia-jboss-srp-client.jar"/>
@@ -778,13 +768,6 @@
<mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</copy>
- <!-- Copy thirdparty code -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${sun.javamail.lib}">
- <include name="mail.jar"/>
- </fileset>
- </copy>
-
<!-- Default server config -->
<!-- Copy the deployables -->
@@ -802,40 +785,14 @@
</copy>
<!-- copy snmp-adaptor.sar unpacked to deploy -->
- <!-- and the used joesnmp.jar library to lib -->
<mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
<unjar src="${_module.output}/snmp-adaptor.sar" dest="${install.server}/all/deploy/snmp-adaptor.sar"/>
- <copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${opennms.joesnmp.lib}">
- <include name="joesnmp.jar"/>
- </fileset>
- </copy>
<!-- Include the JMX console war unpacked -->
<mkdir dir="${install.server}/all/deploy/jmx-console.war"/>
<unjar src="${_module.output}/jboss-as-varia-jmx-console.war" dest="${install.server}/all/deploy/jmx-console.war"/>
- <!-- Include the juddi sar unpacked -->
- <mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
- <unjar src="${org.jboss.jaxr.lib}/juddi-service.sar"
- dest="${install.server}/all/deploy/juddi-service.sar" />
- <!-- copy scout.jar and juddi.jar to juddi-service.sar directory -->
- <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
- <fileset dir="${apache.scout.lib}">
- <include name="scout.jar"/>
- </fileset>
- <fileset dir="${juddi.juddi.lib}">
- <include name="juddi.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${wutka.dtdparser.lib}">
- <include name="dtdparser121.jar"/>
- </fileset>
- </copy>
-
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
<unjar src="${_module.output}/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
@@ -867,20 +824,6 @@
</fileset>
</copy>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${beanshell.beanshell.lib}">
- <include name="bsh.jar"/>
- </fileset>
- </copy>
-
- <!-- Create optional libs; e.g. seam-integration -->
- <mkdir dir="${install.server}/all/deployers/seam.deployer/lib-int"/>
- <copy todir="${install.server}/all/deployers/seam.deployer/lib-int" filtering="no">
- <fileset dir="${org.jboss.seam.integration.lib}">
- <include name="jboss-seam-int-jbossas.jar"/>
- </fileset>
- </copy>
-
<!-- copy the jboss-monitoring JAR -->
<copy file="${_module.output}/jboss-as-varia-jboss-monitoring.jar"
tofile="${install.server}/all/lib/jboss-monitoring.jar"/>
@@ -914,54 +857,16 @@
<fileset dir="${_module.output}/resources/services/loggingmonitor"/>
</copy>
- <!-- copy bsf.jar used by scripting-listener -->
- <copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${apache.bsf.lib}">
- <include name="bsf.jar"/>
- </fileset>
- </copy>
-
- <!-- copy the threads deployer files into their proper places -->
- <copy todir="${install.common.lib}">
- <fileset dir="${org.jboss.threads.lib}">
- <include name="jboss-threads.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${install.server}/all/deployers/jboss-threads.deployer/META-INF"/>
- <copy todir="${install.server}/all/deployers/jboss-threads.deployer">
- <fileset dir="${org.jboss.threads.lib}">
- <include name="jboss-threads-metadata.jar"/>
- </fileset>
- </copy>
<copy todir="${install.server}/all/deployers/jboss-threads.deployer/META-INF">
<fileset dir="${_module.output}/resources/threads"/>
</copy>
- <!-- copy the xnio deployer files into their proper places -->
- <copy todir="${install.common.lib}">
- <fileset dir="${org.jboss.xnio.lib}">
- <include name="xnio-api.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
- <copy todir="${install.server}/all/deploy/xnio-provider.jar">
- <fileset dir="${org.jboss.xnio.lib}">
- <include name="xnio-nio.jar"/>
- </fileset>
- </copy>
<copy todir="${install.server}/all/deploy/xnio-provider.jar/META-INF">
<fileset dir="${_module.output}/resources/xnio">
<include name="xnio-jboss-beans.xml"/>
</fileset>
</copy>
- <mkdir dir="${install.server}/all/deployers/xnio.deployer/META-INF"/>
- <copy todir="${install.server}/all/deployers/xnio.deployer">
- <fileset dir="${org.jboss.xnio.lib}">
- <include name="xnio-metadata.jar"/>
- </fileset>
- </copy>
<copy todir="${install.server}/all/deployers/xnio.deployer/META-INF">
<fileset dir="${_module.output}/resources/xnio">
<include name="xnio-deployer-jboss-beans.xml"/>
@@ -989,16 +894,6 @@
<property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
<!--<property name="_module.ext" override="true" value="${project.root}/${_module.name}/ext"/>-->
- <!-- Copy the thirdparty libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.web.lib}">
- <include name="el-api.jar"/>
- <include name="jsp-api.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
- </copy>
-
<!-- Copy the deployers -->
<mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
<copy todir="${install.server}/all/deployers/jbossweb.deployer">
@@ -1593,6 +1488,15 @@
version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
</maven:dependencies>
+ <mkdir dir="${install.common.lib}"/>
+ <copy todir="${install.common.lib}" filtering="no">
+ <fileset file="${org.jboss.threads:jboss-threads:jar}"/>
+ <fileset file="${org.jboss.xnio:xnio-api:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
<!-- Copy thirdparty libraries to server/all/lib -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -1655,7 +1559,15 @@
<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="${javax.mail:mail:jar}"/>
<fileset file="${jboss.messaging:jboss-messaging:jar}"/>
+ <fileset file="${org.beanshell:bsh:jar}"/>
+ <fileset file="${joesnmp:joesnmp:jar}"/>
+ <fileset file="${wutka-dtdparser:dtdparser:jar}"/>
+ <fileset file="${apache-bsf:bsf:jar}"/>
+ <fileset file="${jboss.web:el-api:jar}"/>
+ <fileset file="${jboss.web:jsp-api:jar}"/>
+ <fileset file="${jboss.web:servlet-api:jar}"/>
<mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
@@ -1785,6 +1697,8 @@
<fileset file="${gnu-getopt:getopt:jar}"/>
<fileset file="${oswego-concurrent:concurrent:jar}"/>
<fileset file="${jboss.messaging:jboss-messaging-client:jar}"/>
+ <fileset file="${org.jboss.security:jbosssx-client:jar}"/>
+ <fileset file="${apache-scout:scout:jar}"/>
<mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
@@ -1870,5 +1784,56 @@
<fileset file="${org.jboss.webbeans.integration:webbeans-ri-int-deployer:zip}"/>
</unzip>
+ <!-- Copy varia stuff -->
+
+ <!-- Include the juddi sar unpacked -->
+ <mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
+ <unjar src="${org.jboss.jaxr:juddi-service:sar}"
+ dest="${install.server}/all/deploy/juddi-service.sar" />
+
+ <!-- copy scout.jar and juddi.jar to juddi-service.sar directory -->
+ <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
+ <fileset file="${apache-scout:scout:jar}"/>
+ <fileset file="${juddi:juddi:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- Create optional libs; e.g. seam-integration -->
+ <mkdir dir="${install.server}/all/deployers/seam.deployer/lib-int"/>
+ <copy todir="${install.server}/all/deployers/seam.deployer/lib-int" filtering="no">
+ <fileset file="${org.jboss.seam.integration:jboss-seam-int-jbossas:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- copy the threads deployer files into their proper places -->
+ <mkdir dir="${install.server}/all/deployers/jboss-threads.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/jboss-threads.deployer">
+ <fileset file="${org.jboss.threads:jboss-threads-metadata:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- copy the xnio deployer files into their proper places -->
+ <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
+ <copy todir="${install.server}/all/deploy/xnio-provider.jar">
+ <fileset file="${org.jboss.xnio:xnio-nio:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <mkdir dir="${install.server}/all/deployers/xnio.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/xnio.deployer">
+ <fileset file="${org.jboss.xnio:xnio-metadata:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ <!-- End varia stuff -->
</target>
</project>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-05-13 22:24:01 UTC (rev 88840)
+++ trunk/component-matrix/pom.xml 2009-05-13 22:51:36 UTC (rev 88841)
@@ -1368,6 +1368,10 @@
<groupId>apache-xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2194,6 +2198,7 @@
<!-- JBAS-6904: use org.hibernate:hibernate-core -->
<exclude>org.hibernate:hibernate</exclude>
<exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
+ <exclude>wutka-dtdparser:dtdparser121</exclude>
</excludes>
</bannedDependencies>
</rules>
More information about the jboss-cvs-commits
mailing list