[jboss-svn-commits] JBL Code SVN: r34834 - in labs/jbosstm/trunk/XTS: WS-T/dev/dd and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 23 11:41:24 EDT 2010
Author: adinn
Date: 2010-08-23 11:41:23 -0400 (Mon, 23 Aug 2010)
New Revision: 34834
Added:
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-coordinator_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml
Removed:
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml
Modified:
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/sar/META-INF/application.xml
labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
factored 1.1 WS-T web apps into separate deployments for client, participant and coordinator and removed now redundant 1.1 WSCF and WSTX webapps -- fixes for JBTM-777
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -284,8 +284,9 @@
</target>
<target name="jars11">
+ <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
<jar jarfile="${build.lib.dir}/ws-t11.jar">
- <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes} com/arjuna/webservices11/wsat/sei/* com/arjuna/webservices11/wsba/sei/* com/arjuna/webservices11/wsarjtx/sei/* handlers.xml"/>
+ <fileset dir="${build.classes11.dir}"/>
</jar>
<jar jarfile="${build.lib.dir}/ws-t11-api.jar">
<fileset dir="${build.classes11.dir}" includes="${ws-t11.api.classes}"/>
@@ -296,16 +297,19 @@
<target name="webapps10" if="build10">
<copy file="${dd.dir}/ws-t_web-app.xml" tofile="${build.dd.dir}/web-app.xml"/>
- <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
<war warfile="${build.webapps.dir}/ws-t10.war" webxml="${build.dd.dir}/web-app.xml"/>
</target>
<target name="webapps11" depends="jars11">
- <copy file="${dd.dir}/ws-t11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
- <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
- <war warfile="${build.webapps.dir}/ws-t11.war" webxml="${build.dd.dir}/web-app11.xml">
- <webinf dir="${build.dir}/classes11" includes="classes/com/arjuna/webservices11/wsat/sei/* classes/com/arjuna/webservices11/wsba/sei/* classes/com/arjuna/webservices11/wsarjtx/sei/* classes/handlers.xml"/>
- <webinf dir="${build.dd.dir}" includes="wsdl/**"/>
+ <copy file="${dd.dir}/ws-t11-coordinator_web-app.xml" tofile="${build.dd.dir}/web-app11-coordinator.xml"/>
+ <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"/>
+ <!-- participants -->
+ <war warfile="${build.webapps.dir}/ws-t11-participant.war" webxml="${build.dd.dir}/web-app11-participant.xml"/>
+ <!-- client -->
+ <war warfile="${build.webapps.dir}/ws-t11-client.war" webxml="${build.dd.dir}/web-app11-client.xml">
</war>
</target>
Copied: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml (from rev 34828, labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-client_web-app.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -0,0 +1,53 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+ (C) 2005-2006,
+ @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>
+ <display-name>Arjuna Web Services Transaction 1.1 Client Services</display-name>
+
+ <description>Arjuna Web Services Transaction 1.1 Client Services</description>
+
+ <!-- Client Side Endpoints -->
+ <servlet>
+ <servlet-name>CompletionInitiator</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsat.sei.CompletionInitiatorPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TerminationParticipant</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsarjtx.sei.TerminationParticipantPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Client Side Endpoint Mappings -->
+ <servlet-mapping>
+ <servlet-name>CompletionInitiator</servlet-name>
+ <url-pattern>/CompletionInitiatorService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TerminationParticipant</servlet-name>
+ <url-pattern>/TerminationParticipantService</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-coordinator_web-app.xml (from rev 34828, labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-coordinator_web-app.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-coordinator_web-app.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -0,0 +1,86 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+ (C) 2005-2006,
+ @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>
+ <display-name>Arjuna Web Services Transaction 1.1 Coordinator Services</display-name>
+
+ <description>Arjuna Web Services Transaction 1.1 Coordinator Services</description>
+
+ <!-- Coordinator Side Endpoints -->
+ <servlet>
+ <servlet-name>Coordinator</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsat.sei.CoordinatorPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>CompletionCoordinator</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsat.sei.CompletionCoordinatorPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionCoordinator</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>BusinessAgreementWithParticipantCompletionCoordinator</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TerminationCoordinator</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsarjtx.sei.TerminationCoordinatorPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Coordinator Side Endpoint Mappings -->
+ <servlet-mapping>
+ <servlet-name>Coordinator</servlet-name>
+ <url-pattern>/CoordinatorService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CompletionCoordinator</servlet-name>
+ <url-pattern>/CompletionCoordinatorService</url-pattern>
+ </servlet-mapping>
+
+ <!-- Define WSBA 1.1 JaxWS Server Endpoint Mappings -->
+ <servlet-mapping>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionCoordinator</servlet-name>
+ <url-pattern>/BusinessAgreementWithCoordinatorCompletionCoordinatorService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>BusinessAgreementWithParticipantCompletionCoordinator</servlet-name>
+ <url-pattern>/BusinessAgreementWithParticipantCompletionCoordinatorService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TerminationCoordinator</servlet-name>
+ <url-pattern>/TerminationCoordinatorService</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml (from rev 34828, labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -0,0 +1,63 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+ (C) 2005-2006,
+ @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>
+ <display-name>Arjuna Web Services Transaction 1.1 Participant Services</display-name>
+
+ <description>Arjuna Web Services Transaction 1.1 Participant Services</description>
+
+ <!-- Participant Side Endpoints -->
+ <servlet>
+ <servlet-name>Participant</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsat.sei.ParticipantPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionParticipant</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>BusinessAgreementWithParticipantCompletionParticipant</servlet-name>
+ <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Participant</servlet-name>
+ <url-pattern>/ParticipantService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>BusinessAgreementWithCoordinatorCompletionParticipant</servlet-name>
+ <url-pattern>/BusinessAgreementWithCoordinatorCompletionParticipantService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>BusinessAgreementWithParticipantCompletionParticipant</servlet-name>
+ <url-pattern>/BusinessAgreementWithParticipantCompletionParticipantService</url-pattern>
+ </servlet-mapping>
+</web-app>
Deleted: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11_web-app.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -1,131 +0,0 @@
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
- of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-
- (C) 2005-2006,
- @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>
- <display-name>Arjuna Web Services Transaction 1.1</display-name>
-
- <description>Arjuna Web Services Transaction 1.1</description>
-
- <!-- Define WSAT 1.1 JaxWS Server Endpoints -->
- <servlet>
- <servlet-name>Coordinator</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsat.sei.CoordinatorPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>Participant</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsat.sei.ParticipantPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>CompletionCoordinator</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsat.sei.CompletionCoordinatorPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>CompletionInitiator</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsat.sei.CompletionInitiatorPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Define WSBA 1.1 JaxWS Server Endpoints -->
- <servlet>
- <servlet-name>BusinessAgreementWithCoordinatorCompletionCoordinator</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>BusinessAgreementWithCoordinatorCompletionParticipant</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>BusinessAgreementWithParticipantCompletionCoordinator</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>BusinessAgreementWithParticipantCompletionParticipant</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsba.sei.BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Define WSArjTX JaxWS Server Endpoints -->
- <servlet>
- <servlet-name>TerminationCoordinator</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsarjtx.sei.TerminationCoordinatorPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>TerminationParticipant</servlet-name>
- <servlet-class>com.arjuna.webservices11.wsarjtx.sei.TerminationParticipantPortTypeImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Define WSAT 1.1 JaxWS Server Endpoint Mappings -->
- <servlet-mapping>
- <servlet-name>Coordinator</servlet-name>
- <url-pattern>/CoordinatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Participant</servlet-name>
- <url-pattern>/ParticipantService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>CompletionCoordinator</servlet-name>
- <url-pattern>/CompletionCoordinatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>CompletionInitiator</servlet-name>
- <url-pattern>/CompletionInitiatorService</url-pattern>
- </servlet-mapping>
-
- <!-- Define WSBA 1.1 JaxWS Server Endpoint Mappings -->
- <servlet-mapping>
- <servlet-name>BusinessAgreementWithCoordinatorCompletionCoordinator</servlet-name>
- <url-pattern>/BusinessAgreementWithCoordinatorCompletionCoordinatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>BusinessAgreementWithCoordinatorCompletionParticipant</servlet-name>
- <url-pattern>/BusinessAgreementWithCoordinatorCompletionParticipantService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>BusinessAgreementWithParticipantCompletionCoordinator</servlet-name>
- <url-pattern>/BusinessAgreementWithParticipantCompletionCoordinatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>BusinessAgreementWithParticipantCompletionParticipant</servlet-name>
- <url-pattern>/BusinessAgreementWithParticipantCompletionParticipantService</url-pattern>
- </servlet-mapping>
-
- <!-- Define WSArjTX JaxWS Server Endpoint Mappings -->
- <servlet-mapping>
- <servlet-name>TerminationCoordinator</servlet-name>
- <url-pattern>/TerminationCoordinatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>TerminationParticipant</servlet-name>
- <url-pattern>/TerminationParticipantService</url-pattern>
- </servlet-mapping>
-</web-app>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -51,9 +51,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
final String uri = baseUri + ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
final String secureUri = secureBaseUri + ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-client/";
final String uri = baseUri + ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-client/";
final String secureUri = secureBaseUri + ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
final String uri = baseUri + AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
final String secureUri = secureBaseUri + AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-client/";
final String uri = baseUri + AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-client/";
final String secureUri = secureBaseUri + AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
final String uri = baseUri + AtomicTransactionConstants.COORDINATOR_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
final String secureUri = secureBaseUri + AtomicTransactionConstants.COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COORDINATOR_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-participant/";
final String uri = baseUri + AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-participant/";
final String secureUri = secureBaseUri + AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
final String uri = baseUri + BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
final String secureUri = secureBaseUri + BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-participant/";
final String uri = baseUri + BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-participant/";
final String secureUri = secureBaseUri + BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
final String uri = baseUri + BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
final String secureUri = secureBaseUri + BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -52,9 +52,9 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11/";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-participant/";
final String uri = baseUri + BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11/";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-participant/";
final String secureUri = secureBaseUri + BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME, uri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-08-23 15:41:23 UTC (rev 34834)
@@ -61,17 +61,17 @@
final private static String bindHost = XTSPropertyManager.getWSCEnvironmentBean().getBindAddress11();
- public static String participantServiceURI = "http://" + bindHost + ":8080/ws-t11/ParticipantService";
- public static String coordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CoordinatorService";
- public static String completionInitiatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CompletionInitiatorService";
- public static String completionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CompletionCoordinatorService";
+ public static String participantServiceURI = "http://" + bindHost + ":8080/ws-t11-participant/ParticipantService";
+ public static String coordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11-coordinator/CoordinatorService";
+ public static String completionInitiatorServiceURI = "http://" + bindHost + ":8080/ws-t11-client/CompletionInitiatorService";
+ public static String completionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11-coordinator/CompletionCoordinatorService";
private final static String ATOMIC_TRANSACTION_FAULT_ACTION = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault";
private final static String BUSINESS_ACTIVITY_FAULT_ACTION = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault";
- public static String participantCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithParticipantCompletionParticipantService";
- public static String participantCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithParticipantCompletionCoordinatorService";
- public static String coordinatorCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithCoordinatorCompletionParticipantService";
- public static String coordinatorCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/BusinessAgreementWithCoordinatorCompletionCoordinatorService";
+ public static String participantCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11-participant/BusinessAgreementWithParticipantCompletionParticipantService";
+ public static String participantCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11-coordinator/BusinessAgreementWithParticipantCompletionCoordinatorService";
+ public static String coordinatorCompletionParticipantServiceURI = "http://" + bindHost + ":8080/ws-t11-participant/BusinessAgreementWithCoordinatorCompletionParticipantService";
+ public static String coordinatorCompletionCoordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11-coordinator/BusinessAgreementWithCoordinatorCompletionCoordinatorService";
public static synchronized String getAtomicTransactionFaultAction()
{
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -213,12 +213,8 @@
<war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wscf_web-app.xml"/>
</target>
- <target name="war11">
- <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
- </target>
+ <target name="war" depends="jar, htdocs, war10"/>
- <target name="war" depends="jar, htdocs, war10, war11"/>
-
<!-- test targets -->
<target name="tests.init">
<!-- delete the test destination directories -->
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -287,12 +287,8 @@
<war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wstx_web-app.xml"/>
</target>
- <target name="war11">
- <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
- </target>
+ <target name="war" depends="jar, war10"/>
- <target name="war" depends="jar, war10, war11"/>
-
<target name="tests.init">
<!-- delete the test destination directories -->
<delete dir="${tests.build.dir}"/>
Modified: labs/jbosstm/trunk/XTS/sar/META-INF/application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -66,22 +66,22 @@
<module>
<web>
- <web-uri>ws-t11.war</web-uri>
- <context-root>/ws-t11</context-root>
+ <web-uri>ws-t11-coordinator.war</web-uri>
+ <context-root>/ws-t11-coordinator</context-root>
</web>
</module>
<module>
<web>
- <web-uri>wscf11.war</web-uri>
- <context-root>/wscf11</context-root>
+ <web-uri>ws-t11-participant.war</web-uri>
+ <context-root>/ws-t11-participant</context-root>
</web>
</module>
<module>
<web>
- <web-uri>wstx11.war</web-uri>
- <context-root>/wstx11</context-root>
+ <web-uri>ws-t11-client.war</web-uri>
+ <context-root>/ws-t11-client</context-root>
</web>
</module>
Modified: labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -38,22 +38,22 @@
<module>
<web>
- <web-uri>ws-t11.war</web-uri>
- <context-root>/ws-t11</context-root>
+ <web-uri>ws-t11-coordinator.war</web-uri>
+ <context-root>/ws-t11-coordinator</context-root>
</web>
</module>
<module>
<web>
- <web-uri>wscf11.war</web-uri>
- <context-root>/wscf11</context-root>
+ <web-uri>ws-t11-participant.war</web-uri>
+ <context-root>/ws-t11-participant</context-root>
</web>
</module>
<module>
<web>
- <web-uri>wstx11.war</web-uri>
- <context-root>/wstx11</context-root>
+ <web-uri>ws-t11-client.war</web-uri>
+ <context-root>/ws-t11-client</context-root>
</web>
</module>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2010-08-23 13:43:58 UTC (rev 34833)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2010-08-23 15:41:23 UTC (rev 34834)
@@ -226,7 +226,7 @@
<fileset dir="${build.dir}" includes="jbossxts-api.jar"/>
<!-- include 1.1 web apps-->
- <fileset dir="${webapps.dir}" includes="*11.war"/>
+ <fileset dir="${webapps.dir}" includes="*11*.war"/>
<!-- include config jar -->
<!-- don't need this because we configure from beans.xml
More information about the jboss-svn-commits
mailing list