You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/01/22 01:08:48 UTC

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

Author: gawor
Date: Fri Jan 22 00:08:47 2010
New Revision: 901934

URL: http://svn.apache.org/viewvc?rev=901934&view=rev
Log:
JspServletWrapper is looking for InstanceManager in ServletContext

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

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=901934&r1=901933&r2=901934&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Fri Jan 22 00:08:47 2010
@@ -61,6 +61,7 @@
 import org.apache.geronimo.webservices.POJOWebServiceServlet;
 import org.apache.geronimo.webservices.WebServiceContainer;
 import org.apache.geronimo.webservices.WebServiceContainerInvoker;
+import org.apache.tomcat.InstanceManager;
 import org.osgi.framework.Bundle;
 
 
@@ -121,6 +122,8 @@
             if (tctx.getSecurityHolder() != null) {
                 configurationFactory = tctx.getSecurityHolder().getConfigurationFactory();
             }
+            
+            getServletContext().setAttribute(InstanceManager.class.getName(), ctx.getInstanceManager());
         }
 
         int index = 0;