[jboss-cvs] JBossAS SVN: r59352 - in trunk/ejb3/src/main/org/jboss: ejb3/clientmodule ejb3/entity injection

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

Author: wolfc
Date: 2007-01-04 09:09:13 -0500 (Thu, 04 Jan 2007)
New Revision: 59352

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java
   trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
Log:
cleanup & logging

Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-01-04 14:08:00 UTC (rev 59351)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-01-04 14:09:13 UTC (rev 59352)
@@ -61,7 +61,6 @@
 import org.jboss.injection.WebServiceRefHandler;
 import org.jboss.logging.Logger;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.naming.Util;
 
 /**
  * This class builds up the java:comp namespace for JavaEE 5 application clients.
@@ -85,7 +84,6 @@
    private Map<String, EncInjector> encInjectors = new HashMap<String, EncInjector>();
    
    private Context enc;
-   private Context encEnv;
    
    private DeploymentEjbResolver ejbResolver;
    private ObjectName objectName;
@@ -107,8 +105,6 @@
       
       this.enc = encCtx;
       
-      encEnv = Util.createSubcontext(enc, "env");
-      
       /*
       EAR ear = null;
 

Modified: trunk/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java	2007-01-04 14:08:00 UTC (rev 59351)
+++ trunk/ejb3/src/main/org/jboss/ejb3/entity/InjectedEntityManagerFactory.java	2007-01-04 14:09:13 UTC (rev 59352)
@@ -28,7 +28,6 @@
 import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContextType;
 import org.jboss.ejb3.PersistenceUnitRegistry;
 
 /**
@@ -39,14 +38,17 @@
  */
 public class InjectedEntityManagerFactory implements EntityManagerFactory, Externalizable
 {
+   private static final long serialVersionUID = -3734435119658196788L;
+   
    private transient EntityManagerFactory delegate;
    private transient ManagedEntityManagerFactory managedFactory;
-   private String kernelName;
-
+   
    public InjectedEntityManagerFactory() {}
 
    public InjectedEntityManagerFactory(ManagedEntityManagerFactory managedFactory)
    {
+      assert managedFactory != null : "managedFactory is null";
+      
       this.delegate = managedFactory.getEntityManagerFactory();
       this.managedFactory = managedFactory;
    }

Modified: trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2007-01-04 14:08:00 UTC (rev 59351)
+++ trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2007-01-04 14:09:13 UTC (rev 59352)
@@ -61,6 +61,7 @@
       if (xml != null)
       {
          if (xml.getEjbLocalRefs() != null) loadEjbLocalXml(xml.getEjbLocalRefs(), container);
+         log.trace("ejbRefs = " + xml.getEjbRefs());
          if (xml.getEjbRefs() != null) loadEjbRefXml(xml.getEjbRefs(), container);
       }
    }