Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 05:38:02 -0500 (Fri, 05 Jan 2007)
New Revision: 1806
Modified:
trunk/integration-tomcat/build.xml
Log:
Fix deploy-tomcat
Add jboss-service.xml without ejb3
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-01-05 10:37:57 UTC (rev 1805)
+++ trunk/integration-tomcat/build.xml 2007-01-05 10:38:02 UTC (rev 1806)
@@ -25,6 +25,8 @@
<property name="tomcat.output.classes14.dir"
value="${tomcat.output.dir}/classes14"/>
<property name="tomcat.output.lib.dir"
value="${tomcat.output.dir}/lib"/>
+ <available property="jbossws.thirdparty.available"
file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"/>
+
<target name="tomcat-init" depends="prepare, thirdparty">
</target>
@@ -103,12 +105,34 @@
</target>
+ <target name="tomcat-thirdparty-jar"
unless="jbossws.thirdparty.available">
+ <!-- Build jbossws-thirdparty.jar -->
+ <mkdir dir="${tomcat.output.lib.dir}/build"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jaxb-api.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-common-core.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-j2ee.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-container.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-dependency.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-logging-spi.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-microcontainer.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-remoting.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/javassist.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/concurrent.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/wsdl4j.jar"/>
+ <unjar dest="${tomcat.output.lib.dir}/build"
src="${thirdparty.dir}/xmlsec.jar"/>
+ <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"
manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${tomcat.output.lib.dir}/build"/>
+ </jar>
+ <delete dir="${tomcat.output.lib.dir}/build"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
<!-- Deploy to Tomcat -->
- <target name="deploy-tomcat"
depends="tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to
Tomcat">
+ <target name="deploy-tomcat"
depends="core-jars,tomcat-jars,tomcat-thirdparty-jar" description="Deploy
JBossWS to Tomcat">
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/serializer.jar"/>
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/xalan.jar"/>
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/xercesImpl.jar"/>
@@ -116,37 +140,15 @@
<copy todir="${tomcat.common.dir}/lib"
file="${thirdparty.dir}/log4j.jar"/>
<copy todir="${tomcat.common.dir}/lib"
file="${thirdparty.dir}/mailapi.jar"/>
<copy todir="${tomcat.common.dir}/lib"
file="${core.output.lib.dir}/jbossws-core.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib"
file="${core.output.lib.dir}/jbossws-tomcat-integration.jar"
overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib"
file="${core.output.lib.dir}/jbossws-thirdparty.jar"
overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${core.output.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${core.output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${core.output.lib.dir}/jboss-saaj.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib"
file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"
overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib"
file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"
overwrite="true"/>
<copy todir="${tomcat.webapps.dir}"
file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
- <target name="tomcat-thirdparty-jar"
unless="jbossws.thirdparty.available">
- <!-- Build jbossws-thirdparty.jar -->
- <mkdir dir="${output.lib.dir}/build"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jaxb-api.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-common-core.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${jboss.server.lib}/jboss-j2ee.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-container.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-dependency.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-remoting.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/javassist.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/concurrent.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/wsdl4j.jar"/>
- <unjar dest="${output.lib.dir}/build"
src="${thirdparty.dir}/xmlsec.jar"/>
- <jar jarfile="${output.lib.dir}/jbossws-thirdparty.jar"
manifest="${output.etc.dir}/default.mf">
- <fileset dir="${output.lib.dir}/build"/>
- </jar>
- <delete dir="${output.lib.dir}/build"/>
- </target>
-
<target name="clean" depends="prepare" description="Cleans
up most generated files.">
<delete dir="${tomcat.output.dir}"/>
</target>
Show replies by date