[jboss-cvs] JBossAS SVN: r66589 - trunk/tomcat/src/main/org/jboss/web/tomcat/service.

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

Author: scott.stark at jboss.org
Date: 2007-10-30 22:23:42 -0400 (Tue, 30 Oct 2007)
New Revision: 66589

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBAS-4929, need to use the JBossWebMetaData for the container injection

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2007-10-31 01:59:41 UTC (rev 66588)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2007-10-31 02:23:42 UTC (rev 66589)
@@ -64,12 +64,13 @@
 import org.jboss.injection.WebServiceRefHandler;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.FilterMetaData;
 import org.jboss.metadata.web.spec.FiltersMetaData;
 import org.jboss.metadata.web.spec.ListenerMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.metadata.web.spec.ServletsMetaData;
-import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.util.NotImplementedException;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.web.WebApplication;
@@ -135,7 +136,7 @@
    protected VFSDeploymentUnit unit;
    protected ClassLoader webLoader;
    protected WebApplication appInfo;
-   protected WebMetaData webDD;
+   protected JBossWebMetaData webDD;
    protected org.apache.catalina.Context catalinaContext;
 
    public TomcatInjectionContainer(WebApplication appInfo, VFSDeploymentUnit unit, org.apache.catalina.Context catalinaContext, MainDeployerStructure mainDeployer)
@@ -150,13 +151,13 @@
       persistenceUnitResolver = new DeploymentPersistenceUnitResolver(persistenceUnitDeployments, deploymentScope, ejbContainers);
       ejbResolver = new WarEjbResolver(deploymentScope, unit, mainDeployer);
       
-      this.webDD = unit.getAttachment(WebMetaData.class);
-      assert this.webDD != null : "webDD is null (no WebMetaData attachment in VFSDeploymentUnit)";
+      this.webDD = unit.getAttachment(JBossWebMetaData.class);
+      assert this.webDD != null : "webDD is null (no JBossWebMetaData attachment in VFSDeploymentUnit)";
    }
 
    public Environment getEnvironmentRefGroup()
    {
-      return webDD;
+      return webDD.getJndiEnvironmentRefsGroup();
    }
 
    public Object newInstance(String className) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
@@ -340,7 +341,7 @@
       try
       {
          for (InjectionHandler<Environment> handler : handlers)
-            handler.loadXml(webDD, this);
+            handler.loadXml(webDD.getJndiEnvironmentRefsGroup(), this);
 
          processServlets(webDD.getServlets(), webLoader);
          processFilters(webDD.getFilters(), webLoader);
@@ -352,7 +353,7 @@
       }
    }
 
-   private void processServlets(ServletsMetaData servlets, ClassLoader webLoader)
+   private void processServlets(JBossServletsMetaData servlets, ClassLoader webLoader)
    {
       if(servlets == null) return;
       for (ServletMetaData servlet : servlets)