[jboss-svn-commits] JBL Code SVN: r36969 - in labs/jbosstm/trunk: ArjunaJTS and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Apr 21 09:31:23 EDT 2011


Author: jhalliday
Date: 2011-04-21 09:31:23 -0400 (Thu, 21 Apr 2011)
New Revision: 36969

Removed:
   labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml
   labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts
Modified:
   labs/jbosstm/trunk/ArjunaJTA/INSTALL
   labs/jbosstm/trunk/ArjunaJTS/INSTALL
Log:
Doc updates for 4.15


Modified: labs/jbosstm/trunk/ArjunaJTA/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/INSTALL	2011-04-21 13:16:01 UTC (rev 36968)
+++ labs/jbosstm/trunk/ArjunaJTA/INSTALL	2011-04-21 13:31:23 UTC (rev 36969)
@@ -1,160 +1,9 @@
 
-JBossTS 4.14 is designed for use standalone or with the JBossAS 6.0.CR1 release
-It is not suitable for use with earlier versions of JBossAS.
+JBossTS 4.15 is designed for use standalone.
+It is also used by JBossAS 7 beta releases, but manual upgrading of the component inside JBossAS is not recommended.
+Integration with JBossAS 6 or earlier is no longer supported.
 
-The installation procedure has changed from earlier releases due to the move from
-a JMX configuration style to the POJO microcontainer used by AS 6.x, packaging and config files changes.
-Upgrading users should take care to read the steps below carefully.
 
