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

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

Author: thomas.diesler at jboss.com
Date: 2006-11-03 16:13:14 -0500 (Fri, 03 Nov 2006)
New Revision: 58093

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
Log:
set webapp context loader in WebMetaData

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2006-11-03 20:43:55 UTC (rev 58092)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2006-11-03 21:13:14 UTC (rev 58093)
@@ -42,7 +42,6 @@
 
 import org.apache.catalina.Loader;
 import org.apache.tomcat.util.modeler.Registry;
-import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.WebMetaData;
 import org.jboss.mx.util.MBeanServerLocator;
@@ -104,11 +103,11 @@
    }
 
    @Override
-   protected void performDeploy(WebApplication warInfo, String warUrl)
+   protected void performDeploy(WebApplication webApp, String warUrl)
          throws Exception
    {
-      warInfo.setDomain(config.getCatalinaDomain());
-      WebMetaData metaData = warInfo.getMetaData();
+      webApp.setDomain(config.getCatalinaDomain());
+      WebMetaData metaData = webApp.getMetaData();
       String hostName = null;
       // Get any jboss-web/virtual-hosts
       Iterator vhostNames = metaData.getVirtualHosts();
@@ -118,19 +117,19 @@
       {
          hostName = hostNames.next().toString();
       }
-      performDeployInternal(hostName, warInfo, warUrl);
+      performDeployInternal(hostName, webApp, warUrl);
       while (hostNames.hasNext())
       {
          String additionalHostName = hostNames.next().toString();
-         performDeployInternal(additionalHostName, warInfo, warUrl);
+         performDeployInternal(additionalHostName, webApp, warUrl);
       }
    }
 
    protected void performDeployInternal(String hostName,
-         WebApplication warInfo, String warUrl) throws Exception
+         WebApplication webApp, String warUrl) throws Exception
    {
 
-      WebMetaData metaData = warInfo.getMetaData();
+      WebMetaData metaData = webApp.getMetaData();
       String ctxPath = metaData.getContextRoot();
       if (ctxPath.equals("/") || ctxPath.equals("/ROOT") || ctxPath.equals(""))
       {
@@ -145,14 +144,14 @@
       URL url = new URL(warUrl);
 
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
-      // injectionContainer = new TomcatInjectionContainer(webAppParser,
-      // appInfo);
+      metaData.setContextLoader(loader);
+      
+      // injectionContainer = new TomcatInjectionContainer(webAppParser, appInfo);
       Loader webLoader = getWebLoader(loader, url);
+      webApp.setName(url.getPath());
+      webApp.setClassLoader(loader);
+      webApp.setURL(url);
 
-      warInfo.setName(url.getPath());
-      warInfo.setClassLoader(loader);
-      warInfo.setURL(url);
-
       String objectNameS = config.getCatalinaDomain() + ":j2eeType=WebModule,name=//"
             + ((hostName == null) ? "localhost" : hostName) + ctxPath
             + ",J2EEApplication=none,J2EEServer=none";
@@ -213,7 +212,7 @@
       }
 
       server.setAttribute(objectName, new Attribute("delegate", new Boolean(
-            warInfo.getJava2ClassLoadingCompliance())));
+            webApp.getJava2ClassLoadingCompliance())));
 
       String[] jspCP = getCompileClasspath(loader);
       StringBuffer classpath = new StringBuffer();
@@ -371,7 +370,7 @@
       }
       */
 
-      warInfo.setAppData(objectName);
+      webApp.setAppData(objectName);
 
       /*
        * TODO: Create mbeans for the servlets ObjectName servletQuery = new
@@ -410,7 +409,7 @@
          }
       }
 
-      log.debug("Initialized: " + warInfo + " " + objectName);
+      log.debug("Initialized: " + webApp + " " + objectName);
    }
 
    public Loader getWebLoader(ClassLoader loader, URL url)