[jboss-svn-commits] JBL Code SVN: r35537 - in labs/jbosstm/trunk/XTS: WS-C/dev/src11/com/arjuna/webservices11/wscoor/server and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 15 07:21:43 EDT 2010
Author: adinn
Date: 2010-10-15 07:21:42 -0400 (Fri, 15 Oct 2010)
New Revision: 35537
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSCEnvironmentBean.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSTEnvironmentBean.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java
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/TerminationCoordinatorRPCInitialisation.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/CompletionCoordinatorRPCInitialisation.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/config/xts-properties.xml
labs/jbosstm/trunk/XTS/config/xts-properties11.xml
labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml
labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml
Log:
enabled configuration options to allow services to be notified of the URLPath component of their mapped endpoints -- fixes JBTM-799
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSCEnvironmentBean.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSCEnvironmentBean.java 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSCEnvironmentBean.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -137,6 +137,13 @@
@FullPropertyName(name = "org.jboss.jbossts.xts.coordinator.path")
private volatile String coordinatorPath10 = "ws-c10/soap/ActivationCoordinator";
+ /**
+ * the URL path component of the URL at which 1.1 WS-C services have been mapped. if this is null
+ * then the path is defaulted to "ws-c11"
+ */
+ @FullPropertyName(name = "org.jboss.jbossts.xts.wsc11.serviceURLPath")
+ private volatile String serviceURLPath = null;
+
public int getInitialTransportPeriod() {
return initialTransportPeriod;
}
@@ -336,4 +343,12 @@
public void setCoordinatorPath10(String coordinatorPath10) {
this.coordinatorPath10 = coordinatorPath10;
}
+
+ public String getServiceURLPath() {
+ return serviceURLPath;
+ }
+
+ public void setServiceURLPath(String serviceURLPath) {
+ this.serviceURLPath = serviceURLPath;
+ }
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSTEnvironmentBean.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSTEnvironmentBean.java 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/org/jboss/jbossts/xts/environment/WSTEnvironmentBean.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -57,6 +57,27 @@
@FullPropertyName(name = "org.jboss.jbossts.xts.wsba.BusinessActivityManager")
private volatile String businessActivityManager10 = "com.arjuna.mwlabs.wst.ba.remote.BusinessActivityManagerImple";
+ /**
+ * the URL path component of the URL at which 1.1 WS-T coordinator services have been mapped. if this is null
+ * then the path is defaulted to "ws-t11-coordinator"
+ */
+ @FullPropertyName(name = "org.jboss.jbossts.xts11.wst.coordinatorServiceURLPath")
+ private volatile String coordinatorServiceURLPath = null;
+
+ /**
+ * the URL path component of the URL at which 1.1 WS-T client services have been mapped. if this is null
+ * then the path is defaulted to "ws-t11-client"
+ */
+ @FullPropertyName(name = "org.jboss.jbossts.xts11.wst.clientServiceURLPath")
+ private volatile String clientServiceURLPath = null;
+
+ /**
+ * the URL path component of the URL at which 1.1 WS-T participant services have been mapped. if this is null
+ * then the path is defaulted to "ws-t11-participant"
+ */
+ @FullPropertyName(name = "org.jboss.jbossts.xts11.wst.participantServiceURLPath")
+ private volatile String participantServiceURLPath = null;
+
public String getUserTransaction11() {
return userTransaction11;
}
@@ -120,4 +141,28 @@
public void setBusinessActivityManager10(String businessActivityManager10) {
this.businessActivityManager10 = businessActivityManager10;
}
+
+ public String getCoordinatorServiceURLPath() {
+ return coordinatorServiceURLPath;
+ }
+
+ public void setCoordinatorServiceURLPath(String coordinatorServiceURLPath) {
+ this.coordinatorServiceURLPath = coordinatorServiceURLPath;
+ }
+
+ public String getClientServiceURLPath() {
+ return clientServiceURLPath;
+ }
+
+ public void setClientServiceURLPath(String clientServiceURLPath) {
+ this.clientServiceURLPath = clientServiceURLPath;
+ }
+
+ public String getParticipantServiceURLPath() {
+ return participantServiceURLPath;
+ }
+
+ public void setParticipantServiceURLPath(String participantServiceURLPath) {
+ this.participantServiceURLPath = participantServiceURLPath;
+ }
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -38,6 +38,10 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ String serviceURLPath = wscEnvironmentBean.getServiceURLPath();
+ if (serviceURLPath == null) {
+ serviceURLPath = "/ws-c11";
+ }
if (bindAddress == null) {
@@ -52,10 +56,10 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-c11/";
- final String uri = baseUri + "ActivationService";
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-c11/";
- final String secureUri = secureBaseUri + "ActivationService";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + serviceURLPath;
+ final String uri = baseUri + "/ActivationService";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + serviceURLPath;
+ final String secureUri = secureBaseUri + "/ActivationService";
serviceRegistry.registerServiceProvider(CoordinationConstants.ACTIVATION_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(CoordinationConstants.ACTIVATION_SERVICE_NAME, secureUri) ;
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -43,6 +43,10 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ String serviceURLPath = wscEnvironmentBean.getServiceURLPath();
+ if (serviceURLPath == null) {
+ serviceURLPath = "/ws-c11";
+ }
if (bindAddress == null) {
@@ -57,10 +61,10 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-c11/";
- final String uri = baseUri + "RegistrationService";
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-c11/";
- final String secureUri = secureBaseUri + "RegistrationService";
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + serviceURLPath;
+ final String uri = baseUri + "/RegistrationService";
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + serviceURLPath;
+ final String secureUri = secureBaseUri + "/RegistrationService";
serviceRegistry.registerServiceProvider(CoordinationConstants.REGISTRATION_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(CoordinationConstants.REGISTRATION_SERVICE_NAME, secureUri); ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
bindAddress = "127.0.0.1";
@@ -51,10 +57,10 @@
secureBindPort = 8443;
}
- 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-coordinator/";
- final String secureUri = secureBaseUri + ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(ArjunaTX11Constants.TERMINATION_COORDINATOR_SERVICE_NAME, secureUri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorRPCInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorRPCInitialisation.java 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorRPCInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
bindAddress = "127.0.0.1";
@@ -51,10 +57,10 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
- final String uri = baseUri + ArjunaTX11Constants.TERMINATION_COORDINATOR_RPC_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
- final String secureUri = secureBaseUri + ArjunaTX11Constants.TERMINATION_COORDINATOR_RPC_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + ArjunaTX11Constants.TERMINATION_COORDINATOR_RPC_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + ArjunaTX11Constants.TERMINATION_COORDINATOR_RPC_SERVICE_NAME;
serviceRegistry.registerServiceProvider(ArjunaTX11Constants.TERMINATION_COORDINATOR_RPC_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(ArjunaTX11Constants.TERMINATION_COORDINATOR_RPC_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String clientServiceURLPath = wstEnvironmentBean.getClientServiceURLPath();
+ if (clientServiceURLPath == null) {
+ clientServiceURLPath = "/ws-t11-client";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-client/";
- final String secureUri = secureBaseUri + ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + clientServiceURLPath;
+ final String uri = baseUri + "/" + ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + clientServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(ArjunaTX11Constants.TERMINATION_PARTICIPANT_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-coordinator/";
- final String secureUri = secureBaseUri + AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_NAME, secureUri) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorRPCInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorRPCInitialisation.java 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorRPCInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- final String baseUri = "http://" + bindAddress + ":" + bindPort + "/ws-t11-coordinator/";
- final String uri = baseUri + AtomicTransactionConstants.COMPLETION_COORDINATOR_RPC_SERVICE_NAME;
- final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + "/ws-t11-coordinator/";
- final String secureUri = secureBaseUri + AtomicTransactionConstants.COMPLETION_COORDINATOR_RPC_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + AtomicTransactionConstants.COMPLETION_COORDINATOR_RPC_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + AtomicTransactionConstants.COMPLETION_COORDINATOR_RPC_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COMPLETION_COORDINATOR_RPC_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(AtomicTransactionConstants.COMPLETION_COORDINATOR_RPC_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String clientServiceURLPath = wstEnvironmentBean.getClientServiceURLPath();
+ if (clientServiceURLPath == null) {
+ clientServiceURLPath = "/ws-t11-client";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-client/";
- final String secureUri = secureBaseUri + AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + clientServiceURLPath;
+ final String uri = baseUri + "/" + AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + clientServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-coordinator/";
- final String secureUri = secureBaseUri + AtomicTransactionConstants.COORDINATOR_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + AtomicTransactionConstants.COORDINATOR_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + AtomicTransactionConstants.COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.COORDINATOR_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(AtomicTransactionConstants.COORDINATOR_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String participantServiceURLPath = wstEnvironmentBean.getParticipantServiceURLPath();
+ if (participantServiceURLPath == null) {
+ participantServiceURLPath = "/ws-t11-participant";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-participant/";
- final String secureUri = secureBaseUri + AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + participantServiceURLPath;
+ final String uri = baseUri + "/" + AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + participantServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(AtomicTransactionConstants.PARTICIPANT_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-coordinator/";
- final String secureUri = secureBaseUri + BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(BusinessActivityConstants.COORDINATOR_COMPLETION_COORDINATOR_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String participantServiceURLPath = wstEnvironmentBean.getParticipantServiceURLPath();
+ if (participantServiceURLPath == null) {
+ participantServiceURLPath = "/ws-t11-participant";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-participant/";
- final String secureUri = secureBaseUri + BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + participantServiceURLPath;
+ final String uri = baseUri + "/" + BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + participantServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String coordinatorServiceURLPath = wstEnvironmentBean.getCoordinatorServiceURLPath();
+ if (coordinatorServiceURLPath == null) {
+ coordinatorServiceURLPath = "/ws-t11-coordinator";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-coordinator/";
- final String secureUri = secureBaseUri + BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + coordinatorServiceURLPath;
+ final String uri = baseUri + "/" + BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + coordinatorServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(BusinessActivityConstants.PARTICIPANT_COMPLETION_COORDINATOR_SERVICE_NAME, secureUri) ;
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-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java 2010-10-15 11:21:42 UTC (rev 35537)
@@ -23,6 +23,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import org.jboss.jbossts.xts.environment.WSCEnvironmentBean;
+import org.jboss.jbossts.xts.environment.WSTEnvironmentBean;
import org.jboss.jbossts.xts.environment.XTSPropertyManager;
/**
@@ -38,6 +39,11 @@
String bindAddress = wscEnvironmentBean.getBindAddress11();
int bindPort = wscEnvironmentBean.getBindPort11();
int secureBindPort = wscEnvironmentBean.getBindPortSecure11();
+ WSTEnvironmentBean wstEnvironmentBean = XTSPropertyManager.getWSTEnvironmentBean();
+ String participantServiceURLPath = wstEnvironmentBean.getParticipantServiceURLPath();
+ if (participantServiceURLPath == null) {
+ participantServiceURLPath = "/ws-t11-participant";
+ }
if (bindAddress == null) {
@@ -52,10 +58,10 @@
secureBindPort = 8443;
}
- 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-participant/";
- final String secureUri = secureBaseUri + BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME;
+ final String baseUri = "http://" + bindAddress + ":" + bindPort + participantServiceURLPath;
+ final String uri = baseUri + "/" + BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME;
+ final String secureBaseUri = "https://" + bindAddress + ":" + secureBindPort + participantServiceURLPath;
+ final String secureUri = secureBaseUri + "/" + BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME;
serviceRegistry.registerServiceProvider(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME, uri) ;
serviceRegistry.registerSecureServiceProvider(BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_NAME, secureUri) ;
Modified: labs/jbosstm/trunk/XTS/config/xts-properties.xml
===================================================================
--- labs/jbosstm/trunk/XTS/config/xts-properties.xml 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/config/xts-properties.xml 2010-10-15 11:21:42 UTC (rev 35537)
@@ -254,4 +254,20 @@
<entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_2">org.jboss.jbossts.xts.initialisation.ParticipantSideInitialisation</entry>
<entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_3">org.jboss.jbossts.xts.initialisation.ClientSideInitialisation</entry>
<entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_4">org.jboss.jbossts.xts.initialisation.XTS10Initialisation</entry>
+
+ <!--
+ if you are deploying XTS outside of JBoss then you may not be able to map the WS-C and WS-T service
+ endpoints to the same URLs as those employed by JBossWS. The services need to know where the endpoints
+ have been mapped because they need to insert their endpoint URLs into protocol messages. The following
+ properties can be set to identify the URL path element of the service. So, for example, with these
+ configuration settings the default URL for the WS-T Participant service
+ http://<webhost>:<webport>/ws-t11-participant/ParticipantService would be remapped to
+ http://<webhost>:<webport>/participant/services/ParticipantService. These properties are normally
+ left unset so that the JBoss default URLs are employed.
+ <entry key="org.jboss.jbossts.xts11.wsc.serviceURLPath.">/coord/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.coordinatorServiceURLPath.">/coord/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.clientServiceURLPath.">/client/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.participantServiceURLPath.">/participant/services</entry>
+ -->
+
</properties>
Modified: labs/jbosstm/trunk/XTS/config/xts-properties11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/config/xts-properties11.xml 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/config/xts-properties11.xml 2010-10-15 11:21:42 UTC (rev 35537)
@@ -211,4 +211,20 @@
<entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_1">org.jboss.jbossts.xts.initialisation.CoordinatorSideInitialisation</entry>
<entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_2">org.jboss.jbossts.xts.initialisation.ParticipantSideInitialisation</entry>
<entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_3">org.jboss.jbossts.xts.initialisation.ClientSideInitialisation</entry>
+
+ <!--
+ if you are deploying XTS outside of JBoss then you may not be able to map the WS-C and WS-T service
+ endpoints to the same URLs as those employed by JBossWS. The services need to know where the endpoints
+ have been mapped because they need to insert their endpoint URLs into protocol messages. The following
+ properties can be set to identify the URL path element of the service. So, for example, with these
+ configuration settings the default URL for the WS-T Participant service
+ http://<webhost>:<webport>/ws-t11-participant/ParticipantService would be remapped to
+ http://<webhost>:<webport>/participant/services/ParticipantService. These properties are normally
+ left unset so that the JBoss default URLs are employed.
+ <entry key="org.jboss.jbossts.xts11.wsc.serviceURLPath.">/coord/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.coordinatorServiceURLPath.">/coord/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.clientServiceURLPath.">/client/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.participantServiceURLPath.">/participant/services</entry>
+ -->
+
</properties>
Modified: labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/xts-jboss-beans.xml 2010-10-15 11:21:42 UTC (rev 35537)
@@ -172,10 +172,30 @@
<value>9191</value>
</property>
<property name="coordinatorPath10">
- <value>ws-c11/soap/ActivationCoordinator</value>
+ <value>ws-c10/soap/ActivationCoordinator</value>
</property>
-->
+ <!-- if you are trying to deploy XTS 1.1 outside of JBoss AS then your JaxWS implementation may not
+ allow you to deploy the WS-C services with the same URL path as that configured by JBossWS.
+ this means the WS-C services (Activation Coordinator and Registration Coordinator services) will
+ not be able to identify the URLs at which their endpoints have been published. This is important
+ because services need to be able to include their own endpoints and other service endpoints
+ in protocol messages.
+
+ The property below may be set to specify the URL path component of the WS-C service URLs. If this
+ property is left unset the path component will default to JBossWS format (this is derived from
+ the name of the war file in which the service is deployed i.e. in the case of the 1.1 service the
+ URL path element is ws-c11). So, for example the normal URL for the Registration Coordinator
+ service is http://<webhost>:<webport>/ws-c11/RegistrationService. However, the following
+ example configuration setting lets the registration service know that it is mapped at URL
+ http://<webhost>:<webport>/xts-coord/services/RegistrationService
+
+ <property name="serviceURLPath">
+ <value>/xts-coord/services</value>
+ </property>
+ -->
+
</bean>
<!--
@@ -255,6 +275,39 @@
<property name="businessActivityManager10">
<value>com.arjuna.mwlabs.wst.ba.remote.BusinessActivityManagerImple</value>
</property>
+
+ <!-- if you are trying to deploy XTS 1.1 outside of JBoss AS then your JaxWS implementation may not
+ allow you to deploy the WS-T services with the same URL path as that configured by JBossWS.
+ this means the WS-T services will not be able to identify the URLs at which their endpoints have
+ been published. This is important because services need to be able to include their own endpoints
+ and other service endpoints in protocol messages.
+
+ The properties below may be set to specify the URL path component of the WS-T service URLs for
+ each of the 3 groups of services deployed on the coordinator host, the client host and
+ the participant web service host. If these properties are left unset the path component will
+ default to JBossWS format (this is derived from the name of the war file in which the service
+ is deployed i.e. in the case of the 1.1 services the URL path elements are ws-t11-coordinator,
+ ws-t11-client and ws-t11-participant). So, for example the URL for the (WSAT) Participant service
+ deployed on a participant host is http://<webhost>:<webport>/ws-t11-participant/ParticipantService.
+ Thew example configuration setting below let this service know that it is mapped at URL
+ http://<webhost>:<webport>/xts-participant/services/ParticipantService.
+
+ <property name="participantServiceURLPath">
+ <value>/xts-participant/services</value>
+ </property>
+
+ The following example configuration settings show how you would identify the mappings for the WS-T client
+ and coordinator service endpoints
+
+ <property name="coordinatorServiceURLPath">
+ <value>/xts-coordinator/services</value>
+ </property>
+
+ <property name="clientServiceURLPath">
+ <value>/xts-client/services</value>
+ </property>
+
+ -->
</bean>
<bean name="XTS:RecoveryEnvironmentBean" class="org.jboss.jbossts.xts.environment.RecoveryEnvironmentBean">
Modified: labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml 2010-10-15 10:40:56 UTC (rev 35536)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/xts11-jboss-beans.xml 2010-10-15 11:21:42 UTC (rev 35537)
@@ -138,6 +138,25 @@
</property>
-->
+ <!-- if you are trying to deploy XTS 1.1 outside of JBoss AS then your JaxWS implementation may not
+ allow you to deploy the WS-C services with the same URL path as that configured by JBossWS.
+ this means the WS-C services (Activation Coordinator and Registration Coordinator services) will
+ not be able to identify the URLs at which their endpoints have been published. This is important
+ because services need to be able to include their own endpoints and other service endpoints
+ in protocol messages.
+
+ The property below may be set to specify the URL path component of the WS-C service URLs. If this
+ property is left unset the path component will default to JBossWS format (this is derived from
+ the name of the war file in which the service is deployed i.e. in the case of the 1.1 service the
+ URL path element is ws-c11). So, for example the normal URL for the Registration Coordinator
+ service is http://<webhost>:<webport>/ws-c11/RegistrationService. However, the following
+ example configuration setting lets the registration service know that it is mapped at URL
+ http://<webhost>:<webport>/xts-coord/services/RegistrationService
+
+ <property name="serviceURLPath">
+ <value>/xts-coord/services</value>
+ </property>
+ -->
</bean>
<!--
@@ -193,6 +212,39 @@
<property name="businessActivityManager11">
<value>com.arjuna.mwlabs.wst11.ba.remote.BusinessActivityManagerImple</value>
</property>
+
+ <!-- if you are trying to deploy XTS 1.1 outside of JBoss AS then your JaxWS implementation may not
+ allow you to deploy the WS-T services with the same URL path as that configured by JBossWS.
+ this means the WS-T services will not be able to identify the URLs at which their endpoints have
+ been published. This is important because services need to be able to include their own endpoints
+ and other service endpoints in protocol messages.
+
+ The properties below may be set to specify the URL path component of the WS-T service URLs for
+ each of the 3 groups of services deployed on the coordinator host, the client host and
+ the participant web service host. If these properties are left unset the path component will
+ default to JBossWS format (this is derived from the name of the war file in which the service
+ is deployed i.e. in the case of the 1.1 services the URL path elements are ws-t11-coordinator,
+ ws-t11-client and ws-t11-participant). So, for example the URL for the (WSAT) Participant service
+ deployed on a participant host is http://<webhost>:<webport>/ws-t11-participant/ParticipantService.
+ Thew example configuration setting below let this service know that it is mapped at URL
+ http://<webhost>:<webport>/xts-participant/services/ParticipantService.
+
+ <property name="participantServiceURLPath">
+ <value>/xts-participant/services</value>
+ </property>
+
+ The following example configuration settings show how you would identify the mappings for the WS-T client
+ and coordinator service endpoints
+
+ <property name="coordinatorServiceURLPath">
+ <value>/xts-coordinator/services</value>
+ </property>
+
+ <property name="clientServiceURLPath">
+ <value>/xts-client/services</value>
+ </property>
+
+ -->
</bean>
<bean name="XTS:RecoveryEnvironmentBean" class="org.jboss.jbossts.xts.environment.RecoveryEnvironmentBean">
More information about the jboss-svn-commits
mailing list