[jboss-svn-commits] JBL Code SVN: r14199 - in labs/jbosstm/workspace: XTS_TX11/WS-C/dev/dd and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Aug 14 08:33:33 EDT 2007


Author: kevin.conner at jboss.com
Date: 2007-08-14 08:33:33 -0400 (Tue, 14 Aug 2007)
New Revision: 14199

Added:
   labs/jbosstm/workspace/XTS_TX11/
Modified:
   labs/jbosstm/workspace/XTS_TX11/WS-C/dev/dd/ws-c_web-app.xml
   labs/jbosstm/workspace/XTS_TX11/WS-C/dev/src/com/arjuna/webservices/base/processors/ActivatedObjectProcessor.java
   labs/jbosstm/workspace/XTS_TX11/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java
   labs/jbosstm/workspace/XTS_TX11/WSCF/classes/com/arjuna/mw/wsc/deploy/WSCFInitialisation.java
   labs/jbosstm/workspace/XTS_TX11/WSCF/config/wscf.xml
   labs/jbosstm/workspace/XTS_TX11/WSTX/build.xml
   labs/jbosstm/workspace/XTS_TX11/WSTX/classes/com/arjuna/mw/wst/deploy/WSTXInitialisation.java
   labs/jbosstm/workspace/XTS_TX11/WSTX/config/wst.xml
   labs/jbosstm/workspace/XTS_TX11/WSTX/config/wstx.xml
   labs/jbosstm/workspace/XTS_TX11/demo/docs/about.xml
   labs/jbosstm/workspace/XTS_TX11/demo/docs/index.xml
   labs/jbosstm/workspace/XTS_TX11/demo/docs/installcontent.xml
   labs/jbosstm/workspace/XTS_TX11/demo/docs/sourcecode.xml
   labs/jbosstm/workspace/XTS_TX11/demo/docs/wherenext.xml
Log:
Initial checkin of XTS11

Copied: labs/jbosstm/workspace/XTS_TX11 (from rev 7233, labs/jbosstm/trunk/XTS)

Modified: labs/jbosstm/workspace/XTS_TX11/WS-C/dev/dd/ws-c_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_web-app.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WS-C/dev/dd/ws-c_web-app.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -41,21 +41,21 @@
     
     <!-- Initialise WS-C services -->
     <listener>
-        <listener-class>com.arjuna.webservices.wscoor.server.ActivationCoordinatorInitialisation</listener-class>
+        <listener-class>com.arjuna.webservices.wscoor11.server.ActivationCoordinatorInitialisation</listener-class>
     </listener>
     <listener>
-        <listener-class>com.arjuna.webservices.wscoor.server.ActivationRequesterInitialisation</listener-class>
+        <listener-class>com.arjuna.webservices.wscoor11.server.ActivationRequesterInitialisation</listener-class>
     </listener>
     <listener>
-        <listener-class>com.arjuna.webservices.wscoor.server.RegistrationCoordinatorInitialisation</listener-class>
+        <listener-class>com.arjuna.webservices.wscoor11.server.RegistrationCoordinatorInitialisation</listener-class>
     </listener>
     <listener>
-        <listener-class>com.arjuna.webservices.wscoor.server.RegistrationRequesterInitialisation</listener-class>
+        <listener-class>com.arjuna.webservices.wscoor11.server.RegistrationRequesterInitialisation</listener-class>
     </listener>
     
     <!-- Initialise WS-C  -->
     <listener>
-        <listener-class>com.arjuna.wsc.messaging.deploy.CoordinationInitialisation</listener-class>
+        <listener-class>com.arjuna.wsc.messaging.deploy.Coordination11Initialisation</listener-class>
     </listener>
 
     <!--  Initialise the HTTP Client -->

