Author: heiko.braun(a)jboss.com
Date: 2007-05-31 10:21:01 -0400 (Thu, 31 May 2007)
New Revision: 3338
Modified:
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
Log:
Cleanup deployment task with regard to SPI tools dependencies
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 13:56:45 UTC
(rev 3337)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 14:21:01 UTC
(rev 3338)
@@ -13,199 +13,208 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBossWS/Native -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
- <macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <element name="copy-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
- <copy todir="${jboss50.home}/client" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
+ <macrodef name="macro-deploy-native50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <element name="copy-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
- <copy-tasks/>
-
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="(a){stacklibs}/jbossws-native50-deployer.zip"/>
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native50.sar"/>
- <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="(a){stacklibs}/jbossws-context.war" overwrite="true"/>
- <!-- 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="(a){thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native50">
- <element name="delete-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
- <delete>
- <fileset dir="${jboss50.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss50.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- <fileset
dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss50.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <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"/>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
- <delete-tasks/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <element name="copy-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
- <copy todir="${jboss42.home}/client" overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
+ <!-- SERVER JARS -->
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"
overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
- <copy-tasks/>
-
- <mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native42.sar"/>
- <!-- 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="(a){thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native42">
- <element name="delete-tasks" optional="yes"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
- <delete>
- <fileset dir="${jboss42.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss42.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-integration-tools.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/> <!-- The old
integration jar-->
- </fileset>
- <fileset
dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss42.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <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"/>
+ <copy-tasks/>
- <delete-tasks/>
- </sequential>
- </macrodef>
-
+ <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="(a){stacklibs}/jbossws-native50-deployer.zip"/>
+ <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native50.sar"/>
+ <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="(a){stacklibs}/jbossws-context.war" overwrite="true"/>
+ <!-- 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="(a){thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native50">
+ <element name="delete-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
+ <delete>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss50.home}/client">
+
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+
+ <include name="jbossws-integration-tools.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+
+ <include name="jbossws-jboss50.jar"/>
+
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <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-tasks/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-native42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <element name="copy-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-integration-tools.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+
+ <copy-tasks/>
+
+ <mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native42.sar"/>
+ <!-- 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="(a){thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native42">
+ <element name="delete-tasks" optional="yes"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <!--include name="jbossws-spi.jar"/-->
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-integration-tools.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+
+ <include name="jbossws-jboss42.jar"/>
+
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <include name="jbossws-integration.jar"/> <!-- The old
integration jar-->
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <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-tasks/>
+ </sequential>
+ </macrodef>
+
</project>
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 13:56:45 UTC
(rev 3337)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 14:21:01 UTC
(rev 3338)
@@ -13,135 +13,136 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-sunri50">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/client">
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- </copy>
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="(a){stacklibs}/jbossws-sunri50-deployer.zip"/>
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri50.sar"/>
- <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="(a){stacklibs}/jbossws-context.war" overwrite="true"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss50 -->
- <macrodef name="macro-undeploy-sunri50">
- <sequential>
- <delete>
- <fileset dir="${jboss50.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- <fileset
dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </delete>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-sunri42">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <!--fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset-->
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/client">
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- </copy>
- <mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss42 -->
- <macrodef name="macro-undeploy-sunri42">
- <sequential>
- <delete>
- <fileset dir="${jboss42.home}/client">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- <fileset
dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <!--include name="jbossws-spi.jar"/-->
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </delete>
- <delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- </sequential>
- </macrodef>
-
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss50 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"
overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="(a){stacklibs}/jbossws-sunri50-deployer.zip"/>
+ <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri50.sar"/>
+ <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="(a){stacklibs}/jbossws-context.war" overwrite="true"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <macrodef name="macro-undeploy-sunri50">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss50.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+
+ <include name="jbossws-jboss50.jar"/>
+
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </delete>
+ <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-sunri42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/client">
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ </copy>
+ <mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <macrodef name="macro-undeploy-sunri42">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+
+ <include name="jbossws-jboss42.jar"/>
+
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </delete>
+ <delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
</project>
Show replies by date