[jbossws-commits] JBossWS SVN: r3503 - in trunk/integration/native: src/main/etc and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 8 05:25:03 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-06-08 05:25:02 -0400 (Fri, 08 Jun 2007)
New Revision: 3503
Modified:
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/src/main/etc/bin-dist-deploy.xml
Log:
Include jbossws-core scripts in distribution
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-08 09:21:13 UTC (rev 3502)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-08 09:25:02 UTC (rev 3503)
@@ -73,8 +73,17 @@
<include name="*.bat"/>
</fileset>
</copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${core.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+
<chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
<!-- docs -->
<zip destfile="${bindist.docs.dir}/apidocs-${version.id}.zip">
<fileset dir="${native.output.dir}/apidocs"/>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-06-08 09:21:13 UTC (rev 3502)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-08 09:25:02 UTC (rev 3503)
@@ -29,7 +29,8 @@
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty"/>
+ thirdpartylibs="${core.dir}/thirdparty"
+ corescripts="${core.dir}/src/main/etc"/>
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
@@ -53,7 +54,8 @@
jbosslibs="${int.jboss42.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty"/>
+ thirdpartylibs="${core.dir}/thirdparty"
+ corescripts="${core.dir}/src/main/etc"/>
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
@@ -77,7 +79,8 @@
jbosslibs="${int.jboss40.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty"/>
+ thirdpartylibs="${core.dir}/thirdparty"
+ corescripts="${core.dir}/src/main/etc"/>
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-08 09:21:13 UTC (rev 3502)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-08 09:25:02 UTC (rev 3503)
@@ -23,11 +23,12 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="corescripts"/>
<sequential>
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss50.home}/client" overwrite="true">
+ <copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -74,10 +75,21 @@
<!-- Deploy juddi-service.sar -->
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <copy todir="${jboss50.home}/bin" overwrite="true">
+ <fileset dir="@{corescripts}">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
</sequential>
</macrodef>
- <macrodef name="macro-undeploy-native50">
+ <macrodef name="macro-undeploy-native50">
<sequential>
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
<delete>
@@ -93,15 +105,15 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
- <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss50.jar"/>
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
<!-- SERVER JARS -->
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
<include name="jbossws-jboss50.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -113,6 +125,16 @@
<delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
<!-- Undeploy juddi-service.sar -->
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
+ <delete>
+ <fileset dir="${jboss50.home}/bin">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </delete>
</sequential>
</macrodef>
@@ -122,11 +144,12 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="corescripts"/>
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-
+
<!-- CLIENT JARS -->
- <copy todir="${jboss42.home}/client" overwrite="true">
+ <copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
@@ -146,9 +169,9 @@
<include name="policy.jar"/>
</fileset>
</copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
@@ -164,6 +187,18 @@
<!-- Deploy juddi-service.sar -->
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <copy todir="${jboss42.home}bin" overwrite="true">
+ <fileset dir="@{corescripts}">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
+
</sequential>
</macrodef>
@@ -171,8 +206,8 @@
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
<delete>
-
- <!-- CLIENT JARS -->
+
+ <!-- CLIENT JARS -->
<fileset dir="${jboss42.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -183,19 +218,19 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
- <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss42.jar"/>
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
-
- <!-- SERVER JARS -->
+
+ <!-- SERVER JARS -->
<fileset dir="${jboss42.home}/lib">
- <!-- Remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
</fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
<include name="jbossws-jboss42.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -205,6 +240,16 @@
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<!-- Undeploy juddi-service.sar -->
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
+ <delete>
+ <fileset dir="${jboss42.home}/bin">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </delete>
</sequential>
</macrodef>
@@ -214,11 +259,12 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="corescripts"/>
<sequential>
<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-
+
<!-- CLIENT JARS -->
- <copy todir="${jboss40.home}/client" overwrite="true">
+ <copy todir="${jboss40.home}/client" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss40.jar"/>
</fileset>
@@ -239,9 +285,9 @@
<include name="wsdl4j.jar"/>
</fileset>
</copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss40.jar"/>
</fileset>
@@ -257,22 +303,34 @@
<!-- Deploy juddi-service.sar -->
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <copy todir="${jboss40.home}/bin" overwrite="true">
+ <fileset dir="@{corescripts}">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
+
</sequential>
</macrodef>
-
- <macrodef name="macro-setup-native40-no-ejb3">
+
+ <macrodef name="macro-setup-native40-no-ejb3">
<sequential>
-
+
<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
-
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
<move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
-
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+
</sequential>
</macrodef>
@@ -280,8 +338,8 @@
<sequential>
<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
<delete>
-
- <!-- CLIENT JARS -->
+
+ <!-- CLIENT JARS -->
<fileset dir="${jboss40.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -292,21 +350,21 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
- <include name="jbossws-jboss40.jar"/>
+ <include name="jbossws-jboss40.jar"/>
<include name="policy.jar"/>
<include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
<include name="jbossws14-client.jar"/>
</fileset>
-
- <!-- SERVER JARS -->
+
+ <!-- SERVER JARS -->
<fileset dir="${jboss40.home}/lib">
- <!-- Remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
</fileset>
- <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
+ <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
<include name="jbossws-jboss40.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -316,9 +374,20 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<!-- Undeploy juddi-service.sar -->
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <!-- Remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
+
+ <delete>
+ <fileset dir="${jboss40.home}/bin">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </delete>
</sequential>
</macrodef>
+
</project>
Modified: trunk/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-08 09:21:13 UTC (rev 3502)
+++ trunk/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-08 09:25:02 UTC (rev 3503)
@@ -26,7 +26,8 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ corescripts="${bin.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
@@ -50,7 +51,8 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ corescripts="${bin.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
@@ -74,7 +76,8 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ corescripts="${bin.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
More information about the jbossws-commits
mailing list