-Installing JBossTS 4.14 JTA into JBossAS 6
-------------------------------------------------------------
-
-The application server ships with an earlier release of JBossTS JTS, configured to run in JTA local mode,
-as its default transaction manager. It is not recommended to install the JTA only, but should you wish to
-do so the steps are as follows:
-
-- Delete JBossAS common/lib/jbossjts* common/lib/jbossts-common.jar and client/jbossjts*
-
-- Copy JBossTS lib/*.jar to JBossAS common/lib/ and client/
-
-- Delete JBossAS server/<name>/conf/jbossts-properties.xml
-
-- Replace JBossAS server/<name>/deploy/transaction-jboss-beans.xml with the newer JBossTS version.
-
-
-                         Web Services Transactions
-                         -------------------------
-
-The Web Services Transactions component (XTS) binary now ships within JBossAS. It is recommended to install the
-bundled version by copying $JBOSS_HOME/docs/examples/transactions/jbossxts.sar to $JBOSS_HOME/server/<xxx>/deploy/
-
-Build and deploy from source
-----------
-
-In JBossAS 6.x XTS is deployed as a service archive (sar) which can be
-deployed with either the JTA or JTS Transaction Service
-implementation. This sar implements both the participant and the
-coordinator services required to support web service transactions. By
-default the services deployed in the sar implement both the 1.0 and
-1.1 OASIS WSCOOR, WSAT and WSBA protocols. It is also possible to
-build the sar so that only the 1.0 or the 1.1 implementations are
-deployed (see the build script in XTS/sar for details).
-
-The default XTS build produces a service archive which contains both
-sets of participant and coordinator services configured to support
-transactional web service invocations within a single JVM. The services
-employ the JBoss Application Server bind address and JBoss Web listener
-port which default to address localhost and port 8080. This default build
-is suitable for demonstrating the functionality of XTS using the supplied
-demo programs. One of the demos displays use of the WS 1.1 protocols when
-invoking web services via JaxWS. The other displays use of the WS 1.0
-protocols when invoking web services via JaxRPC.
-
-To build the default sar, cd to the XTS root directory and invoke the
-ant build script
-
-  cd <JBossTSDir>/XTS
-  ant clean install
-
-Note that this assumes you have already built the JBossTS JTA or JBossTS JTS
-release in directory <JBossTSDir> and deployed it into your
-application server. Although JBossAS contains a JBossTS JTA installation
-by default, this should be upgraded to exactly match the version of XTS if required.
-
-The newly built sar will be located in the installed XTS tree:
-
-  <JBossTSDir>/xts-install/sar/jbossxts.sar
-
-Deploy this sar by copying it into the relevant JBossAS server deploy
-directory
-
-  cp <JBossTSDir>/xts-install/sar/jbossxts.sar <JBossDir>/server/<xxx>/deploy
-
-Alternatively, you can set the environment variable JBOSS_HOME and
-then deploy using the build script in the XTS/sar sub-directory:
-
-  setenv JBOSS_HOME <JBossDir>
-  cd <JBossTSDir>/XTS/sar
-  ant deploy
-
-This will install the sar in sub-directory server/default/deploy of
-$JBOSS_HOME
-
-Stand-alone coordinator configuration
----------------------------------
-
-The JBoss AS command line can be used to disable use of the local
-coordinator services and direct the participants to negotiate with
-a remote coordinator located in a different JBoss application server.
-
-The -D option can be used to set a property defining an absolute URL
-for the coordinator service to be used by XTS clients. So, for example,
-the 1.0 and 1.1 implementations would be configured independently by
-providing, respectively, the following command line arguments
-
-  -Dorg.jboss.jbossts.xts.coordinatorURL=http://foo.example.com:8080/ws-c10/soap/ActivationCoordinator
-
-  -Dorg.jboss.jbossts.xts11.coordinatorURL=http://bar.example.com:9090/ws-c11/ActivationService
-
-This would cause all XTS 1.0 clients to negotiate with the coordinator
-services deployed on host foo.example.com via port 8080 and all XTS 1.1
-clients to negotiate with the coordinator services deployed on host
-bar.example.com via port 9090. The URL paths supplied are appropriate
-to a JBoss AS with XTS deployed. These will need to be redefined if
-another vendor's coordination service implementation is being used.
-
-It is also possible to respecify individual components of the coordinator
-URL using the following property settings
-
-    org.jboss.jbossts.xts.coordinator.host
-    org.jboss.jbossts.xts.coordinator.port
-    org.jboss.jbossts.xts.coordinator.path
-
-    org.jboss.jbossts.xts11.coordinator.host
-    org.jboss.jbossts.xts11.coordinator.port
-    org.jboss.jbossts.xts11.coordinator.path
-
-The host and port default to the server bind address and the JBoss Web
-listener port. The paths default to the values supplied in the example
-above.
-
-It is possible to rebuild the XTS sar so that it employs a stand-alone
-coordinator without the need to supply arguments on the AS command line.
-
-So, for example,
-
-  setenv JBOSS_HOME <JBossDir>
-  cd <JBossTSDir>/XTS/sar
-  ant clean install
-  cd sar
-  ant deploy -Dcoordinator.hostname=foo.example.com \
-             -Dcoordinator.port=9090
-
-will build and deploy a sar which, by default will direct clients
-to the coordinator located in a JBoss AS instance running on host
-foo.example.com and configured to use port 9090 as the JBoss Web
-listener port. It is not possible to redefine the coordinator URL
-path using this mechanism.
-
-Configuration of a remote coordinator provided by another XTS
-implementation is available by editing the configuration files in
-directory XTS/xts-install/conf and setting an appropriate URL for
-the coordinator URL property. The value specified for property
-org.jboss.jbossts.xts.coordinatorURL in file wstx.xml is used by
-the 1.0 protocol implementation. The value specified for property
-org.jboss.jbossts.xts11.coordinatorURL in file wstx11.xml is used
-by the 1.1 protocol implementation.
-
-
-XTS Trailmap Documentation
---------------------------
-
-We recommend that you run through the XTS trailmap in order to
-understand how to build and use transaction-aware Web Services, before
-deciding whether or not to use a stand alone coordinator service. The
-trail map web pages are located in the htdocs sub-directory of the XTS
-installed tree.
-
                          Embedded Tools
                          --------------
 
@@ -177,21 +26,7 @@
 corresponding to this ObjectStore will have names prefixed by this
 'top level' MBean.
 
-Note: if this bean does not appear in the JMX browser check that the
-been is being initialised in transaction-jboss-beans.xml:
-    <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
-        ...
-    </bean>
-
-If JBossTS is deployed in the JBoss application server then JMX
-instrumentation of the ObjectStore is enabled by default. It can be disabled
-commenting out the ObjectStoreBrowserBean bean definition in the file
-transaction-jboss-beans.xml file. Furthermore, if the JBossTS JOPR plugin
-(see below for details) is copied to the admin console deploy directory then
-the same information is available via the JBoss AS Admin Console.
-
-The JMX instrumentation is also available when running JBossTS in stand-alone
-mode. Simply instantiate an object of type com.hp.mwtests.ts.arjuna.tools.ObjStoreBrowser
+Simply instantiate an object of type com.hp.mwtests.ts.arjuna.tools.ObjStoreBrowser
 and initialise it with a valid set of types for handling ObjectStore records. These types
 can be set using a setTypes() method via a properties file on the classpath.
 Please refer to the unit tests in the src distribution for more details.
@@ -199,16 +34,26 @@
 Tools Deployment
 ----------------
 
-Embedded tools is an applet that runs in process with the AS which
-includes an interface for inspecting transactions. It is deployed as
-a service archive and can be found in the product install directory:
-<install directory>/bin/jbossts-tools.sar
+Transaction management is integrated into the admin console in the form of a JOPR plugin
+which is located in the install bin directory (jbossts-jopr-plugin.jar). Install it by copying
+to the admin console plugin directory ($JBOSS_HOME/common/deploy/admin-console.war/plugins).
 
-To start the tool simply copy the sar to the AS deploy directory, open
-the JMX console (http://.../jmx-console) and click on the service named
-EmbeddedTools.
+There is also a transaction statistics graphing tool which can run standalone or inside a
+jconsole tab (jconsole, a tool for managing JVMs, is distributed with the reference JDK):
 
-Note that the embedded tools will be deprecated in favour of the JOPR plugin
-for JBossTS transaction management. This is available as a jar in the install
-bin directory (jbossts-jopr-plugin.jar) which should be installed in the
-embedded JOPR plugin directory ($JBOSS_HOME/common/deploy/admin-console.war/plugins)
+The tool depends on the JFree graphing library. Download and upack orson from http://www.jfree.org/orson
+Set the env variable ORSON_HOME to the directory where you plan to unpack the downloaded zip.
+If you intend to use the tool with jconsole you will also need to put the JDK tools and jconsole jars on
+the classpath:
+
+export CLASSPATH="$JDK_HOME/lib/tools.jar:$JDK_HOME/lib/jconsole.jar:$ORSON_HOME/orson-0.5.0.jar:$ORSON_HOME/lib/jfreechart-1.0.6.jar:$ORSON_HOME/lib/jcommon-1.0.10.jar:$TS_INSTALL_DIR/lib/jbossjta.jar>"
+
+Standalone Usage:
+
+java com.arjuna.ats.arjuna.tools.stats.TxPerfGraph
+
+(note that standalone usage does not require the JDK tools and jconsole jars)
+
+Usage with jconsole:
+
+jconsole -J-Djava.class.path="$CLASSPATH" -pluginpath $TS_INSTALL_DIR/lib/jbossjta.jar
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTS/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/INSTALL	2011-04-21 13:16:01 UTC (rev 36968)
+++ labs/jbosstm/trunk/ArjunaJTS/INSTALL	2011-04-21 13:31:23 UTC (rev 36969)
@@ -1,172 +1,10 @@
 
-JBossTS 4.14 is designed for use standalone or with JBossAS 6.0.CR1 release
-It is not suitable for use with earlier versions of JBossAS.
+JBossTS 4.15 is designed for use standalone.
+The JTA is also used by JBossAS 7 beta releases, but manual upgrading of the component inside JBossAS is not recommended.
+ JTS and XTS are not currently available in AS7.
+Integration with JBossAS 6 or earlier is no longer supported.
 
-The installation procedure has changed from earlier releases due to the move from
-a JMX configuration style to the POJO microcontainer used by AS 6.x, packaging and config files changes.
-Upgrading users should take care to read the steps below carefully.
 
-
-Installing JBossTS 4.14 JTA into JBossAS 6
-------------------------------------------------------------
-
-The application server ships with an earlier release of JBossTS JTS, configured to run in JTA local mode,
-as its default transaction manager. It is not recommended to install the JTA only, but should you wish to
-do so the steps are as follows:
-
-- Delete JBossAS common/lib/jbossjts* common/lib/jbossts-common.jar and client/jbossjts*
-
-- Copy JBossTS lib/*.jar to JBossAS common/lib/ and client/
-
-- Delete JBossAS server/<name>/conf/jbossts-properties.xml
-
-- Replace JBossAS server/<name>/deploy/transaction-jboss-beans.xml with the newer JBossTS version.
-
-
-Installing JBossTS 4.14 JTS into JBossAS 6
-------------------------------------------------------------
-
-The JTS binaries are now bundled with JBossAS. To change the default JTA to JTS in JBossAS,
-follow the instructions in the app server's docs/examples/transactions/README.txt file.
-
-To upgrade the version of JTS bundled with JBossAS to the one from this JBossTS release,
-follow the install steps as for the JTA (see above), but install the JTS version of
-transaction-jboss-beans.xml ensuring that the selected server profile contains an ORB.
-
-
-                         Web Services Transactions
-                         -------------------------
-
-The Web Services Transactions component (XTS) binary now ships within JBossAS. It is recommended to install the
-bundled version by copying $JBOSS_HOME/docs/examples/transactions/jbossxts.sar to $JBOSS_HOME/server/<xxx>/deploy/
-
-Build and deploy from source
-----------
-
-In JBossAS 6.x XTS is deployed as a service archive (sar) which can be
-deployed with either the JTA or JTS Transaction Service
-implementation. This sar implements both the participant and the
-coordinator services required to support web service transactions. By
-default the services deployed in the sar implement both the 1.0 and
-1.1 OASIS WSCOOR, WSAT and WSBA protocols. It is also possible to
-build the sar so that only the 1.0 or the 1.1 implementations are
-deployed (see the build script in XTS/sar for details).
-
-The default XTS build produces a service archive which contains both
-sets of participant and coordinator services configured to support
-transactional web service invocations within a single JVM. The services
-employ the JBoss Application Server bind address and JBoss Web listener
-port which default to address localhost and port 8080. This default build
-is suitable for demonstrating the functionality of XTS using the supplied
-demo programs. One of the demos displays use of the WS 1.1 protocols when
-invoking web services via JaxWS. The other displays use of the WS 1.0
-protocols when invoking web services via JaxRPC.
-
-To build the default sar, cd to the XTS root directory and invoke the
-ant build script
-
-  cd <JBossTSDir>/XTS
-  ant clean install
-
-Note that this assumes you have already built the JBossTS JTA or JBossTS JTS
-release in directory <JBossTSDir> and deployed it into your
-application server. Although JBossAS contains a JBossTS JTA installation
-by default, this should be upgraded to exactly match the version of XTS if required.
-
-The newly built sar will be located in the installed XTS tree:
-
-  <JBossTSDir>/xts-install/sar/jbossxts.sar
-
-Deploy this sar by copying it into the relevant JBossAS server deploy
-directory
-
-  cp <JBossTSDir>/xts-install/sar/jbossxts.sar <JBossDir>/server/<xxx>/deploy
-
-Alternatively, you can set the environment variable JBOSS_HOME and
-then deploy using the build script in the XTS/sar sub-directory:
-
-  setenv JBOSS_HOME <JBossDir>
-  cd <JBossTSDir>/XTS/sar
-  ant deploy
-
-This will install the sar in sub-directory server/default/deploy of
-$JBOSS_HOME
-
-Stand-alone coordinator configuration
----------------------------------
-
-The JBoss AS command line can be used to disable use of the local
-coordinator services and direct the participants to negotiate with
-a remote coordinator located in a different JBoss application server.
-
-The -D option can be used to set a property defining an absolute URL
-for the coordinator service to be used by XTS clients. So, for example,
-the 1.0 and 1.1 implementations would be configured independently by
-providing, respectively, the following command line arguments
-
-  -Dorg.jboss.jbossts.xts.coordinatorURL=http://foo.example.com:8080/ws-c10/soap/ActivationCoordinator
-
-  -Dorg.jboss.jbossts.xts11.coordinatorURL=http://bar.example.com:9090/ws-c11/ActivationService
-
-This would cause all XTS 1.0 clients to negotiate with the coordinator
-services deployed on host foo.example.com via port 8080 and all XTS 1.1
-clients to negotiate with the coordinator services deployed on host
-bar.example.com via port 9090. The URL paths supplied are appropriate
-to a JBoss AS with XTS deployed. These will need to be redefined if
-another vendor's coordination service implementation is being used.
-
-It is also possible to respecify individual components of the coordinator
-URL using the following property settings
-
-    org.jboss.jbossts.xts.coordinator.host
-    org.jboss.jbossts.xts.coordinator.port
-    org.jboss.jbossts.xts.coordinator.path
-
-    org.jboss.jbossts.xts11.coordinator.host
-    org.jboss.jbossts.xts11.coordinator.port
-    org.jboss.jbossts.xts11.coordinator.path
-
-The host and port default to the server bind address and the JBoss Web
-listener port. The paths default to the values supplied in the example
-above.
-
-It is possible to rebuild the XTS sar so that it employs a stand-alone
-coordinator without the need to supply arguments on the AS command line.
-
-So, for example,
-
-  setenv JBOSS_HOME <JBossDir>
-  cd <JBossTSDir>/XTS/sar
-  ant clean install
-  cd sar
-  ant deploy -Dcoordinator.hostname=foo.example.com \
-             -Dcoordinator.port=9090
-
-will build and deploy a sar which, by default will direct clients
-to the coordinator located in a JBoss AS instance running on host
-foo.example.com and configured to use port 9090 as the JBoss Web
-listener port. It is not possible to redefine the coordinator URL
-path using this mechanism.
-
-Configuration of a remote coordinator provided by another XTS
-implementation is available by editing the configuration files in
-directory XTS/xts-install/conf and setting an appropriate URL for
-the coordinator URL property. The value specified for property
-org.jboss.jbossts.xts.coordinatorURL in file wstx.xml is used by
-the 1.0 protocol implementation. The value specified for property
-org.jboss.jbossts.xts11.coordinatorURL in file wstx11.xml is used
-by the 1.1 protocol implementation.
-
-
-XTS Trailmap Documentation
---------------------------
-
-We recommend that you run through the XTS trailmap in order to
-understand how to build and use transaction-aware Web Services, before
-deciding whether or not to use a stand alone coordinator service. The
-trail map web pages are located in the htdocs sub-directory of the XTS
-installed tree.
-
                          Embedded Tools
                          --------------
 
@@ -189,21 +27,7 @@
 corresponding to this ObjectStore will have names prefixed by this
 'top level' MBean.
 
-Note: if this bean does not appear in the JMX browser check that the
-been is being initialised in transaction-jboss-beans.xml:
-    <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
-        ...
-    </bean>
-
-If JBossTS is deployed in the JBoss application server then JMX
-instrumentation of the ObjectStore is enabled by default. It can be disabled
-commenting out the ObjectStoreBrowserBean bean definition in the file
-transaction-jboss-beans.xml file. Furthermore, if the JBossTS JOPR plugin
-(see below for details) is copied to the admin console deploy directory then
-the same information is available via the JBoss AS Admin Console.
-
-The JMX instrumentation is also available when running JBossTS in stand-alone
-mode. Simply instantiate an object of type com.hp.mwtests.ts.arjuna.tools.ObjStoreBrowser
+Simply instantiate an object of type com.hp.mwtests.ts.arjuna.tools.ObjStoreBrowser
 and initialise it with a valid set of types for handling ObjectStore records. These types
 can be set using a setTypes() method via a properties file on the classpath.
 Please refer to the unit tests in the src distribution for more details.

Deleted: labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml	2011-04-21 13:16:01 UTC (rev 36968)
+++ labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml	2011-04-21 13:31:23 UTC (rev 36969)
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-    <!--
-        This is an example transaction-jboss-beans.xml file suitable for installing JBossTS 4.14 JTA
-        into AS 6.0.CR1. The canonical version of this file normally resides in the JBossAS svn
-        but right now JBossAS is running an earlier TS release, so we provide this file via the
-        JBossTS svn as an example to facilitate upgrading. Take care - some non-arjuna beans many have
-        changed in the AS svn since we forked this file, so you may need to merge rather than overwrite.
-        Full upgrade steps in the INSTALL file of the JBossTS release.
-        You need a different version of this file for JTS mode.
-        You don't need a jbossts-properties.xml in the AS anymore, it's all done by the beans below.
-
-         jonathan.halliday at redhat.com, 2010-10
-    -->
-
-    <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=RecoveryEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.RecoveryEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.common.recoveryPropertyManager" factoryMethod="getRecoveryEnvironmentBean"/>
-
-        <property name="recoveryInetAddress">
-            <value-factory bean="ServiceBindingManager"
-                           method="getInetAddressBinding">
-                <parameter>TransactionManager</parameter>
-                <parameter>recoveryManager</parameter>
-            </value-factory>
-        </property>
-        <property name="recoveryPort">
-            <value-factory bean="ServiceBindingManager"
-                           method="getIntBinding" >
-                <parameter>TransactionManager</parameter>
-                <parameter>recoveryManager</parameter>
-            </value-factory>
-        </property>
-
-        <property name="transactionStatusManagerInetAddress">
-            <value-factory bean="ServiceBindingManager"
-                           method="getInetAddressBinding">
-                <parameter>TransactionManager</parameter>
-                <parameter>transactionStatusManager</parameter>
-            </value-factory>
-        </property>
-        <property name="transactionStatusManagerPort">
-            <value-factory bean="ServiceBindingManager"
-                           method="getIntBinding" >
-                <parameter>TransactionManager</parameter>
-                <parameter>transactionStatusManager</parameter>
-            </value-factory>
-        </property>
-
-        <property name="recoveryModuleClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule</value>
-                <value>com.arjuna.ats.internal.txoj.recovery.TORecoveryModule</value>
-                <value>com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule</value>
-            </list>
-        </property>
-
-        <property name="expiryScannerClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner</value>
-            </list>
-        </property>
-
-        <property name="recoveryActivatorClassNames">
-            <null/>
-        </property>
-
-    </bean>
-
-    <bean name="CoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.CoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoreEnvironmentBean"/>
-
-        <property name="socketProcessIdPort">
-            <value-factory bean="ServiceBindingManager"
-                           method="getIntBinding">
-                <parameter>TransactionManager</parameter>
-                <parameter>socketProcessId</parameter>
-            </value-factory>
-        </property>
-
-        <property name="nodeIdentifier">1</property>
-
-        <property name="socketProcessIdMaxPorts">10</property>
-
-    </bean>
-
-    <bean name="CoordinatorEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CoordinatorEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoordinatorEnvironmentBean"/>
-
-        <property name="enableStatistics">false</property>
-        <property name="defaultTimeout">300</property>
-    </bean>
-
-    <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ActionStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
-            <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
-            <parameter>default</parameter>
-        </constructor>
-
-        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
-    </bean>
-
-    <bean name="StateStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=StateStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
-            <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
-            <parameter>stateStore</parameter>
-        </constructor>
-
-        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
-    </bean>
-
-    <bean name="CommunicationStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CommunicationStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
-            <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
-            <parameter>communicationStore</parameter>
-        </constructor>
-
-        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
-    </bean>
-
-
-    <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
-
-        <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
-
-        <property name="types" preinstantiate="false">
-            <map keyClass="java.lang.String" valueClass="java.lang.String">
-                <entry>
-                    <key>StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction</key>
-                    <value>com.arjuna.ats.internal.jta.tools.osb.mbean.jta.JTAActionBean</value>
-                </entry>
-            </map>
-        </property>
-
-    </bean>
-
-    <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=JTAEnvironmentBean", exposedInterface=com.arjuna.ats.jta.common.JTAEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.jta.common.jtaPropertyManager" factoryMethod="getJTAEnvironmentBean"/>
-
-        <property name="lastResourceOptimisationInterfaceClassName">org.jboss.tm.LastResource</property>
-
-        <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate</property>
-        <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple</property>
-        <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple</property>
-
-        <property name="xaRecoveryNodes" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>1</value>
-            </list>
-        </property>
-
-        <property name="xaResourceOrphanFilterClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
-                <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
-            </list>
-        </property>
-
-    </bean>
-
-    <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
-
-        <demand state="Create">RecoveryEnvironmentBean</demand>
-        <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
-
-    </bean>
-
-    <bean name="XATerminator" class="com.arjuna.ats.internal.jbossatx.jta.jca.XATerminator"/>
-
-    <bean name="TransactionSynchronizationRegistry" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple"/>
-
-    <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
-        <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionManager",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class)</annotation>
-
-        <property name="jbossXATerminator"><inject bean="XATerminator"/></property>
-        <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
-
-        <demand state="Create">RecoveryEnvironmentBean</demand>
-        <demand state="Create">CoreEnvironmentBean</demand>
-        <demand state="Create">CoordinatorEnvironmentBean</demand>
-        <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">JTAEnvironmentBean</demand>
-        <demand>RecoveryManager</demand>
-
-        <!-- the TransactionManager itself does not depend on JNDI, but some things that expect to be able to do
-          JNDI lookups express a dependency on the TM rather than the JNDI bindings, so we need to placate them -->
-        <demand>TransactionManagerJNDIBinding</demand>
-        <demand>TransactionSynchronizationRegistryJNDIBinding</demand>
-        <demand>TransactionPropagationContextImporterJNDIBinding</demand>
-        <demand>TransactionPropagationContextExporterJNDIBinding</demand>
-
-    </bean>
-
-    <bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=TransactionStatistics", exposedInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class, registerDirectly=true)</annotation>
-        <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionStatistics",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
-    </bean>
-
-    <bean name="TransactionManagerJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <property name="bindName">java:/TransactionManager</property>
-        <property name="className">
-            <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
-        </property>
-        <property name="factory">
-            <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
-        </property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-    <bean name="TransactionSynchronizationRegistryJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <!-- It's the job of individual components (EJB3, web, etc) to copy the ref to the java:/comp space) -->
-        <property name="bindName">java:/TransactionSynchronizationRegistry</property>
-        <property name="className">
-            <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
-        </property>
-        <property name="factory">
-            <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
-        </property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-
-    <bean name="TransactionPropagationContextImporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <property name="bindName">java:/TransactionPropagationContextImporter</property>
-        <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-        <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-    <bean name="TransactionPropagationContextExporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <property name="bindName">java:/TransactionPropagationContextExporter</property>
-        <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-        <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-    <!-- Ensure TransactionPropagationContextUtil's ref to TransactionPropagationContextFactory is set. See JBAS-7784. -->
-    <bean name="TransactionPropagationContextFactory" class="org.jboss.tm.TransactionPropagationContextFactory">
-       <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
-       <!--  The factory method looks up the JNDI binding, so we depend on it -->
-       <depends>TransactionPropagationContextExporterJNDIBinding</depends>
-    </bean>
-
-    <!-- Make javax.transaction.TransactionManager available for injection -->
-    <bean name="RealTransactionManager">
-      <constructor factoryMethod="getTransactionManager">
-        <factory bean="TransactionManager"/>
-      </constructor>
-    </bean>
-
-    <!-- Handles user transaction providers and listeners -->
-    <bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
-      <!-- Register providers -->
-      <incallback method="addProvider"/>
-      <uncallback method="removeProvider"/>
-      <!-- Register listeners -->
-      <incallback method="addListener"/>
-      <uncallback method="removeListener"/>
-    </bean>
-
-    <!-- The provider for default in process UserTransactions -->
-    <bean name="DefaultUserTransactionprovider" class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
-       <constructor factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction" factoryMethod="getSingleton"/>
-       <demand>TransactionManager</demand>
-    </bean>
-
-</deployment>

Deleted: labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts
===================================================================
--- labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts	2011-04-21 13:16:01 UTC (rev 36968)
+++ labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts	2011-04-21 13:31:23 UTC (rev 36969)
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-    <!--
-        This is an example transaction-jboss-beans.xml file suitable for installing JBossTS 4.14 JTS
-        into AS 6.0.CR1. The canonical version of this file normally resides in the JBossAS svn
-        but right now JBossAS is running an earlier TS release, so we provide this file via the
-        JBossTS svn as an example to facilitate upgrading. Take care - some non-arjuna beans many have
-        changed in the AS svn since we forked this file, so you may need to merge rather than overwrite.
-        Full upgrade steps in the INSTALL file of the JBossTS release.
-        You need a different version of this file for JTA mode.
-        You don't need a jbossts-properties.xml in the AS anymore, it's all done by the beans below.
-
-         jonathan.halliday at redhat.com, 2010-10
-    -->
-
-    <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=RecoveryEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.RecoveryEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.common.recoveryPropertyManager" factoryMethod="getRecoveryEnvironmentBean"/>
-
-        <property name="recoveryInetAddress">
-            <value-factory bean="ServiceBindingManager"
-                           method="getInetAddressBinding">
-                <parameter>TransactionManager</parameter>
-                <parameter>recoveryManager</parameter>
-            </value-factory>
-        </property>
-        <property name="recoveryPort">
-            <value-factory bean="ServiceBindingManager"
-                           method="getIntBinding" >
-                <parameter>TransactionManager</parameter>
-                <parameter>recoveryManager</parameter>
-            </value-factory>
-        </property>
-
-        <property name="transactionStatusManagerInetAddress">
-            <value-factory bean="ServiceBindingManager"
-                           method="getInetAddressBinding">
-                <parameter>TransactionManager</parameter>
-                <parameter>transactionStatusManager</parameter>
-            </value-factory>
-        </property>
-        <property name="transactionStatusManagerPort">
-            <value-factory bean="ServiceBindingManager"
-                           method="getIntBinding" >
-                <parameter>TransactionManager</parameter>
-                <parameter>transactionStatusManager</parameter>
-            </value-factory>
-        </property>
-
-        <property name="recoveryModuleClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule</value>
-                <value>com.arjuna.ats.internal.txoj.recovery.TORecoveryModule</value>
-                <value>com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule</value>
-                <value>com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule</value>
-                <value>com.arjuna.ats.internal.jta.recovery.jts.XARecoveryModule</value>
-            </list>
-        </property>
-
-        <property name="expiryScannerClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner</value>
-                <value>com.arjuna.ats.internal.jts.recovery.contact.ExpiredContactScanner</value>
-                <value>com.arjuna.ats.internal.jts.recovery.transactions.ExpiredToplevelScanner</value>
-                <value>com.arjuna.ats.internal.jts.recovery.transactions.ExpiredServerScanner</value>
-            </list>
-        </property>
-
-        <property name="recoveryActivatorClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.jts.orbspecific.recovery.RecoveryEnablement</value>
-            </list>
-        </property>
-
-    </bean>
-
-    <bean name="CoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.CoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoreEnvironmentBean"/>
-
-        <property name="socketProcessIdPort">
-            <value-factory bean="ServiceBindingManager"
-                           method="getIntBinding">
-                <parameter>TransactionManager</parameter>
-                <parameter>socketProcessId</parameter>
-            </value-factory>
-        </property>
-
-        <property name="nodeIdentifier">1</property>
-
-        <property name="socketProcessIdMaxPorts">10</property>
-
-    </bean>
-
-    <bean name="CoordinatorEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CoordinatorEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoordinatorEnvironmentBean"/>
-
-        <property name="enableStatistics">false</property>
-        <property name="defaultTimeout">300</property>
-    </bean>
-
-    <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ActionStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
-            <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
-            <parameter>default</parameter>
-        </constructor>
-
-        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
-    </bean>
-
-    <bean name="StateStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=StateStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
-            <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
-            <parameter>stateStore</parameter>
-        </constructor>
-
-        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
-    </bean>
-
-    <bean name="CommunicationStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CommunicationStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
-            <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
-            <parameter>communicationStore</parameter>
-        </constructor>
-
-        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
-    </bean>
-
-    <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
-
-        <demand state="Create">TransactionManager</demand>
-
-        <property name="types" preinstantiate="false">
-            <map keyClass="java.lang.String" valueClass="java.lang.String">
-				<entry>
-					<key>StateManager/BasicAction/TwoPhaseCoordinator/ArjunaTransactionImple</key>
-					<value>com.arjuna.ats.arjuna.tools.osb.mbean.ActionBean</value>
-				</entry>
-                <entry>
-                    <key>StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction</key>
-                    <value>com.arjuna.ats.internal.jta.tools.osb.mbean.jta.JTAActionBean</value>
-                </entry>
-            </map>
-        </property>
-
-    </bean>
-
-    <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=JTAEnvironmentBean", exposedInterface=com.arjuna.ats.jta.common.JTAEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.jta.common.jtaPropertyManager" factoryMethod="getJTAEnvironmentBean"/>
-
-        <property name="lastResourceOptimisationInterfaceClassName">org.jboss.tm.LastResource</property>
-
-        <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate</property>
-        <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple</property>
-        <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.jts.TransactionSynchronizationRegistryImple</property>
-
-        <property name="xaRecoveryNodes" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>1</value>
-            </list>
-        </property>
-
-        <property name="xaResourceOrphanFilterClassNames" preinstantiate="false">
-            <list elementClass="java.lang.String">
-                <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
-                <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
-            </list>
-        </property>
-
-    </bean>
-
-    <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jts.RecoveryManagerService">
-
-        <constructor>
-            <parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
-        </constructor>
-
-        <demand state="Create">RecoveryEnvironmentBean</demand>
-        <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
-
-    </bean>
-
-    <bean name="XATerminator" class="com.arjuna.ats.internal.jbossatx.jts.jca.XATerminator"/>
-
-    <bean name="TransactionSynchronizationRegistry" class="com.arjuna.ats.internal.jta.transaction.jts.TransactionSynchronizationRegistryImple"/>
-
-    <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jts.TransactionManagerService">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jts.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
-        <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionManager",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.jbossatx.jts.TransactionManagerServiceMBean.class)</annotation>
-
-        <property name="jbossXATerminator"><inject bean="XATerminator"/></property>
-        <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
-
-        <start>
-            <parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
-        </start>
-
-        <demand state="Create">RecoveryEnvironmentBean</demand>
-        <demand state="Create">CoreEnvironmentBean</demand>
-        <demand state="Create">CoordinatorEnvironmentBean</demand>
-        <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
-        <demand state="Create">JTAEnvironmentBean</demand>
-        <demand>RecoveryManager</demand>
-
-        <!-- the TransactionManager itself does not depend on JNDI, but some things that expect to be able to do
-          JNDI lookups express a dependency on the TM rather than the JNDI bindings, so we need to placate them -->
-        <demand>TransactionManagerJNDIBinding</demand>
-        <demand>TransactionSynchronizationRegistryJNDIBinding</demand>
-        <demand>TransactionPropagationContextImporterJNDIBinding</demand>
-        <demand>TransactionPropagationContextExporterJNDIBinding</demand>
-
-    </bean>
-
-    <bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
-
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=TransactionStatistics", exposedInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class, registerDirectly=true)</annotation>
-        <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionStatistics",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class)</annotation>
-
-        <constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
-    </bean>
-
-    <bean name="TransactionManagerJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <property name="bindName">java:/TransactionManager</property>
-        <property name="className">
-            <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
-        </property>
-        <property name="factory">
-            <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
-        </property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-    <bean name="TransactionSynchronizationRegistryJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <!-- It's the job of individual components (EJB3, web, etc) to copy the ref to the java:/comp space) -->
-        <property name="bindName">java:/TransactionSynchronizationRegistry</property>
-        <property name="className">
-            <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
-        </property>
-        <property name="factory">
-            <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
-        </property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-
-    <bean name="TransactionPropagationContextImporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <property name="bindName">java:/TransactionPropagationContextImporter</property>
-        <property name="className">com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager</property>
-        <property name="factory">com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager</property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-    <bean name="TransactionPropagationContextExporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-
-        <property name="bindName">java:/TransactionPropagationContextExporter</property>
-        <property name="className">com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager</property>
-        <property name="factory">com.arjuna.ats.internal.jbossatx.jts.PropagationContextManager</property>
-
-        <install method="bind"/>
-        <uninstall method="unbind"/>
-    </bean>
-
-    <!-- Ensure TransactionPropagationContextUtil's ref to TransactionPropagationContextFactory is set. See JBAS-7784. -->
-    <bean name="TransactionPropagationContextFactory" class="org.jboss.tm.TransactionPropagationContextFactory">
-        <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
-        <!--  The factory method looks up the JNDI binding, so we depend on it -->
-        <depends>TransactionPropagationContextExporterJNDIBinding</depends>
-    </bean>
-
-    <!-- Make javax.transaction.TransactionManager available for injection -->
-    <bean name="RealTransactionManager">
-      <constructor factoryMethod="getTransactionManager">
-        <factory bean="TransactionManager"/>
-      </constructor>
-    </bean>
-
-    <!-- Handles user transaction providers and listeners -->
-    <bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
-      <!-- Register providers -->
-      <incallback method="addProvider"/>
-      <uncallback method="removeProvider"/>
-      <!-- Register listeners -->
-      <incallback method="addListener"/>
-      <uncallback method="removeListener"/>
-    </bean>
-
-    <!-- The provider for default in process UserTransactions -->
-    <bean name="DefaultUserTransactionprovider" class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
-       <constructor factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction" factoryMethod="getSingleton"/>
-       <demand>TransactionManager</demand>
-    </bean>
-
-</deployment>



More information about the jboss-svn-commits mailing list