[jboss-cvs] JBossAS SVN: r73664 - in projects/ejb3/trunk/proxy: src/main/java/org/jboss/ejb3/proxy/handler/session/stateful and 1 other directories.

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

Author: ALRubinger
Date: 2008-05-25 00:30:32 -0400 (Sun, 25 May 2008)
New Revision: 73664

Modified:
   projects/ejb3/trunk/proxy/pom.xml
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateful/StatefulProxyInvocationHandler.java
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateless/StatelessProxyInvocationHandler.java
Log:
[EJBTHREE-1379] Get EJB3 Proxy off of MC Dependency, use EJB3 Registrar invocations instead

Modified: projects/ejb3/trunk/proxy/pom.xml
===================================================================
--- projects/ejb3/trunk/proxy/pom.xml	2008-05-25 04:25:50 UTC (rev 73663)
+++ projects/ejb3/trunk/proxy/pom.xml	2008-05-25 04:30:32 UTC (rev 73664)
@@ -130,28 +130,6 @@
       <scope>test</scope>
     </dependency>
     
-    
-    <!-- 
-    
-    Dependencies below this line must be removed
-    once Proxy is completely agnostic to 
-    the Object Store Provider
-    
-     -->
-    
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-kernel</artifactId>
-      <version>2.0.0.Beta13</version>
-    </dependency>
-    
-    <!-- MC doesn't declare this as a proper dependency -->
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-managed</artifactId>
-      <version>2.0.0.Beta10</version>
-    </dependency>
-    
   </dependencies>
 
 </project>

Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateful/StatefulProxyInvocationHandler.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateful/StatefulProxyInvocationHandler.java	2008-05-25 04:25:50 UTC (rev 73663)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateful/StatefulProxyInvocationHandler.java	2008-05-25 04:30:32 UTC (rev 73664)
@@ -34,8 +34,6 @@
 import org.jboss.ejb3.proxy.handler.session.SessionSpecProxyInvocationHandlerBase;
 import org.jboss.ejb3.proxy.intf.StatefulSessionProxy;
 import org.jboss.ejb3.proxy.lang.SerializableMethod;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelBus;
 import org.jboss.logging.Logger;
 import org.jboss.util.NotImplementedException;
 
@@ -119,12 +117,6 @@
                + nefdie.getMessage());
       }
 
-      // Obtain the correct container from MC
-      //TODO This won't fly for remote, MC would be on another Process
-      //TODO This breaks contract, so provide mechanism to invoke over commons Ejb3Registry
-      Kernel kernel = (Kernel)Ejb3RegistrarLocator.locateRegistrar().getProvider();
-      KernelBus bus = kernel.getBus();
-
       // Obtain container name
       String containerName = StringUtils.adjustWhitespaceStringToNull(this.getContainerName());
       assert containerName != null : "Container name for invocation must be specified";
@@ -139,10 +131,11 @@
       invocationArguments.add(args);
 
       // Invoke
-      log.debug("Invoking on MC Bean with name \"" + this.getContainerName() + "\" method \""
+      //TODO This won't fly for remote, Object Store would be on another Process
+      log.debug("Invoking on Bean with name \"" + this.getContainerName() + "\" method \""
             + InvokableContext.METHOD_NAME_INVOKE + "\" with arguments : " + invocationArguments);
-      return bus.invoke(this.getContainerName(), InvokableContext.METHOD_NAME_INVOKE, invocationArguments
-            .toArray(new Object[]
+      return Ejb3RegistrarLocator.locateRegistrar().invoke(this.getContainerName(),
+            InvokableContext.METHOD_NAME_INVOKE, invocationArguments.toArray(new Object[]
             {}), InvokableContext.METHOD_SIGNATURE_INVOKE);
 
    }

Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateless/StatelessProxyInvocationHandler.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateless/StatelessProxyInvocationHandler.java	2008-05-25 04:25:50 UTC (rev 73663)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/handler/session/stateless/StatelessProxyInvocationHandler.java	2008-05-25 04:30:32 UTC (rev 73664)
@@ -33,8 +33,6 @@
 import org.jboss.ejb3.proxy.handler.NotEligibleForDirectInvocationException;
 import org.jboss.ejb3.proxy.handler.session.SessionSpecProxyInvocationHandlerBase;
 import org.jboss.ejb3.proxy.lang.SerializableMethod;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelBus;
 import org.jboss.logging.Logger;
 import org.jboss.util.NotImplementedException;
 
@@ -101,12 +99,6 @@
                + nefdie.getMessage());
       }
 
-      // Obtain the correct container from MC
-      //TODO This won't fly for remote, MC would be on another Process
-      //TODO This breaks contract, so provide mechanism to invoke over commons Ejb3Registry
-      Kernel kernel = (Kernel)Ejb3RegistrarLocator.locateRegistrar().getProvider();
-      KernelBus bus = kernel.getBus();
-
       // Obtain container name
       String containerName = StringUtils.adjustWhitespaceStringToNull(this.getContainerName());
       assert containerName != null : "Container name for invocation must be specified";
@@ -121,10 +113,11 @@
       invocationArguments.add(args);
 
       // Invoke
-      log.debug("Invoking on MC Bean with name \"" + this.getContainerName() + "\" method \""
+      //TODO This won't fly for remote, Object Store would be on another Process
+      log.debug("Invoking on Bean with name \"" + this.getContainerName() + "\" method \""
             + InvokableContext.METHOD_NAME_INVOKE + "\" with arguments : " + invocationArguments);
-      return bus.invoke(this.getContainerName(), InvokableContext.METHOD_NAME_INVOKE, invocationArguments
-            .toArray(new Object[]
+      return Ejb3RegistrarLocator.locateRegistrar().invoke(this.getContainerName(),
+            InvokableContext.METHOD_NAME_INVOKE, invocationArguments.toArray(new Object[]
             {}), InvokableContext.METHOD_SIGNATURE_INVOKE);
 
    }