[jboss-cvs] JBossAS SVN: r72613 - in trunk/ejb3/src: resources/META-INF and 1 other directories.

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

Author: jesper.pedersen
Date: 2008-04-23 04:48:22 -0400 (Wed, 23 Apr 2008)
New Revision: 72613

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
   trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
   trunk/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
Log:
[EJBTHREE-1304] Remove embedded from EJB3 core

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java	2008-04-23 08:42:45 UTC (rev 72612)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java	2008-04-23 08:48:22 UTC (rev 72613)
@@ -48,7 +48,6 @@
 import org.jboss.ejb3.DeploymentUnit;
 import org.jboss.ejb3.KernelAbstraction;
 import org.jboss.ejb3.MCDependencyPolicy;
-import org.jboss.ejb3.embedded.resource.RARDeployment;
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -215,21 +214,13 @@
       if (entry != null)
       {
          Object target = entry.getTarget();
-         if (target instanceof RARDeployment)
+         Class[] types = new Class[signature.length];
+         for (int i = 0; i < signature.length; ++i)
          {
-            RARDeployment deployment = (RARDeployment)target;
-            return deployment.invoke(operationName, params, signature);
-         } 
-         else
-         {
-            Class[] types = new Class[signature.length];
-            for (int i = 0; i < signature.length; ++i)
-            {
-               types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
-            }
-            Method method = target.getClass().getMethod(operationName, types);
-            return method.invoke(target, params);
+            types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
          }
+         Method method = target.getClass().getMethod(operationName, types);
+         return method.invoke(target, params);
       }
       return null;
    }

Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2008-04-23 08:42:45 UTC (rev 72612)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2008-04-23 08:48:22 UTC (rev 72613)
@@ -5,8 +5,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <!-- TODO this should be removed later on when ENC gets changed -->
-   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
    <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
 
    <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">

Modified: trunk/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml	2008-04-23 08:42:45 UTC (rev 72612)
+++ trunk/ejb3/src/resources/test-configs/statefulproxyfactoryoverride/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml	2008-04-23 08:48:22 UTC (rev 72613)
@@ -5,8 +5,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <!-- TODO this should be removed later on when ENC gets changed -->
-   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
    <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
 
    <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">