[jboss-cvs] JBossAS SVN: r77632 - in projects/ejb3/trunk/core/src: test/resources and 1 other directory.

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

Author: ALRubinger
Date: 2008-08-29 01:34:22 -0400 (Fri, 29 Aug 2008)
New Revision: 77632

Added:
   projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml
Removed:
   projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-service.xml
Modified:
   projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml
Log:
[EJBTHREE-1461][EJBTHREE-266] Convert EJB3 Remoting Connector to POJO-based declaration and provide integration w/ new SBM

Added: projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml	                        (rev 0)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml	2008-08-29 05:34:22 UTC (rev 77632)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+  EJB3 Connectors
+  
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- 
+    
+    JBoss Remoting Connector  
+    
+    Note: Bean Name "org.jboss.ejb3.RemotingConnector" is used
+    as a lookup value; alter only after checking java references
+    to this key.
+    
+  -->
+  <bean name="org.jboss.ejb3.RemotingConnector"
+    class="org.jboss.remoting.transport.Connector">
+
+    <property name="invokerLocator">
+
+      <value-factory bean="ServiceBindingManager"
+        method="getStringBinding">
+        <parameter>
+          jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3
+        </parameter>
+        <parameter>
+          <null />
+        </parameter>
+        <parameter>socket://${host}:${port}</parameter>
+        <parameter>
+          <null />
+        </parameter>
+        <parameter>3873</parameter>
+      </value-factory>
+
+    </property>
+    <property name="serverConfiguration">
+      <inject bean="ServerConfiguration" />
+    </property>
+  </bean>
+
+  <!-- Remoting Server Configuration -->
+  <bean name="ServerConfiguration"
+    class="org.jboss.remoting.ServerConfiguration">
+    <property name="invocationHandlers">
+      <map keyClass="java.lang.String" valueClass="java.lang.String">
+        <entry>
+          <key>AOP</key>
+          <value>
+            org.jboss.aspects.remoting.AOPRemotingInvocationHandler
+          </value>
+        </entry>
+      </map>
+    </property>
+  </bean>
+
+</deployment>
\ No newline at end of file

Deleted: projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-service.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-service.xml	2008-08-29 05:30:53 UTC (rev 77631)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-service.xml	2008-08-29 05:34:22 UTC (rev 77632)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   JBoss EJB3Deployer
-   
-   $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
--->
-<server>
-
-   <mbean code="org.jboss.remoting.transport.Connector"
-          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
-      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
-      <attribute name="Configuration">
-         <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-         </handlers>
-      </attribute>
-   </mbean>
-
-</server>

Modified: projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml	2008-08-29 05:30:53 UTC (rev 77631)
+++ projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml	2008-08-29 05:34:22 UTC (rev 77632)
@@ -181,7 +181,7 @@
       </property>
    </bean>
    
-   <bean name="Connector" class="org.jboss.remoting.transport.Connector">
+   <bean name="org.jboss.ejb3.RemotingConnector" class="org.jboss.remoting.transport.Connector">
       <property name="invokerLocator">socket://0.0.0.0:3875</property>
       <property name="serverConfiguration"><inject bean="ServerConfiguration"/></property>
    </bean>