[jboss-cvs] JBossAS SVN: r107997 - in trunk: component-matrix and 1 other directories.

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

Author: jaikiran
Date: 2010-09-06 09:05:24 -0400 (Mon, 06 Sep 2010)
New Revision: 107997

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
Log:
JBAS-8370 Upgrade to 1.0.0-alpha-4 of jboss-ejb3-as6-depchain to bring in the ejbref-resolver integration for EJBTHREE-2143

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-09-06 12:01:33 UTC (rev 107996)
+++ trunk/build/build.xml	2010-09-06 13:05:24 UTC (rev 107997)
@@ -2112,6 +2112,9 @@
       <fileset refid="org.jboss.ejb3.container:jboss-ejb3-container-spi:jar"/>
       <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
       <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-naming:jar"/>
+      <fileset refid="org.jboss.ejb3.ejbref.resolver:ejbref-resolver-spi:jar"/>
+      <fileset refid="org.jboss.ejb3.ejbref.resolver:ejbref-resolver-ejb30-impl:jar"/>      
+      <fileset refid="org.jboss.ejb3.ejbref.resolver:ejbref-resolver-ejb31-impl:jar"/>      
       <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-api:jar"/>
       <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-api-shrinkwrap:jar"/>
       <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-base:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-09-06 12:01:33 UTC (rev 107996)
+++ trunk/component-matrix/pom.xml	2010-09-06 13:05:24 UTC (rev 107997)
@@ -106,7 +106,7 @@
     <version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.depchain>1.0.0-alpha-3</version.org.jboss.ejb3.depchain>
+    <version.org.jboss.ejb3.depchain>1.0.0-alpha-4</version.org.jboss.ejb3.depchain>
     <!-- This to move into the EJB3 BOM -->
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -133,7 +133,7 @@
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.common>2.0.0.Alpha16</version.org.jboss.metadata.common>
     <version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
-    <version.org.jboss.metadata.ejb>2.0.0-alpha-17</version.org.jboss.metadata.ejb>
+    <version.org.jboss.metadata.ejb>2.0.0-alpha-18</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
     <version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>
     <version.org.jboss.mod_cluster>1.1.0.CR3</version.org.jboss.mod_cluster>

Modified: trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml	2010-09-06 12:01:33 UTC (rev 107996)
+++ trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml	2010-09-06 13:05:24 UTC (rev 107997)
@@ -300,5 +300,16 @@
       <property name="activateOnDemand">${jboss.as.deployment.ondemand:true}</property>
 
    </bean>
+   
+    <!-- EJB reference resolver based on the new org.jboss.ejb3.ejbref.resolver SPI -->
+    <bean name="org.jboss.ejb3.ejbref.resolver.EjbReferenceResolver" class="org.jboss.ejb3.ejbref.resolver.ejb31.impl.ScopedEJBReferenceResolver"/>
+   
+    <!-- Deprecated. This is here to make sure that any dependents (Weld, WS) of the outdated 
+        org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver interface or the org.jboss.ejb3.EjbReferenceResolver
+        MC bean name, don't fail.
+        TODO: Remove this once the dependents move to the new ejbref-resolver SPI  -->
+    <bean name="org.jboss.ejb3.EjbReferenceResolver" class="org.jboss.ejb3.core.resolvers.ScopedEJBReferenceResolver"/>
+  
+   
 
 </deployment>