[jboss-cvs] JBossAS SVN: r102302 - in trunk: server/src/etc/conf/all/bindingservice.beans/META-INF and 1 other directories.

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

Author: david.lloyd at jboss.com
Date: 2010-03-11 13:34:49 -0500 (Thu, 11 Mar 2010)
New Revision: 102302

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
   trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml
Log:
Use binding manager for Remoting config [JBAS-7802]

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-03-11 18:11:36 UTC (rev 102301)
+++ trunk/component-matrix/pom.xml	2010-03-11 18:34:49 UTC (rev 102302)
@@ -123,13 +123,13 @@
     <version.org.jboss.remoting3.metadata>1.0.0.Beta1</version.org.jboss.remoting3.metadata>
     <version.org.jboss.security>2.1.0.20091223</version.org.jboss.security>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
-    <version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
+    <version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
     <version.org.jboss.threads>2.0.0.CR3</version.org.jboss.threads>
     <version.org.jboss.vfs>3.0.0.CR3</version.org.jboss.vfs>
     <version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
-    <version.org.jboss.xnio.metadata>2.1.0.CR2</version.org.jboss.xnio.metadata>
+    <version.org.jboss.xnio.metadata>2.1.0.CR3</version.org.jboss.xnio.metadata>
     <version.org.slf4j>1.5.6</version.org.slf4j>
     <version.org.springframework>2.5.6</version.org.springframework>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>

Modified: trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml	2010-03-11 18:11:36 UTC (rev 102301)
+++ trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml	2010-03-11 18:34:49 UTC (rev 102302)
@@ -396,6 +396,22 @@
                <property name="description">UIL2 socket for JBossMQ</property>
             </bean>
             -->
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">Remoting</property>
+               <property name="bindingName">tcp</property>
+               <property name="port">5500</property>
+               <property name="hostName">${jboss.bind.address}</property>
+               <property name="description">The port used for clear/non-SSL Remoting connections</property>
+            </bean>
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">Remoting</property>
+               <property name="bindingName">tcp+ssl</property>
+               <property name="port">5501</property>
+               <property name="hostName">${jboss.bind.address}</property>
+               <property name="description">The port used for SSL (encrypted) Remoting connections</property>
+            </bean>
          </set>
          </parameter>
       </constructor>

Modified: trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml	2010-03-11 18:11:36 UTC (rev 102301)
+++ trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml	2010-03-11 18:34:49 UTC (rev 102302)
@@ -65,14 +65,14 @@
       <tcp-server name="RemotingTcpServer">
          <accept-listener name="RemotingTcpServerListener"/>
          <bind>
-            <bind-address address="${jboss.bind.address}" port="5500"/>
+            <managed-binding service="Remoting" binding="tcp" />
          </bind>
       </tcp-server>
 
       <ssl-tcp-server name="RemotingSslTcpServer">
          <accept-listener name="RemotingSslTcpServerListener"/>
          <bind>
-            <bind-address address="${jboss.bind.address}" port="5501"/>
+            <managed-binding service="Remoting" binding="tcp+ssl"/>
          </bind>
       </ssl-tcp-server>
    </xnio>