[jboss-cvs] JBossAS SVN: r109341 - in trunk: server/src/etc/deployers and 1 other directories.

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

Author: jaikiran
Date: 2010-11-15 11:24:46 -0500 (Mon, 15 Nov 2010)
New Revision: 109341

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
   trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBAS-8548 Enable ejb-local-ref, ejb-ref and @EJB resource providers

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-11-15 15:58:01 UTC (rev 109340)
+++ trunk/component-matrix/pom.xml	2010-11-15 16:24:46 UTC (rev 109341)
@@ -85,7 +85,7 @@
     <version.org.jboss.cluster.cache.ispn>1.0.0.CR7</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.depchain>1.0.0-alpha-18</version.org.jboss.ejb3.depchain>
+    <version.org.jboss.ejb3.depchain>1.0.0-alpha-19</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>
@@ -113,7 +113,7 @@
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.common>2.0.0.Alpha19</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-22</version.org.jboss.metadata.ejb>
+    <version.org.jboss.metadata.ejb>2.0.0-alpha-23</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.Alpha15</version.org.jboss.metadata.war>
     <version.org.jboss.mod_cluster>1.1.0.Final</version.org.jboss.mod_cluster>

Modified: trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml	2010-11-15 15:58:01 UTC (rev 109340)
+++ trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml	2010-11-15 16:24:46 UTC (rev 109341)
@@ -58,11 +58,9 @@
                 <inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
-                <!-- 
                 <inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
-                -->
                 <!-- Disabled till container themselves stop binding into java:comp 
                     <inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
                     <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>

Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml	2010-11-15 15:58:01 UTC (rev 109340)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml	2010-11-15 16:24:46 UTC (rev 109341)
@@ -54,11 +54,9 @@
                 <inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
-                <!-- 
                 <inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
-                -->
                 <!-- Disabled till container themselves stop binding into java:comp 
                     <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
                 -->

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2010-11-15 15:58:01 UTC (rev 109340)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2010-11-15 16:24:46 UTC (rev 109341)
@@ -72,7 +72,6 @@
 import org.jboss.reloaded.naming.spi.JavaEEComponent;
 import org.jboss.web.WebApplication;
 import org.jboss.web.tomcat.service.injection.TomcatInjectionUtils;
-import org.jboss.web.tomcat.service.injection.WebEJBHandler;
 
 /**
  * The TomcatInjectionContainer.
@@ -568,14 +567,6 @@
    {
       // TODO injection handlers should be pluggable from XML
       handlers = new ArrayList<InjectionHandler<Environment>>();
-      try {
-         InjectionHandler<Environment> webEjbHandler = new WebEJBHandler<Environment>(webDD, deploymentEndpointResolver, endpointMap, unit.getRelativePath());
-         handlers.add(webEjbHandler);
-      }
-      catch (NoClassDefFoundError e)
-      {
-         log.debug("EJB injection disabled", e);
-      }
       handlers.add(new DependsHandler<Environment>());
       try
       {
@@ -586,20 +577,6 @@
       {
          log.debug("JPA injection disabled", e);
       }
-      // Disable @Resource handler, since it's now handled by switchboard/jboss-injection
-      // combination
-      //handlers.add(new WebResourceHandler<Environment>());
-      
-      // Disable @WebServiceRef (service-ref) handler, since it's now handled by switchboard and jboss-injection
-      // combination
-//      try
-//      {
-//         handlers.add(new WebServiceRefInjectionHandler<Environment>());
-//      }
-//      catch (NoClassDefFoundError e)
-//      {
-//         log.debug("WS injection disabled", e);
-//      }
 
       ClassLoader old = Thread.currentThread().getContextClassLoader();
       ClassLoader webLoader = getClassloader();