[jboss-cvs] JBossAS SVN: r67083 - trunk/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 14 12:34:27 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-11-14 12:34:26 -0500 (Wed, 14 Nov 2007)
New Revision: 67083
Modified:
trunk/build/build-distr.xml
Log:
Fix ejb3 client launcher classpath
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-11-14 17:32:53 UTC (rev 67082)
+++ trunk/build/build-distr.xml 2007-11-14 17:34:26 UTC (rev 67083)
@@ -208,42 +208,41 @@
<target name="_module-aspects-most">
<property name="_module.name" value="aspects" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
<!-- Copy the generated libraries -->
<unjar src="${_module.output}/lib/${aop.deployer}" dest="${install.server}/all/deployers/${aop.deployer}"/>
-
+
<mkdir dir="${install.lib}"/>
<!-- FIXME Temporary until after JBoss AOP 2.0.0.beta2
- Should use the jboss.aop.lib version
+ Should use the jboss.aop.lib version
<copy todir="${install.lib}" filtering="no">
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-aop-deployer-jdk50.jar"/>
- </fileset>
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop-deployer-jdk50.jar"/>
+ </fileset>
</copy>
- -->
+ -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-aop-deployer-jdk50.jar"/>
</fileset>
</copy>
-
+
<!-- FIXME Temporary until after JBoss AOP 2.0.0.beta2
- Should use the jboss.aop.lib versions
- -->
+ Should use the jboss.aop.lib versions
+ -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-aop-jboss4-jdk50.jar"/>
</fileset>
</copy>
-
+
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-aop-jboss5.jar"/>
</fileset>
</copy>
-
-
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1756,7 +1755,7 @@
<fileset dir="${jboss.cache.lib}">
<include name="jbosscache.jar"/>
<include name="pojocache.jar"/>
- </fileset>
+ </fileset>
<fileset dir="${jboss.jboss.security.spi.lib}">
<include name="jboss-security-spi.jar"/>
</fileset>
@@ -1768,7 +1767,7 @@
<include name="sunxacml-support.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -1823,7 +1822,7 @@
<fileset dir="${sun.jaxb.lib}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
+ <include name="jaxb-xjc.jar"/>
</fileset>
<fileset dir="${stax.api.lib}">
<include name="stax-api.jar"/>
@@ -1833,7 +1832,7 @@
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1861,26 +1860,11 @@
<fileset dir="${jboss.common.logging.jdk.lib}">
<exclude name="*-sources.jar"/>
</fileset>
- <fileset dir="${jboss.jbossxb.lib}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss.remoting.lib}">
- <include name="jboss-remoting.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.security.spi.lib}">
- <include name="jboss-security-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jbosssx.lib}">
- <include name="jbosssx-client.jar"/>
- </fileset>
- <fileset dir="${jboss.serialization.lib}">
- <include name="jboss-serialization.jar"/>
- </fileset>
<fileset dir="${jboss.integration.lib}">
<include name="jboss-integration.jar"/>
</fileset>
- <fileset dir="${jboss.metadata.lib}">
- <include name="jboss-metadata.jar"/>
+ <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"/>
@@ -1888,6 +1872,9 @@
<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.jbossws.common.lib}">
<include name="jbossws-common.jar"/>
</fileset>
@@ -1902,8 +1889,32 @@
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
+ <include name="jboss-saaj.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.metadata.lib}">
+ <include name="jboss-metadata.jar"/>
+ </fileset>
+ <fileset dir="${jboss.microcontainer.root}/lib/">
+ <include name="jboss-container-metadata.jar"/>
+ <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="${stax.api.lib}">
<include name="stax-api.jar"/>
</fileset>
@@ -1921,7 +1932,7 @@
<fileset dir="${sun.jaxws.lib}">
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="stax-ex.jar"/>
+ <include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
</fileset>
<fileset dir="${woodstox.woodstox.lib}">
@@ -1930,16 +1941,8 @@
<fileset dir="${wscommons.policy.lib}">
<include name="policy.jar"/>
</fileset>
- <fileset dir="${jboss.microcontainer.root}/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>
</copy>
-
+
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
<copy todir="${install.lib}/endorsed" filtering="no">
@@ -1953,7 +1956,7 @@
<include name="serializer.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code to server/all/lib -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${apache.logging.lib}">
@@ -1987,14 +1990,13 @@
<!-- 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="${jboss.metadata.lib}/jboss-metadata.jar" dest="${install.docs}">
<patternset>
<include name="dtd/*"/>
<include name="schema/*"/>
</patternset>
</unzip>
-
+
<!-- copy binary release of JBossTS from thirdparty repo -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
@@ -2004,11 +2006,11 @@
</fileset>
</copy>
<copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-
+
<!-- Install jbossws.sar -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
-
+
<!-- Install jbossws tools shell scripts -->
<unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
<patternset>
@@ -2022,9 +2024,9 @@
<include name="wsconsume.*"/>
</patternset>
</unzip>
-
+
<chmod perm="+x">
- <fileset dir ="${install.bin}">
+ <fileset dir="${install.bin}">
<include name="wstools.sh"/>
<include name="wsprovide.sh"/>
<include name="wsconsume.sh"/>
More information about the jboss-cvs-commits
mailing list