[jboss-cvs] JBossAS SVN: r77959 - in trunk/server/src/etc: deploy and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 4 07:03:37 EDT 2008
Author: jhalliday
Date: 2008-09-04 07:03:37 -0400 (Thu, 04 Sep 2008)
New Revision: 77959
Modified:
trunk/server/src/etc/conf/default/bindings.xml
trunk/server/src/etc/deploy/transaction-jboss-beans.xml
Log:
Added new bindings for the transaction service to service binding manager integration. JBAS-5192 and JBTM-394.
Modified: trunk/server/src/etc/conf/default/bindings.xml
===================================================================
--- trunk/server/src/etc/conf/default/bindings.xml 2008-09-04 10:30:08 UTC (rev 77958)
+++ trunk/server/src/etc/conf/default/bindings.xml 2008-09-04 11:03:37 UTC (rev 77959)
@@ -9,13 +9,13 @@
</classloader>
<bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
-
+
<constructor>
<!-- The set of bindings to use for this server -->
<parameter>${jboss.service.binding.set:ports-default}</parameter>
<!-- The named sets of bindings -->
- <parameter>
+ <parameter>
<bean name="ServiceBindingStore" class="org.jboss.services.binding.impl.PojoServiceBindingStore">
<constructor>
@@ -68,7 +68,7 @@
<parameter>1098</parameter>
</constructor>
</bean>
-
+
<!-- Remote classloading service -->
<bean class="org.jboss.services.binding.ServiceBinding">
<constructor>
@@ -88,7 +88,7 @@
</bean>
<!-- ********************* deploy/remoting-service.xml ****************** -->
-
+
<!-- RMI/JRMP invoker -->
<bean class="org.jboss.services.binding.ServiceBinding">
<constructor>
@@ -128,7 +128,7 @@
</bean>
<!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
-
+
<!-- HA RMI/JRMP invoker -->
<bean class="org.jboss.services.binding.ServiceBinding">
<constructor>
@@ -191,18 +191,18 @@
<!-- EJB3 wants to have the service create its own ServiceBinding object
dynamically. See the value-factory usage in deploy/ejb3-connectors-service.xml -->
-
+
<!-- ********************* deploy/jbossweb.sar **************** -->
<!-- ********************* deploy/httpha-invoker.sar **************** -->
<!--
- JBoss Web server.xml configuration.
+ JBoss Web server.xml configuration.
Same binding config can be used by the following services, or really
anything else that needs to point to the JBoss Web HTTP connector
but doesn't need an XSL Transform
-
+
jboss:service=invoker,type=http
jboss:service=invoker,type=http,target=Naming
jboss:service=invoker,type=http,target=Naming,readonly=true
@@ -216,10 +216,10 @@
<parameter>${jboss.bind.address}</parameter>
<parameter>8080</parameter>
</constructor>
-
- <!--
+
+ <!--
Inject a XSLT transform configuration (see below) that describes
- how to transform server.xml
+ how to transform server.xml
If the binding value request doesn't require an XSL Transform, this config
will be ignored.
-->
@@ -253,13 +253,36 @@
<!-- JBossTS Recovery Manager -->
<bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>TransactionManager</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4712</parameter>
- </constructor>
+ <constructor>
+ <parameter>TransactionManager</parameter>
+ <parameter>recoveryManager</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4712</parameter>
+ </constructor>
</bean>
+ <!-- JBossTS Transaction Status Manager -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>TransactionManager</parameter>
+ <parameter>transactionStatusManager</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4713</parameter>
+ </constructor>
+ </bean>
+
+ <!-- JBossTS SocketProcessId. The address part is ignored,
+ it will always use null/localhost/127.0.0.1. -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>TransactionManager</parameter>
+ <parameter>socketProcessId</parameter>
+ <parameter><null/></parameter>
+ <parameter>4714</parameter>
+ </constructor>
+ </bean>
+
+
<!-- ********************* deploy/hsqldb-ds.xml **************** -->
<!-- Commented out as tcp/ip access to Hypersonic is not enabled by default -->
@@ -274,9 +297,9 @@
-->
<!-- ********************* JBoss MQ **************** -->
-
+
<!-- Commented out as JBoss MQ is not installed by default
- If you uncomment this and also use jboss.mq:service=InvocationLayer,type=HTTP,
+ If you uncomment this and also use jboss.mq:service=InvocationLayer,type=HTTP,
configure the http invocation layer using the jboss.web:service=WebServer binding above
-->
<!--
@@ -290,13 +313,13 @@
-->
</set>
</parameter>
-
+
<!-- The port offset -->
<parameter>0</parameter>
<!-- Default host name -->
<parameter>${jboss.bind.address}</parameter>
</constructor>
-
+
</bean>
<!-- The ports-01 bindings are obtained by taking ports-default and adding 100 to each port value -->
@@ -326,11 +349,11 @@
<parameter>${jboss.bind.address}</parameter>
</constructor>
</bean>
-
-
+
+
<!-- Conversion of selected bindings into system properties -->
<bean name="SystemPropertyBinder" class="org.jboss.services.binding.SystemPropertyBinder">
-
+
<constructor>
<parameter>
<set>
@@ -347,11 +370,11 @@
</set>
</parameter>
</constructor>
-
+
</bean>
<!-- XSL Transform to apply to server.xml -->
- <bean name="JBossWebConnectorXSLTConfig"
+ <bean name="JBossWebConnectorXSLTConfig"
class="org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig">
<constructor>
Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2008-09-04 10:30:08 UTC (rev 77958)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2008-09-04 11:03:37 UTC (rev 77959)
@@ -7,6 +7,49 @@
<property name="transactionTimeout">300</property>
<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="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>
+ -->
</bean>
</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list