[jboss-cvs] JBossAS SVN: r57483 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6

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

Author: bill.burke at jboss.com
Date: 2006-10-06 17:28:52 -0400 (Fri, 06 Oct 2006)
New Revision: 57483

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/WarEjbResolver.java
Log:
jboss 5 ejb3 deployer

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-10-06 21:28:33 UTC (rev 57482)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-10-06 21:28:52 UTC (rev 57483)
@@ -24,9 +24,9 @@
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.EAR;
+import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.JmxDependencyPolicy;
-import org.jboss.ejb3.JmxEARImpl;
+import org.jboss.ejb3.JmxDeploymentScopeImpl;
 import org.jboss.ejb3.enc.DeploymentPersistenceUnitResolver;
 import org.jboss.ejb3.entity.PersistenceUnitDeployment;
 import org.jboss.injection.EncInjector;
@@ -140,7 +140,7 @@
          WebApplication appInfo, DeploymentInfo di)
    {
       this.di = di;
-      EAR ear = null;
+      DeploymentScope deploymentScope = null;
       this.parser = parser;
       this.appInfo = appInfo;
 
@@ -150,17 +150,17 @@
          {
             synchronized (di.parent.context)
             {
-               ear = (EAR) di.parent.context.get("EJB3_EAR_METADATA");
-               if (ear == null)
+               deploymentScope = (DeploymentScope) di.parent.context.get("EJB3_EAR_METADATA");
+               if (deploymentScope == null)
                {
-                  ear = new JmxEARImpl(di.parent.shortName);
-                  di.parent.context.put("EJB3_EAR_METADATA", ear);
+                  deploymentScope = new JmxDeploymentScopeImpl(di.parent.shortName);
+                  di.parent.context.put("EJB3_EAR_METADATA", deploymentScope);
                }
             }
          }
       }
-      persistenceUnitResolver = new DeploymentPersistenceUnitResolver(persistenceUnitDeployments, ear, ejbContainers);
-      ejbResolver = new WarEjbResolver(ear, di.shortName);
+      persistenceUnitResolver = new DeploymentPersistenceUnitResolver(persistenceUnitDeployments, deploymentScope, ejbContainers);
+      ejbResolver = new WarEjbResolver(deploymentScope, di.shortName);
    }
    
    public EnvironmentRefGroup getEnvironmentRefGroup()

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/WarEjbResolver.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/WarEjbResolver.java	2006-10-06 21:28:33 UTC (rev 57482)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/WarEjbResolver.java	2006-10-06 21:28:52 UTC (rev 57483)
@@ -23,7 +23,7 @@
 
 import org.jboss.ejb3.enc.DeploymentEjbResolver;
 import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.EAR;
+import org.jboss.ejb3.DeploymentScope;
 
 import javax.naming.NameNotFoundException;
 
@@ -35,9 +35,9 @@
  */
 public class WarEjbResolver extends DeploymentEjbResolver
 {
-   public WarEjbResolver(EAR ear, String errorName)
+   public WarEjbResolver(DeploymentScope deploymentScope, String errorName)
    {
-      super(ear, errorName);
+      super(deploymentScope, errorName);
    }
 
    protected EJBContainer searchDeploymentInternally(String ejbLink, Class businessIntf)