10:10 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 11:10:24 -0500 (Fri, 05 Jan 2007)
New Revision: 1826
Modified:
trunk/integration-jboss40/build.xml
Log:
Fix jbossws-samples
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-01-05 16:10:17 UTC (rev 1825)
+++ trunk/integration-jboss40/build.xml 2007-01-05 16:10:24 UTC (rev 1826)
@@ -118,7 +118,7 @@
<!-- Build jbossws-jboss40-integration.jar -->
<mkdir dir="${jboss40.output.lib.dir}"/>
- <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"
manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"
manifest="${etc.dir}/default.mf">
<fileset dir="${jboss42.output.classes.dir}">
<include name="org/jboss/ws/integration/jboss42/**"/>
</fileset>
@@ -137,7 +137,7 @@
</war>
<!-- Build jbossws40.sar -->
- <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar"
manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar"
manifest="${etc.dir}/default.mf">
<fileset dir="${jboss40.output.lib.dir}">
<include name="jbossws-jboss40-integration.jar"/>
<include name="jbossws-context.war"/>
@@ -174,11 +174,11 @@
<!--
| Build retrotranslated jar files.
-->
- <target name="jboss40-module-jars14"
depends="jboss40-jars,jboss40-retro">
+ <target name="jboss40-jars14"
depends="jboss40-jars,jboss40-retro">
<!-- Build jboss-jaxws14.jar -->
<mkdir dir="${jboss40.output.lib.dir}"/>
- <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar"
manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar"
manifest="${etc.dir}/default.mf">
<fileset dir="${jboss40.output.classes14.dir}">
<include name="javax/jws/**"/>
<include name="javax/xml/ws/**"/>
@@ -187,7 +187,7 @@
<!-- Build jbossws14-core.jar -->
<mkdir dir="${jboss40.output.lib.dir}"/>
- <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar"
manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar"
manifest="${etc.dir}/default.mf">
<fileset dir="${jboss40.output.classes14.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
@@ -199,7 +199,7 @@
</jar>
<!-- Build jbossws14-jboss40-integration.jar -->
- <jar
jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar"
manifest="${output.etc.dir}/default.mf">
+ <jar
jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar"
manifest="${etc.dir}/default.mf">
<fileset dir="${jboss40.output.classes14.dir}">
<include name="org/jboss/ws/integration/jboss42/**"/>
</fileset>
@@ -207,7 +207,7 @@
</jar>
<!-- Build jbossws14-client.jar -->
- <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar"
manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar"
manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes14.dir}">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
@@ -225,7 +225,7 @@
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
- <fileset dir="${output.etc.dir}">
+ <fileset dir="${etc.dir}">
<include name="wstools.sh"/>
<include name="wstools.bat"/>
<include name="wstools-log4j.xml"/>
@@ -237,7 +237,7 @@
<copy
tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml"
file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
<!-- Build jbossws40-jdk14.sar -->
- <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"
manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"
manifest="${etc.dir}/default.mf">
<fileset dir="${jboss40.output.lib.dir}">
<include name="jbossws14-jboss40-integration.jar"/>
<include name="jbossws-context.war"/>
@@ -295,13 +295,14 @@
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
+ <delete
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
<delete
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar
dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jboss40.output.lib.dir}/jbossws40.sar"/>
</target>
<!-- Deploy jbossws to jboss40 jdk1.4 -->
- <target name="deploy-jboss40-jdk14"
depends="jboss40-module-jars14" description="Deploy jbossws">
+ <target name="deploy-jboss40-jdk14" depends="jboss40-jars14"
description="Deploy jbossws">
<copy todir="${jboss40.home}/client"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<delete file="${jboss40.home}/client/jbossws-client.jar"/>