[jboss-cvs] JBossAS SVN: r78963 - trunk/server/src/etc/deploy.

[jboss-cvs-commits at lists.jboss.org]

Author: jhalliday
Date: 2008-09-30 11:41:42 -0400 (Tue, 30 Sep 2008)
New Revision: 78963

Modified:
   trunk/server/src/etc/deploy/transaction-jboss-beans.xml
Log:
Uncommented service binding manager integration for JBossTS, as the new JBossTS 4.4.0.GA now supports it.  JBAS-5919 with a side order of JBAS-5192.


Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml	2008-09-30 15:25:40 UTC (rev 78962)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml	2008-09-30 15:41:42 UTC (rev 78963)
@@ -8,48 +8,44 @@
         <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
         <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
 
-        <!-- ServiceBindingManager wiring is commented out for now, as the TS does not support it yet.
-                    Comment in when the app server trunk is updated to use JBossTS > 4.4.CR2
-                                                                                Jonathan.
+        <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="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="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="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="socketProcessIdPort">
+            <value-factory bean="ServiceBindingManager"
+                           method="getIntBinding" >
+                <parameter>TransactionManager</parameter>
+                <parameter>socketProcessId</parameter>
+            </value-factory>
+        </property>
 
-            <property name="socketProcessIdPort">
-                <value-factory bean="ServiceBindingManager"
-                               method="getIntBinding" >
-                    <parameter>TransactionManager</parameter>
-                    <parameter>socketProcessId</parameter>
-                </value-factory>
-            </property>
-        -->
     </bean>
 
 </deployment>
\ No newline at end of file