[jboss-svn-commits] JBL Code SVN: r35788 - labs/jbosstm/trunk/atsintegration.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 28 10:25:06 EDT 2010
Author: jhalliday
Date: 2010-10-28 10:25:05 -0400 (Thu, 28 Oct 2010)
New Revision: 35788
Modified:
labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml
labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts
Log:
Sync AS integration xml to AS trunk versions.
Modified: labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml 2010-10-28 07:32:39 UTC (rev 35787)
+++ labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml 2010-10-28 14:25:05 UTC (rev 35788)
@@ -100,19 +100,47 @@
<property name="defaultTimeout">300</property>
</bean>
- <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+ <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.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+ <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">ObjectStoreEnvironmentBean</demand>
-
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+
<property name="types" preinstantiate="false">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
@@ -125,8 +153,9 @@
</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>
+ <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="lastResourceOptimisationInterface">org.jboss.tm.LastResource</property>
@@ -147,12 +176,15 @@
<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>
@@ -170,7 +202,9 @@
<demand state="Create">RecoveryEnvironmentBean</demand>
<demand state="Create">CoreEnvironmentBean</demand>
<demand state="Create">CoordinatorEnvironmentBean</demand>
- <demand state="Create">ObjectStoreEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
<demand state="Create">JTAEnvironmentBean</demand>
<demand>RecoveryManager</demand>
Modified: labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts
===================================================================
--- labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts 2010-10-28 07:32:39 UTC (rev 35787)
+++ labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts 2010-10-28 14:25:05 UTC (rev 35788)
@@ -107,31 +107,59 @@
<property name="defaultTimeout">300</property>
</bean>
- <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+ <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.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+ <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">ObjectStoreEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
<property name="types" preinstantiate="false">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <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>
+ <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">
@@ -168,6 +196,9 @@
</constructor>
<demand state="Create">RecoveryEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
</bean>
@@ -181,15 +212,17 @@
<property name="jbossXATerminator"><inject bean="XATerminator"/></property>
<property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
-
+
<start>
- <parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
+ <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">ObjectStoreEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
<demand state="Create">JTAEnvironmentBean</demand>
<demand>RecoveryManager</demand>
@@ -260,9 +293,13 @@
<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">
More information about the jboss-svn-commits
mailing list