Modified: labs/jbosstm/workspace/XTS_TX11/WS-C/dev/src/com/arjuna/webservices/base/processors/ActivatedObjectProcessor.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/base/processors/ActivatedObjectProcessor.java	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WS-C/dev/src/com/arjuna/webservices/base/processors/ActivatedObjectProcessor.java	2007-08-14 12:33:33 UTC (rev 14199)
@@ -46,6 +46,7 @@
     {
         objectMap.put(identifier, object);
         identifierMap.put(object, identifier);
+System.out.println("KEV: activated id: " + identifier + " (count " + objectMap.size() + ") in " + this) ;
     }
 
     /**
@@ -58,6 +59,7 @@
         if (identifier != null)
         {
             objectMap.remove(identifier) ;
+System.out.println("KEV: deactivated id: " + identifier + " (count " + objectMap.size() + ") in " + this) ;
         }
     }
     

Modified: labs/jbosstm/workspace/XTS_TX11/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java	2007-08-14 12:33:33 UTC (rev 14199)
@@ -137,6 +137,7 @@
             {
                 final String action = getHeader(request, HttpUtils.SOAP_ACTION_HEADER) ;
                 
+System.out.println("Multiplexor processing action: " + action) ;
                 final MessageContext messageContext = new MessageContext() ;
                 initialiseContext(messageContext, request) ;
                 final MessageContext messageResponseContext = new MessageContext() ;

Modified: labs/jbosstm/workspace/XTS_TX11/WSCF/classes/com/arjuna/mw/wsc/deploy/WSCFInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wsc/deploy/WSCFInitialisation.java	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WSCF/classes/com/arjuna/mw/wsc/deploy/WSCFInitialisation.java	2007-08-14 12:33:33 UTC (rev 14199)
@@ -25,8 +25,10 @@
 
 import com.arjuna.mw.wsas.utils.Configuration;
 import com.arjuna.mw.wscf.logging.wscfLogger;
+import com.arjuna.mwlabs.wsc.ContextFactoryMapper11Imple;
 import com.arjuna.mwlabs.wsc.ContextFactoryMapperImple;
 import com.arjuna.wsc.ContextFactoryMapper;
+import com.arjuna.wsc.ContextFactoryMapper11;
 
 /**
  * Initialise WSCF.
@@ -47,8 +49,10 @@
             Configuration.initialise("/wscf.xml");
             
             final ContextFactoryMapper wscfImpl = ContextFactoryMapper.getFactory() ;
+            final ContextFactoryMapper11 wscf11Impl = ContextFactoryMapper11.getFactory() ;
 
             wscfImpl.setSubordinateContextFactoryMapper(new ContextFactoryMapperImple());
+            wscf11Impl.setSubordinateContextFactoryMapper(new ContextFactoryMapper11Imple());
         }
         catch (Exception exception)
         {

Modified: labs/jbosstm/workspace/XTS_TX11/WSCF/config/wscf.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/config/wscf.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WSCF/config/wscf.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -30,13 +30,13 @@
 	    value="com.arjuna.mwlabs.wscf.model.twophase.arjunacore.TwoPhaseHLSImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation2"
-	    value="com.arjuna.mwlabs.wst.at.ContextFactoryImple"/>
+	    value="com.arjuna.mwlabs.wst.at11.ContextFactoryImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation3"
 	    value="com.arjuna.mwlabs.wscf.model.sagas.arjunacore.SagasHLSImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation4"
-	    value="com.arjuna.mwlabs.wst.ba.ContextFactoryImple"/>
+	    value="com.arjuna.mwlabs.wst.ba11.ContextFactoryImple"/>
 	    <property
 	    name="com.arjuna.ats.arjuna.objectstore.objectStoreDir"
 	    value="XTSObjectStore"/>

Modified: labs/jbosstm/workspace/XTS_TX11/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WSTX/build.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -143,8 +143,12 @@
 
 		<copy file="xml/AtomicTransaction.xml"
 		tofile="${com.arjuna.mwlabs.wstx.dest}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
+		<copy file="xml/AtomicTransaction11.xml"
+		tofile="${com.arjuna.mwlabs.wstx.dest}/com/arjuna/mwlabs/wst/at11/ContextFactoryImple.xml"/>
 		<copy file="xml/BusinessActivity.xml"
 		tofile="${com.arjuna.mwlabs.wstx.dest}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
+		<copy file="xml/BusinessActivity11.xml"
+		tofile="${com.arjuna.mwlabs.wstx.dest}/com/arjuna/mwlabs/wst/ba11/ContextFactoryImple.xml"/>
 
 		<jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"
             basedir="${com.arjuna.mwlabs.wstx.dest}">

Modified: labs/jbosstm/workspace/XTS_TX11/WSTX/classes/com/arjuna/mw/wst/deploy/WSTXInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/deploy/WSTXInitialisation.java	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WSTX/classes/com/arjuna/mw/wst/deploy/WSTXInitialisation.java	2007-08-14 12:33:33 UTC (rev 14199)
@@ -35,7 +35,7 @@
 import org.w3c.dom.NodeList;
 
 import com.arjuna.mw.wsas.utils.Configuration;
-import com.arjuna.mw.wst.BusinessActivityManager;
+import com.arjuna.mw.wst.BusinessActivity11Manager;
 import com.arjuna.mw.wst.TransactionManager;
 import com.arjuna.mw.wst.UserBusinessActivity;
 import com.arjuna.mw.wst.UserTransaction;
@@ -121,7 +121,7 @@
         UserTransaction.setUserTransaction((UserTransaction)ClassLoaderHelper.forName(getClass(), userTx).newInstance()) ;
         TransactionManager.setTransactionManager((TransactionManager)ClassLoaderHelper.forName(getClass(), txManager).newInstance()) ;
         UserBusinessActivity.setUserBusinessActivity((UserBusinessActivity)ClassLoaderHelper.forName(getClass(), userBa).newInstance()) ;
-        BusinessActivityManager.setBusinessActivityManager((BusinessActivityManager)ClassLoaderHelper.forName(getClass(), baManager).newInstance()) ;
+        BusinessActivity11Manager.setBusinessActivityManager((BusinessActivity11Manager)ClassLoaderHelper.forName(getClass(), baManager).newInstance()) ;
     }
 
     /**

Modified: labs/jbosstm/workspace/XTS_TX11/WSTX/config/wst.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/config/wst.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WSTX/config/wst.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -21,28 +21,28 @@
 <deployment>
 	<service name="UserTransaction">
 		<parameter name="className"
-		value="com.arjuna.mwlabs.wst.at.remote.UserTransactionImple"/>
+		value="com.arjuna.mwlabs.wst.at11.remote.UserTransactionImple"/>
 
 		<!-- <parameter name="className"
-	value="com.arjuna.mwlabs.wst.at.local.UserTransactionImple"/ -->
+	value="com.arjuna.mwlabs.wst.at11.local.UserTransactionImple"/ -->
 
 	</service>
 	<service name="TransactionManager">
 		<parameter name="className"
-		value="com.arjuna.mwlabs.wst.at.remote.TransactionManagerImple"/>
+		value="com.arjuna.mwlabs.wst.at11.remote.TransactionManagerImple"/>
 		<!-- parameter name="className"
-		value="com.arjuna.mwlabs.wst.at.local.TransactionManagerImple"/ -->
+		value="com.arjuna.mwlabs.wst.at11.local.TransactionManagerImple"/ -->
 	</service>
 	<service name="UserBusinessActivity">
 		<parameter name="className"
-		value="com.arjuna.mwlabs.wst.ba.remote.UserBusinessActivityImple"/>
+		value="com.arjuna.mwlabs.wst.ba11.remote.UserBusinessActivityImple"/>
 		<!-- parameter name="className"
-		value="com.arjuna.mwlabs.wst.ba.local.UserBusinessActivityImple"/ -->
+		value="com.arjuna.mwlabs.wst.ba11.local.UserBusinessActivityImple"/ -->
 	</service>
 	<service name="BusinessActivityManager">
 		<parameter name="className"
-		value="com.arjuna.mwlabs.wst.ba.remote.BusinessActivityManagerImple"/>
+		value="com.arjuna.mwlabs.wst.ba11.remote.BusinessActivityManagerImple"/>
 		<!-- parameter name="className"
-		value="com.arjuna.mwlabs.wst.ba.local.BusinessActivityManagerImple"/ -->
+		value="com.arjuna.mwlabs.wst.ba11.local.BusinessActivityManagerImple"/ -->
 	</service>
 </deployment>

Modified: labs/jbosstm/workspace/XTS_TX11/WSTX/config/wstx.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/config/wstx.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/WSTX/config/wstx.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -22,23 +22,23 @@
 <wstx-config>
 	<properties>
 	    <property name="com.arjuna.mw.wsas.deploymentContext"
-	    value="com.arjuna.mwlabs.wst.at.context.DeploymentContextImple"/>
+	    value="com.arjuna.mwlabs.wst.at11.context.DeploymentContextImple"/>
 	    <property name="com.arjuna.mw.wscf.protocols.twophase.context"
-	    value="com.arjuna.mwlabs.wst.at.context.ArjunaContextImple"/>
+	    value="com.arjuna.mwlabs.wst.at11.context.JBossContextImple"/>
 	    <property name="com.arjuna.mw.wscf.protocols.sagas.context"
-	    value="com.arjuna.mwlabs.wst.ba.context.ArjunaContextImple"/>
+	    value="com.arjuna.mwlabs.wst.ba11.context.JBossContextImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation1"
 	    value="com.arjuna.mwlabs.wscf.model.twophase.arjunacore.TwoPhaseHLSImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation2"
-	    value="com.arjuna.mwlabs.wst.at.ContextFactoryImple"/>
+	    value="com.arjuna.mwlabs.wst.at11.ContextFactoryImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation3"
 	    value="com.arjuna.mwlabs.wscf.model.sagas.arjunacore.SagasHLSImple"/>
 	    <property
 	    name="com.arjuna.mw.wscf.protocolImplementation4"
-	    value="com.arjuna.mwlabs.wst.ba.ContextFactoryImple"/>
+	    value="com.arjuna.mwlabs.wst.ba11.ContextFactoryImple"/>
 	    <property
 	    name="com.arjuna.ats.arjuna.objectstore.objectStoreDir"
 	    value="XTSObjectStore"/>

Modified: labs/jbosstm/workspace/XTS_TX11/demo/docs/about.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/docs/about.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/demo/docs/about.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -36,7 +36,7 @@
             <html>
                 <p>
                     The sample application features some simple transactional Web services, a client application, deployment metadata files and a build script.
-                    The application is designed to introduce some of the key features of the XML Transaction component of ATS 4.1 and help you get started with writing your own transactional Web services applications.
+                    The application is designed to introduce some of the key features of the XML Transaction component of JBossTS 4.2.2 and help you get started with writing your own transactional Web services applications.
                 </p>
                 <p>
                     The application is based around a simple booking scenario. The services provide the ability to transactionally reserve resources,

Modified: labs/jbosstm/workspace/XTS_TX11/demo/docs/index.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/docs/index.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/demo/docs/index.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -33,7 +33,7 @@
         <area title="Introduction">
             <html>
                 <p>
-                    Welcome to the &quot;Night Out&quot; sample application for the XML Transaction component of ATS 4.1.
+                    Welcome to the &quot;Night Out&quot; sample application for the XML Transaction component of JBossTS 4.2.2.
                 </p>
                 <p>
                     This documentation will help you get started with using the JBossTS Web services transactioning product.

Modified: labs/jbosstm/workspace/XTS_TX11/demo/docs/installcontent.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/docs/installcontent.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/demo/docs/installcontent.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -34,7 +34,7 @@
         <area title="Installation Content">
             <html>
                 <p>
-                    The installer should have installed the following directories under &lt;ats 4.1 install&gt;/wst directory:
+                    The installer should have installed the following directories under &lt;jbosst 4.2.2 install&gt;/wst directory:
                     <ul>
                         <p>conf: product configuration files.</p>
                         <p>coordinator: an application independent version of the transaction coordinator.</p>
@@ -46,7 +46,7 @@
                 </p>
                 <p>
                     In addition, you will require a Web services platform on which to deploy and run the product.
-				    This release of the XML Transaction component of ATS 4.1 is designed to run within webMethods.
+				    This release of the XML Transaction component of JBossTS 4.2.2 is designed to run within webMethods.
 				</p>
 				<p>
     				This release has been tested on webMethods 5.0.2.

Modified: labs/jbosstm/workspace/XTS_TX11/demo/docs/sourcecode.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/docs/sourcecode.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/demo/docs/sourcecode.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -35,7 +35,7 @@
         <area title="Source code overview">
             <html>
                 <p>
-                    You can begin experimenting with the XML Transaction component of ATS 4.1 by editing the sample application source code, which is heavily commented to assist your understanding. The source code can be found in the &lt;ats 4.1 install&gt;/wst/demo/src directory.
+                    You can begin experimenting with the XML Transaction component of JBoss 4.2.2 by editing the sample application source code, which is heavily commented to assist your understanding. The source code can be found in the &lt;jbossts 4.2.2 install&gt;/wst/demo/src directory.
                 </p>
                 <p>
                     It is structured as follows:

Modified: labs/jbosstm/workspace/XTS_TX11/demo/docs/wherenext.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/docs/wherenext.xml	2006-10-30 15:22:02 UTC (rev 7233)
+++ labs/jbosstm/workspace/XTS_TX11/demo/docs/wherenext.xml	2007-08-14 12:33:33 UTC (rev 14199)
@@ -34,7 +34,7 @@
         <area title="Where next?">
             <html>
                 <p>
-                    For further information, please consult the XML Transaction component of ATS 4.1 product documentation set.
+                    For further information, please consult the XML Transaction component of JBossTS 4.2.2 product documentation set.
                     <li><a class="linkscoloured" href="../../docs/Programmers Guide.pdf" target="_blank">Programmers Guide</a> (.pdf)</li>
                 </p>
                 <p>




More information about the jboss-svn-commits mailing list