svn commit: r983507 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java

[xu...@apache.org]

Author: xuhaihong
Date: Mon Aug  9 02:49:39 2010
New Revision: 983507

URL: http://svn.apache.org/viewvc?rev=983507&view=rev
Log:
GERONIMO-5410 Current solution is a bit different with what we do in the past, we never allow Tomcat evaluate the default web.xml in the past, so no servlet is added, then no InstanceManager is required.

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=983507&r1=983506&r2=983507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Mon Aug  9 02:49:39 2010
@@ -56,6 +56,7 @@ import org.apache.naming.resources.DirCo
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.j2ee.annotation.Holder;
 
 
 /**
@@ -182,6 +183,7 @@ public class TomcatContainer implements 
                     ctx.setJ2EEServer(objName == null ? "geronimo" : objName.getKeyProperty(NameFactory.J2EE_SERVER));
                     ctx.setJavaVMs(new String[]{});
                     ctx.setServer(objName == null ? "geronimo" : objName.getKeyProperty(NameFactory.J2EE_SERVER));
+                    ctx.setInstanceManager(new TomcatInstanceManager(new Holder(), classLoader, null));
                 }
                 host.addChild(defaultContext);
             }