[jboss-svn-commits] JBL Code SVN: r37040 - in labs/jbosstm/trunk/XTS: WS-C/dev/dd and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 31 00:12:34 EDT 2011
Author: adinn
Date: 2011-05-31 00:12:33 -0400 (Tue, 31 May 2011)
New Revision: 37040
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf
labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf
labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml
labs/jbosstm/trunk/XTS/sar/META-INF/manifest.mf
labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml
labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_application.xml
labs/jbosstm/trunk/XTS/demo/xts-build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
added a few extra artifacts and modified build process to allow XTS to be deployed to AS7 -- part fix for JBTM-848
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -77,6 +77,9 @@
<!-- we had to delete the JaxRPC handlers so we export the bits needed to allow clients to create them -->
<property name="ws-c10.api.classes" value="com/arjuna/webservices/wscoor/CoordinationConstants.class"/>
+ <property name="ws-c11.coordinator.endpoint.classes" value="com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.class
+ com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.class"/>
+
<property name="tests.libs" value="junit.jar"/>
<path id="tests.lib.path">
@@ -176,7 +179,7 @@
<target name="jars11">
<copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
<jar jarfile="${build.lib.dir}/ws-c11.jar">
- <fileset dir="${build.classes11.dir}"/>
+ <fileset dir="${build.classes11.dir}" excludes="${ws-c11.coordinator.endpoint.classes}"/>
</jar>
</target>
@@ -202,7 +205,9 @@
<target name="webapps11" depends="jars11" >
<copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
- <war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml"/>
+ <war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml" manifest="${dd.dir}/manifest.mf">
+ <classes dir="${build.classes11.dir}" includes="${ws-c11.coordinator.endpoint.classes}" />
+ </war>
</target>
<target name="webapps" depends="jars, webapps11, webapps10"/>
Added: labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf 2011-05-31 04:12:33 UTC (rev 37040)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -22,7 +22,12 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
+
<display-name>WS-Coordination 1.1 Services</display-name>
<description>WS-Coordination 1.1 Services</description>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -88,6 +88,18 @@
<property name="ws-t10.api.classes" value="com/arjuna/wst/BAParticipantManager.class"/>
<property name="ws-t11.api.classes" value="com/arjuna/wst11/BAParticipantManager.class
com/arjuna/wst11/ConfirmCompletedParticipant.class"/>
+ <property name="ws-t11.coordinator.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.class
+ com/arjuna/webservices11/wsat/sei/CompletionCoordinatorRPCPortTypeImpl.class
+ com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.class
+ com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorRPCPortTypeImpl.class
+ com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.class"/>
+ <property name="ws-t11.participant.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.class"/>
+ <property name="ws-t11.client.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.class
+ com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.class"/>
<!--sibling module directories and jars -->
@@ -291,7 +303,7 @@
<copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/ws-t_handlers.xml"/>
<copy file="${dd.dir}/ws-t-rpc_handlers.xml" tofile="${build.classes11.dir}/ws-t-rpc_handlers.xml"/>
<jar jarfile="${build.lib.dir}/ws-t11.jar">
- <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes}"/>
+ <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes} ${ws-t11.coordinator.endpoint.classes} ${ws-t11.participant.endpoint.classes} ${ws-t11.client.endpoint.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/ws-t11-api.jar">
<fileset dir="${build.classes11.dir}" includes="${ws-t11.api.classes}"/>
@@ -310,11 +322,16 @@
<copy file="${dd.dir}/ws-t11-participant_web-app.xml" tofile="${build.dd.dir}/web-app11-participant.xml"/>
<copy file="${dd.dir}/ws-t11-client_web-app.xml" tofile="${build.dd.dir}/web-app11-client.xml"/>
<!-- coordinator -->
- <war warfile="${build.webapps.dir}/ws-t11-coordinator.war" webxml="${build.dd.dir}/web-app11-coordinator.xml"/>
+ <war warfile="${build.webapps.dir}/ws-t11-coordinator.war" webxml="${build.dd.dir}/web-app11-coordinator.xml" manifest="${dd.dir}/manifest.mf">
+ <classes dir="${build.classes11.dir}" includes="${ws-t11.coordinator.endpoint.classes}"/>
+ </war>
<!-- participants -->
- <war warfile="${build.webapps.dir}/ws-t11-participant.war" webxml="${build.dd.dir}/web-app11-participant.xml"/>
+ <war warfile="${build.webapps.dir}/ws-t11-participant.war" webxml="${build.dd.dir}/web-app11-participant.xml" manifest="${dd.dir}/manifest.mf">
+ <classes dir="${build.classes11.dir}" includes="${ws-t11.participant.endpoint.classes}"/>
+ </war>
<!-- client -->
- <war warfile="${build.webapps.dir}/ws-t11-client.war" webxml="${build.dd.dir}/web-app11-client.xml">
+ <war warfile="${build.webapps.dir}/ws-t11-client.war" webxml="${build.dd.dir}/web-app11-client.xml" manifest="${dd.dir}/manifest.mf">
+ <classes dir="${build.classes11.dir}" includes="${ws-t11.client.endpoint.classes}"/>
</war>
</target>
Added: labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf 2011-05-31 04:12:33 UTC (rev 37040)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -20,9 +20,12 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
-<web-app>
<display-name>Arjuna Web Services Transaction 1.1 Client Services</display-name>
<description>Arjuna Web Services Transaction 1.1 Client Services</description>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -22,7 +22,12 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
+
<display-name>Arjuna Web Services Transaction 1.1 Participant Services</display-name>
<description>Arjuna Web Services Transaction 1.1 Participant Services</description>
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_application.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_application.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -52,4 +52,7 @@
<module>
<java>wstx-tests.jar</java>
</module>
+ <module>
+ <java>wstx11-tests.jar</java>
+ </module>
</application>
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -70,12 +70,15 @@
<property name="xts.home" value=".."/>
<property name="lib.dir" location="${xts.home}/lib"/>
+ <!--
<property name="jbossts.lib.dir" location="${jboss.home}/common/lib"/>
<property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
<property name="jboss.common.lib.dir" location="${jboss.home}/common/lib"/>
+ -->
<property name="lib.libs" value="jbossxts-api.jar"/>
+ <!--
<property name="ext.libs" value="jbossjta.jar jbossjts.jar"/>
<condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
geronimo-ws-metadata_2.0_spec.jar">
@@ -89,6 +92,7 @@
<property name="jboss.common.libs" value="jboss-servlet-api_3.0_spec.jar jaxrpc-api.jar"/>
+ -->
<!-- ================================================================== -->
<property name="build.dir" location="build"/>
@@ -113,12 +117,22 @@
<fileset dir="${lib.dir}" includes="${lib.libs}"/>
</path>
<path id="ext.path">
+ <!--
<fileset dir="${jbossts.lib.dir}" includes="${ext.libs}"/>
+ -->
+ <fileset dir="${jboss.home}/modules/org/jboss/jts/main/" includes="jbossjts-4.14.0.Final.jar"/>
</path>
<path id="jboss.client.path">
+ <!--
<fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.libs}"/>
<fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.libs}"/>
+ -->
+ <fileset dir="${jboss.home}/modules/javax/xml/ws/api/main/" includes="jboss-jaxws-api_2.2_spec-2.0.0.Alpha1.jar"/>
+ <fileset dir="${jboss.home}/modules/javax/xml/soap/api/main/" includes="jboss-saaj-api_1.3_spec-1.0.0.Final.jar"/>
+ <fileset dir="${jboss.home}/modules/javax/xml/rpc/api/main/" includes="jaxrpc-api-1.1.jar"/>
+ <fileset dir="${jboss.home}/modules/javax/xml/bind/api/main/" includes="jboss-jaxb-api_2.2_spec-1.0.2.Final.jar"/>
+ <fileset dir="${jboss.home}/modules/javax/servlet/api/main/" includes="jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
</path>
<filterset id="webxmlrpc.filter">
Added: labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="urn:jboss:service:7.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
+
+ <!-- deployment descriptor allowing the XTSService class to be deployed to AS7
+ this is just a temporary mechanism to test XTS. You also need to deploy the
+ XTS jars as a module and the 4 war archives for ws-c11 and ws-t11 -->
+ <mbean name="jboss:name=XTSService,type=service" code="org.jboss.jbossts.XTSService">
+ </mbean>
+
+</server>
\ No newline at end of file
Added: labs/jbosstm/trunk/XTS/sar/META-INF/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/manifest.mf 2011-05-31 04:12:33 UTC (rev 37040)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,org.jboss.xts
Added: labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/module.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/module.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<!--
+ module declaration for XTS enabling the code to be made available in AS7
+ this file and the jars need to be copied to the AS7 modules directory
+ in subdirectory org/jboss/xts/main. The XTS service class and the 4 XTS
+ web archives for ws-c11 and ws-t11 are depoyed as AS7 client applications
+ and they depend on the module to gain access to the XTS classes. Client
+ code also needs to depend on this module.
+-->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.xts">
+
+ <resources>
+ <!-- Insert resources here -->
+ <resource-root path="ws-c.jar"/>
+ <resource-root path="ws-c11.jar"/>
+ <resource-root path="ws-t.jar"/>
+ <resource-root path="ws-t11.jar"/>
+ <resource-root path="wsas.jar"/>
+ <resource-root path="wscf.jar"/>
+ <resource-root path="wscf11.jar"/>
+ <resource-root path="wstx.jar"/>
+ <resource-root path="wstx11.jar"/>
+ <resource-root path="recovery.jar"/>
+ <resource-root path="service.jar"/>
+ <resource-root path="config.jar"/>
+ <resource-root path="bridge-api.jar"/>
+ <resource-root path="jbossxts-api.jar"/>
+ </resources>
+
+ <dependencies>
+ <!--
+ <module name="javax.transaction"/>
+ -->
+ <module name="org.jboss.jts"/>
+ <module name="org.jboss.ws.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.xml.soap.api"/>
+ <module name="javax.xml.ws.api"/>
+ <module name="javax.xml.stream.api"/>
+ <!-- this is needed to get javax.xml.namespace.QName but it woudl be better if it were exposed on its own -->
+ <module name="javax.api"/>
+ </dependencies>
+</module>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2011-05-29 18:23:43 UTC (rev 37039)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2011-05-31 04:12:33 UTC (rev 37040)
@@ -57,9 +57,10 @@
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
<property name="jboss.server" value="default"/>
- <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+ <property name="deploy.dir" value="${jboss.home}/standalone/deployments/"/>
+ <property name="module.dir" value="${jboss.home}/modules/org/jboss/xts"/>
- <!-- we assume the core XTS modules have already been installedi.e. WSAS, WS-C, WS-T, WSCF, WSTX, recovery -->
+ <!-- we assume the core XTS modules have already been installed i.e. WSAS, WS-C, WS-T, WSCF, WSTX, recovery -->
<property name="src.dir" location="src"/>
<property name="lib.dir" location="${xts.home}/lib"/>
<property name="webapps.dir" location="${xts.home}/webapps"/>
@@ -103,8 +104,6 @@
<mkdir dir="${build.conf.dir}"/>
</target>
- <!-- TODO are the xts engine and its WS stack conceptually separate deployments? at what level do they integrate? spi or jax-ws?-->
-
<!-- compile the sar source -->
<target name="compile" depends="init, compile-both, compile-11"/>
@@ -167,6 +166,7 @@
<!-- include sar boot and shutdown codes -->
<fileset dir="${build.classes.dir}" includes="**/*"/>
</jar>
+ <copy file="${build.dir}/service.jar" tofile="${lib.dir}/service.jar"/>
</target>
<!-- build XTS service archive supporting both 1.0 and 1.1 WS-C/T protocols -->
@@ -225,32 +225,15 @@
<!-- copy 11 application.xml to build dir -->
<copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application11.xml"/>
+ <!-- copy jboss-service file to build dir -->
+ <copy toFile="${build.metainf.dir}/jboss-service.xml" file="${metainf.dir}/jboss-service.xml"/>
+ <!-- copy modules file to lib dir -->
+ <copy toFile="${lib.dir}/module.xml" file="${metainf.dir}/module.xml"/>
<!-- pack everything in the service archive -->
- <jar jarfile="${build.dir}/jbossxts.sar">
- <!-- include generic and 1.1 jars -->
- <fileset dir="${lib.dir}" includes="*.jar" excludes="*10.jar *api.jar"/>
+ <jar jarfile="${build.dir}/jbossxts.sar" manifest="${metainf.dir}/manifest.mf">
- <fileset dir="${build.dir}" includes="jbossxts-api.jar"/>
-
- <!-- include 1.1 web apps-->
- <fileset dir="${webapps.dir}" includes="*11*.war"/>
-
- <!-- include config jar -->
- <!-- don't need this because we configure from beans.xml
- <fileset dir="${build.dir}" includes="config.jar"/>
- -->
-
- <!-- include service def (e.g. dependencies) -->
- <fileset dir="." includes="META-INF/xts11-jboss-beans.xml"/>
-
- <!-- include classloading directives -->
- <fileset dir="." includes="META-INF/jboss-classloading.xml"/>
-
- <!-- include web service config -->
- <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
-
- <!-- include service implementation jar -->
- <fileset dir="${build.dir}" includes="service.jar"/>
+ <!-- just include service def -->
+ <fileset dir="${build.dir}" includes="META-INF/jboss-service.xml"/>
</jar>
</target>
@@ -258,15 +241,65 @@
<target name="clean">
<delete dir="${build.dir}"/>
- <delete file="${lib.dir}/jbossxts-api.jar"/>
+ <delete file="${lib.dir}/jbossxts-api.jar"/>
+ <delete file="${lib.dir}/service.jar"/>
</target>
- <target name="deploy" depends="undeploy, sar">
+ <target name="deploy-module">
+ <mkdir dir="${module.dir}/main"/>
+ <copy todir="${module.dir}/main" file="${metainf.dir}/module.xml"/>
+ <copy todir="${module.dir}/main">
+ <fileset dir="${lib.dir}" includes="*.jar" excludes="*api.jar"/>
+ <fileset dir="${lib.dir}" includes="bridge-api.jar"/>
+ <fileset dir="${lib.dir}" includes="jbossxts-api.jar"/>
+ <fileset dir="${build.dir}" includes="config.jar"/>
+ </copy>
+ </target>
+
+ <target name="undeploy-module">
+ <delete dir="${module.dir}"/>
+ </target>
+
+ <target name="deploy">
<copy file="${build.dir}/jbossxts.sar" todir="${deploy.dir}"/>
+ <!--
+ -->
+ <copy file="${webapps.dir}/ws-c11.war" todir="${deploy.dir}"/>
+ <copy file="${webapps.dir}/ws-t11-client.war" todir="${deploy.dir}"/>
+ <copy file="${webapps.dir}/ws-t11-participant.war" todir="${deploy.dir}"/>
+ <copy file="${webapps.dir}/ws-t11-coordinator.war" todir="${deploy.dir}"/>
</target>
<target name="undeploy">
- <delete file="${deploy.dir}/jbossxts.sar"/>
+ <delete file="${deploy.dir}/jbossxts.sar.deployed" failonerror="false"/>
+ <!--
+ -->
+ <delete file="${deploy.dir}/ws-c11.war.deployed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-client.war.deployed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-participant.war.deployed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-coordinator.war.deployed" failonerror="false"/>
+ <sleep seconds="5"/>
+ <delete file="${deploy.dir}/jbossxts.sar.undeployed" failonerror="false"/>
+ <!--
+ -->
+ <delete file="${deploy.dir}/ws-c11.war.undeployed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-client.war.undeployed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-participant.war.undeployed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-coordinator.war.undeployed" failonerror="false"/>
+ <delete file="${deploy.dir}/jbossxts.sar.failed" failonerror="false"/>
+ <!--
+ -->
+ <delete file="${deploy.dir}/ws-c11.war.failed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-client.war.failed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-participant.war.failed" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-coordinator.war.failed" failonerror="false"/>
+ <delete file="${deploy.dir}/jbossxts.sar" failonerror="false"/>
+ <!--
+ -->
+ <delete file="${deploy.dir}/ws-c11.war" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-client.war" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-participant.war" failonerror="false"/>
+ <delete file="${deploy.dir}/ws-t11-coordinator.war" failonerror="false"/>
</target>
</project>
More information about the jboss-svn-commits
mailing list