[jboss-cvs] JBossAS SVN: r64421 - in trunk: ejb3/src/main/org/jboss/ejb3/javaee and 1 other directories.

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

Author: wolfc
Date: 2007-08-02 06:55:39 -0400 (Thu, 02 Aug 2007)
New Revision: 64421

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java
   trunk/ejb3/src/main/org/jboss/ejb3/JndiUtil.java
   trunk/ejb3/src/main/org/jboss/ejb3/javaee/SimpleJavaEEModule.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBCTS-636: CCE in TomcatInjectionContainer

Modified: trunk/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java	2007-08-02 06:06:04 UTC (rev 64420)
+++ trunk/ejb3/src/main/org/jboss/ejb3/JmxDependencyPolicy.java	2007-08-02 10:55:39 UTC (rev 64421)
@@ -32,6 +32,7 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
+ at Deprecated
 public class JmxDependencyPolicy implements DependencyPolicy
 {
    protected HashSet<ObjectName> dependencies = new HashSet<ObjectName>();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/JndiUtil.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/JndiUtil.java	2007-08-02 06:06:04 UTC (rev 64420)
+++ trunk/ejb3/src/main/org/jboss/ejb3/JndiUtil.java	2007-08-02 10:55:39 UTC (rev 64421)
@@ -46,6 +46,8 @@
       catch (NameNotFoundException e)
       {
          Context haCtx = InitialContextFactory.getHAContext(jndiContext);
+         if(haCtx == null)
+            throw e;
          object = haCtx.lookup(binding);
       }
       

Modified: trunk/ejb3/src/main/org/jboss/ejb3/javaee/SimpleJavaEEModule.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/javaee/SimpleJavaEEModule.java	2007-08-02 06:06:04 UTC (rev 64420)
+++ trunk/ejb3/src/main/org/jboss/ejb3/javaee/SimpleJavaEEModule.java	2007-08-02 10:55:39 UTC (rev 64421)
@@ -25,13 +25,18 @@
  * Comment
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
  */
 public class SimpleJavaEEModule implements JavaEEModule
 {
    private JavaEEApplication application;
    private String name;
    
+   public SimpleJavaEEModule(String moduleName)
+   {
+      this(null, moduleName);
+   }
+   
    public SimpleJavaEEModule(String applicationName, String moduleName)
    {
       assert moduleName != null : "moduleName is null";

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2007-08-02 06:06:04 UTC (rev 64420)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2007-08-02 10:55:39 UTC (rev 64421)
@@ -49,8 +49,11 @@
 import org.jboss.ejb3.DependencyPolicy;
 import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.JmxDependencyPolicy;
+import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
 import org.jboss.ejb3.enc.DeploymentPersistenceUnitResolver;
 import org.jboss.ejb3.entity.PersistenceUnitDeployment;
+import org.jboss.ejb3.javaee.AbstractJavaEEComponent;
+import org.jboss.ejb3.javaee.SimpleJavaEEModule;
 import org.jboss.injection.DependsHandler;
 import org.jboss.injection.EJBHandler;
 import org.jboss.injection.EncInjector;
@@ -83,7 +86,7 @@
  * @author adrian at jboss.org
  * @version $Revision: 1.17 $
  */
-public class TomcatInjectionContainer implements InjectionContainer, AnnotationProcessor
+public class TomcatInjectionContainer extends AbstractJavaEEComponent implements InjectionContainer, AnnotationProcessor
 {
    private static final Logger log = Logger.getLogger(TomcatInjectionContainer.class);
 
@@ -131,7 +134,7 @@
    protected LinkedHashMap ejbContainers = new LinkedHashMap(); // will always be empty.
    protected DeploymentPersistenceUnitResolver persistenceUnitResolver;
    protected WarEjbResolver ejbResolver;
-   protected DependencyPolicy dependencyPolicy = new JmxDependencyPolicy();
+   protected DependencyPolicy dependencyPolicy = new JBoss5DependencyPolicy(this);
    protected Collection<InjectionHandler> handlers;
    protected VFSDeploymentUnit unit;
    protected ClassLoader webLoader;
@@ -140,6 +143,8 @@
 
    public TomcatInjectionContainer(WebApplication appInfo, VFSDeploymentUnit unit, MainDeployerStructure mainDeployer)
    {
+      super(new SimpleJavaEEModule(appInfo.getName()));
+      
       this.unit = unit;
       DeploymentScope deploymentScope = null;
       this.appInfo = appInfo;