[jbossws-commits] JBossWS SVN: r3518 - in branches/jbossws-2.0: integration/spi/ant-import and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Jun 9 05:24:31 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-09 05:24:31 -0400 (Sat, 09 Jun 2007)
New Revision: 3518
Modified:
branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml
branches/jbossws-2.0/jbossws-core/build.xml
Log:
Fix script/resources deployment
Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 09:03:28 UTC (rev 3517)
+++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 09:24:31 UTC (rev 3518)
@@ -110,9 +110,9 @@
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
<include name="jbossws-core.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-resources.zip"/>
+ <include name="jbossws-core-scripts.zip"/>
</fileset>
<fileset dir="${int.native.dir}/output/lib">
<include name="jbossws-context.war"/>
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:03:28 UTC (rev 3517)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:24:31 UTC (rev 3518)
@@ -31,7 +31,6 @@
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
- spiscripts="${spi.dir}/etc"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
@@ -53,7 +52,6 @@
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
- spiscripts="${spi.dir}/etc"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
@@ -77,7 +75,6 @@
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
- spiscripts="${spi.dir}/etc"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss40.home}"/>
</target>
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:03:28 UTC (rev 3517)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:24:31 UTC (rev 3518)
@@ -26,9 +26,8 @@
<sequential>
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <!-- BIN RESOURCES -->
- <unzip dest="${jboss50.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-resources.zip"/>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
<chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
@@ -86,7 +85,7 @@
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
<delete>
- <!-- BIN RESOURCES -->
+ <!-- BIN SCRIPTS -->
<fileset dir="${jboss50.home}/bin">
<include name="wsconsume.*"/>
<include name="wsprovide.*"/>
@@ -148,9 +147,8 @@
</fileset>
</copy>
- <!-- BIN RESOURCES -->
- <unzip dest="${jboss42.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-resources.zip"/>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
<chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
@@ -196,7 +194,7 @@
<include name="jaxb-api.jar"/>
</fileset>
- <!-- BIN RESOURCES -->
+ <!-- BIN SCRIPTS -->
<fileset dir="${jboss42.home}/bin">
<include name="wsconsume.*"/>
<include name="wsprovide.*"/>
@@ -251,9 +249,8 @@
<sequential>
<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
- <!-- BIN RESOURCES -->
- <unzip dest="${jboss40.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-resources.zip"/>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
<chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
@@ -320,7 +317,7 @@
<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
<delete>
- <!-- BIN RESOURCES -->
+ <!-- BIN SCRIPTS -->
<fileset dir="${jboss40.home}/bin">
<include name="wsconsume.*"/>
<include name="wsprovide.*"/>
Modified: branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml
===================================================================
--- branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-09 09:03:28 UTC (rev 3517)
+++ branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-09 09:24:31 UTC (rev 3518)
@@ -15,29 +15,27 @@
<macrodef name="macro-deploy-spi">
<attribute name="spilibs"/>
- <attribute name="spiscripts"/>
<attribute name="thirdpartylibs"/>
<attribute name="jbosshome"/>
<sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
<copy todir="@{jbosshome}/client">
<fileset dir="@{spilibs}">
<include name="jbossws-spi.jar"/>
</fileset>
</copy>
+
+ <!-- SERVER JARS-->
<copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
<fileset dir="@{spilibs}">
<include name="jbossws-spi.jar"/>
</fileset>
</copy>
- <copy todir="@{jbosshome}/bin" overwrite="true">
- <fileset dir="@{spiscripts}">
- <include name="wsconsume.bat"/>
- <include name="wsconsume.sh"/>
- <include name="wsprovide.bat"/>
- <include name="wsprovide.sh"/>
- </fileset>
- </copy>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
</sequential>
</macrodef>
@@ -45,18 +43,21 @@
<attribute name="jbosshome"/>
<sequential>
<delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
<fileset dir="@{jbosshome}/client">
<include name="jbossws-spi.jar"/>
</fileset>
+
+ <!-- SERVER JARS-->
<fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
<include name="jbossws-spi.jar"/>
</fileset>
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.bat"/>
- <include name="wsconsume.sh"/>
- <include name="wsprovide.bat"/>
- <include name="wsprovide.sh"/>
- </fileset>
</delete>
</sequential>
</macrodef>
Modified: branches/jbossws-2.0/jbossws-core/build.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/build.xml 2007-06-09 09:03:28 UTC (rev 3517)
+++ branches/jbossws-2.0/jbossws-core/build.xml 2007-06-09 09:24:31 UTC (rev 3518)
@@ -172,11 +172,8 @@
</metainf>
</jar>
- <!-- Build jbossws-resources.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-resources.zip" >
- <fileset dir="${core.resources.dir}/standard-config">
- <include name="standard-*-config.xml"/>
- </fileset>
+ <!-- Build jbossws-core-scripts.zip -->
+ <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" >
<fileset dir="${core.output.etc.dir}">
<include name="wsrunclient.bat"/>
<include name="wstools.bat"/>
More information about the jbossws-commits
mailing list