[jboss-cvs] JBossAS SVN: r63116 - in trunk/ejb3/src/main/org/jboss: injection and 1 other directory.

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

Author: wolfc
Date: 2007-05-17 09:33:21 -0400 (Thu, 17 May 2007)
New Revision: 63116

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
Log:
EJBTHREE-967: binding and injecting ORB

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-05-17 13:30:30 UTC (rev 63115)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-05-17 13:33:21 UTC (rev 63116)
@@ -37,7 +37,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -48,6 +47,7 @@
 import javax.management.ObjectName;
 import javax.naming.Context;
 import javax.naming.InitialContext;
+import javax.naming.LinkRef;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
@@ -56,9 +56,7 @@
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.ClassContainer;
 import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.AspectDefinition;
 import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.advice.Scope;
 import org.jboss.aop.annotation.AnnotationElement;
 import org.jboss.aop.joinpoint.ConstructorInvocation;
 import org.jboss.aop.util.MethodHashing;
@@ -72,6 +70,7 @@
 import org.jboss.ejb3.security.JaccHelper;
 import org.jboss.ejb3.statistics.InvocationStatistics;
 import org.jboss.ejb3.tx.UserTransactionImpl;
+import org.jboss.iiop.CorbaORBService;
 import org.jboss.injection.DependsHandler;
 import org.jboss.injection.EJBHandler;
 import org.jboss.injection.EncInjector;
@@ -85,14 +84,14 @@
 import org.jboss.injection.ResourceHandler;
 import org.jboss.injection.WebServiceRefHandler;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.serviceref.ServiceRefDelegate;
+import org.jboss.metadata.serviceref.VirtualFileAdaptor;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.naming.Util;
+import org.jboss.util.StringPropertyReplacer;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.ws.integration.ServiceRefMetaData;
 import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.metadata.serviceref.ServiceRefDelegate;
-import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.util.StringPropertyReplacer;
 
 /**
  * Comment
@@ -209,9 +208,21 @@
       }
       this.interceptorRepository = interceptorRepository;
       this.interceptorRepository.addBeanClass(clazz.getName());
+      bindORB();
    }
 
-
+   private void bindORB()
+   {
+      try
+      {
+         Util.rebind(getEnc(), "ORB", new LinkRef("java:/" + CorbaORBService.ORB_NAME));
+      }
+      catch(NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
    public EjbEncFactory getEncFactory()
    {
       return encFactory;

Modified: trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-05-17 13:30:30 UTC (rev 63115)
+++ trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-05-17 13:33:21 UTC (rev 63116)
@@ -33,6 +33,7 @@
 import org.jboss.metamodel.descriptor.ResourceEnvRef;
 import org.jboss.metamodel.descriptor.ResourceRef;
 import org.jboss.reflect.plugins.ValueConvertor;
+import org.omg.CORBA.ORB;
 
 import javax.annotation.Resource;
 import javax.annotation.Resources;
@@ -450,6 +451,7 @@
       {
          type = ref.type();
       }
+      
       if (type.equals(UserTransaction.class))
       {
          injectors.put(accObj, new UserTransactionPropertyInjector(property, container));
@@ -517,9 +519,12 @@
 //                  mappedName = "java:/ConnectionFactory";
 //               }
 //               else
+               if(ORB.class.isAssignableFrom(type))
+                  mappedName = "java:comp/ORB";
+               else
                   throw new RuntimeException("You did not specify a @Resource.mappedName() on " + accObj + " and there is no binding for enc name " + encName + " in XML");
             }
-            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, ref.mappedName(), "@Resource"));
+            container.getEncInjectors().put(encName, new LinkRefEncInjector(encName, mappedName, "@Resource"));
          }
          injectors.put(accObj, new JndiPropertyInjector(property, encName, container.getEnc()));
       }