[jboss-cvs] JBossAS SVN: r78805 - projects/ejb3/trunk/core/src/main/resources/META-INF.

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

Author: ALRubinger
Date: 2008-09-24 01:52:31 -0400 (Wed, 24 Sep 2008)
New Revision: 78805

Modified:
   projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
Log:
[EJBTHREE-1502] Update EJB3 Core version of ejb3-deployers-jboss-beans to bring current

Modified: projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml	2008-09-24 05:48:56 UTC (rev 78804)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml	2008-09-24 05:52:31 UTC (rev 78805)
@@ -4,11 +4,34 @@
     EJB3 Deployers
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+
+   <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
+   
    <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
 
    <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
-      <property name="type">ejb3x</property>
+      <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+         </parameter>
+         <parameter>
+            <value>ejb3x</value>
+         </parameter>
+         <parameter>
+            <value>3.*</value>
+         </parameter>
+         <parameter>
+            <value>getEjbVersion</value>
+         </parameter>
+      </install>
+      <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+         </parameter>
+         <parameter>
+            <value>ejb3x</value>
+         </parameter>
+      </uninstall>
       <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
       <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
       <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
@@ -16,6 +39,8 @@
       <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
       <property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
       <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
+      <!-- Should war deployments be scanned for annotated ejbs -->
+      <property name="scanWars">false</property>
       
       <!-- 
    
@@ -116,27 +141,35 @@
    </bean>
    
    <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
-      <property name="type">car</property>
       <!-- TODO: check depends -->
       <depends>AspectLibrary</depends>
    </bean>
    
    <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
-      <property name="type">car</property>
       <depends>AppClientParsingDeployer</depends>
    </bean>
-   
-   <bean name="AppClientScanningDeployer" class="org.jboss.ejb3.deployers.AppClientScanningDeployer">
-      <depends>JBossClientParsingDeployer</depends>
+   <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
+      <depends>AppClientParsingDeployer</depends>
    </bean>
-   
+
    <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
-      <property name="type">car</property>
+      <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+         </parameter>
+         <parameter>
+            <value>car</value>
+         </parameter>
+      </install>
+      <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+         </parameter>
+      </uninstall>
       <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
       <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
       <!-- TODO: check depends -->
       <depends>AspectLibrary</depends>
-      <depends>AppClientScanningDeployer</depends>
    </bean>
    
    <!-- EJB3 Cache Factory Registry -->
@@ -227,27 +260,6 @@
             </entry>            
          </map>
       </property>
-      <property name="loadBalancePolicies">
-         <!-- Define each of the registered factories -->
-         <map class="java.util.HashMap" keyClass="java.lang.String"
-            valueClass="java.lang.Class">
-            <!-- RoundRobin -->
-            <entry>
-               <key>RoundRobin</key>
-               <value>org.jboss.ha.client.loadbalance.RoundRobin</value>
-            </entry>
-            <!-- RandomRobin -->
-            <entry>
-               <key>RandomRobin</key>
-               <value>org.jboss.ha.client.loadbalance.RandomRobin</value>
-            </entry>
-            <!-- FirstAvailable -->
-            <entry>
-               <key>FirstAvailable</key>
-               <value>org.jboss.ha.client.loadbalance.FirstAvailable</value>
-            </entry>
-         </map>
-      </property>
    </bean>
    
    <!-- EJB3 Persistence Manager Factory Registry -->
@@ -269,13 +281,26 @@
    
    <!-- Persistence Unit deployers -->
    <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
-      <property name="type">car</property>
-   </bean>
-   
+      <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+         </parameter>
+         <parameter>
+            <value>par</value>
+         </parameter>
+      </install>
+      <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+         </parameter>
+      </uninstall>
+   </bean>
+
    <!-- 
     
-    JNDI Registrars   
+    JNDI Registrars
     
+    
     The JNDI Registrar is responsible for all JNDI Bindings for
     an EJB.
     
@@ -299,8 +324,8 @@
         org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
       </parameter>
     </constructor>
-  </bean>
-
+  </bean>
+   
   <bean name="org.jboss.ejb3.ProxyClusteringRegistry"
         class="org.jboss.ejb3.proxy.clustered.registry.ProxyClusteringRegistry"/>
 
@@ -324,6 +349,5 @@
       </parameter>
       <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
     </constructor>
-  </bean>
-   
+  </bean>
 </deployment>