[jboss-cvs] JBossAS SVN: r58060 - branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule

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

Author: wolfc
Date: 2006-11-03 03:18:22 -0500 (Fri, 03 Nov 2006)
New Revision: 58060

Modified:
   branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
Log:
rollback 58008: clientmodule changes ended up in the wrong branch

Modified: branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2006-11-03 07:19:36 UTC (rev 58059)
+++ branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2006-11-03 08:18:22 UTC (rev 58060)
@@ -37,13 +37,13 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployment.DeploymentInfo;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.EAR;
 import org.jboss.ejb3.Ejb3Module;
-import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
-import org.jboss.ejb3.deployers.JBoss5DeploymentScope;
+import org.jboss.ejb3.JmxDependencyPolicy;
+import org.jboss.ejb3.JmxEARImpl;
 import org.jboss.ejb3.enc.DeploymentEjbResolver;
 import org.jboss.ejb3.entity.PersistenceUnitDeployment;
 import org.jboss.ejb3.metamodel.ApplicationClientDD;
@@ -89,9 +89,9 @@
    
    private DeploymentEjbResolver ejbResolver;
    private ObjectName objectName;
-   private DependencyPolicy dependencyPolicy = new JBoss5DependencyPolicy();
+   private DependencyPolicy dependencyPolicy = new JmxDependencyPolicy();
 
-   public ClientENCInjectionContainer(DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
+   public ClientENCInjectionContainer(DeploymentInfo di, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
    {
       if(mainClass == null)
          throw new NullPointerException("mainClass is mandatory");
@@ -109,7 +109,6 @@
       
       encEnv = Util.createSubcontext(enc, "env");
       
-      /*
       EAR ear = null;
 
       if (di.parent != null)
@@ -127,17 +126,9 @@
             }
          }
       }
-      */
+      ejbResolver = new ClientEjbResolver(ear, di.shortName);
       
-      DeploymentScope scope = null;
-      if (unit.getDeploymentContext().getParent() != null)
-      {
-         scope = new JBoss5DeploymentScope(unit.getDeploymentContext().getParent());
-      }
-      
-      ejbResolver = new ClientEjbResolver(scope, unit.getDeploymentContext().getRoot().getName());
-      
-      String on = Ejb3Module.BASE_EJB3_JMX_NAME + createScopeKernelName(unit, scope) + ",name=" + applicationClientName;
+      String on = Ejb3Module.BASE_EJB3_JMX_NAME + createScopeKernelName(di, ear) + ",name=" + applicationClientName;
       try
       {
          this.objectName = new ObjectName(on);
@@ -151,11 +142,11 @@
       processMetaData();
    }
    
-   private String createScopeKernelName(DeploymentUnit unit, DeploymentScope ear)
+   private String createScopeKernelName(DeploymentInfo di, EAR ear)
    {
       String scopedKernelName = "";
       if (ear != null) scopedKernelName += ",ear=" + ear.getShortName();
-      scopedKernelName += ",jar=" + unit.getDeploymentContext().getRoot().getName();
+      scopedKernelName += ",jar=" + di.shortName;
       return scopedKernelName;
    }
    

Modified: branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java
===================================================================
--- branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java	2006-11-03 07:19:36 UTC (rev 58059)
+++ branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientEjbResolver.java	2006-11-03 08:18:22 UTC (rev 58060)
@@ -23,8 +23,7 @@
 
 import javax.naming.NameNotFoundException;
 
-//import org.jboss.ejb3.EAR;
-import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.EAR;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.enc.DeploymentEjbResolver;
 
@@ -38,7 +37,7 @@
 public class ClientEjbResolver extends DeploymentEjbResolver
 {
 
-   protected ClientEjbResolver(DeploymentScope ear, String errorName)
+   protected ClientEjbResolver(EAR ear, String errorName)
    {
       super(ear, errorName);
    }