From scm-return-40681-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Tue Mar 02 21:05:15 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 60347 invoked from network); 2 Mar 2010 21:05:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Mar 2010 21:05:15 -0000 Received: (qmail 90038 invoked by uid 500); 2 Mar 2010 21:05:10 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 90001 invoked by uid 500); 2 Mar 2010 21:05:10 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 89994 invoked by uid 99); 2 Mar 2010 21:05:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 21:05:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 21:05:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 64CE423889B6; Tue, 2 Mar 2010 21:04:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r918179 - in /geronimo/server/trunk/plugins/jetty8: geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/ geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/ geronimo-jetty8/src/main/java/org/apache/geronimo/jet... Date: Tue, 02 Mar 2010 21:04:46 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100302210446.64CE423889B6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Tue Mar 2 21:04:45 2010 New Revision: 918179 URL: http://svn.apache.org/viewvc?rev=918179&view=rev Log: revert most of 918095. it's causing some other problems with filters. Removed: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextManager.java Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=918179&r1=918178&r2=918179&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Tue Mar 2 21:04:45 2010 @@ -449,13 +449,6 @@ webModuleData.setAttribute("displayName", webApp.getDisplayNameArray()[0].getStringValue()); } - // setup context manager - AbstractName contextManagerName = - moduleContext.getNaming().createChildName(moduleName, "WebAppContextManager", NameFactory.SERVICE_MODULE); - GBeanData contextManager = new GBeanData(contextManagerName, WebAppContextManager.class); - contextManager.setReferencePattern("webApp", moduleName); - moduleContext.addGBean(contextManager); - // configure context parameters. configureContextParams(webApp, webModuleData); @@ -497,7 +490,7 @@ Map> servletMappings = new HashMap>(); if (jspServlet != null) { configureTagLibs(module, webApp, webModuleData, servletMappings, knownJspMappings, jspServlet.getServletName()); - GBeanData jspServletData = configureDefaultServlet(jspServlet, earContext, moduleName, knownJspMappings, contextManager); + GBeanData jspServletData = configureDefaultServlet(jspServlet, earContext, moduleName, knownJspMappings); knownServletMappings.addAll(knownJspMappings); module.getSharedContext().put(DEFAULT_JSP_SERVLET_KEY, jspServletData); } @@ -511,6 +504,7 @@ //be careful that the jsp servlet defaults don't override anything configured in the app. if (jspServlet != null) { + //TODO rfc 66 make sure this has classSource set GBeanData jspServletData = (GBeanData) module.getSharedContext().get(DEFAULT_JSP_SERVLET_KEY); Set jspMappings = (Set) jspServletData.getAttribute("servletMappings"); jspMappings.removeAll(knownServletMappings); @@ -559,12 +553,12 @@ //add default servlets if (defaultServlets != null) { - addDefaultServletsGBeans(earContext, moduleContext, moduleName, knownServletMappings, contextManager); + addDefaultServletsGBeans(earContext, moduleContext, moduleName, knownServletMappings); } //set up servlet gbeans. ServletType[] servletTypes = webApp.getServletArray(); - addServlets(moduleName, webModule, servletTypes, servletMappings, moduleContext, contextManager); + addServlets(moduleName, webModule, servletTypes, servletMappings, moduleContext); if (jettyWebApp.isSetSecurityRealmName()) { configureSecurityRealm(earContext, webApp, jettyWebApp, webModuleData); @@ -627,14 +621,14 @@ earContext.addSecurityContext(policyContextID, componentPermissions); } - private void addDefaultServletsGBeans(EARContext earContext, EARContext moduleContext, AbstractName moduleName, Set knownServletMappings, GBeanData contextManager) throws GBeanNotFoundException, GBeanAlreadyExistsException { + private void addDefaultServletsGBeans(EARContext earContext, EARContext moduleContext, AbstractName moduleName, Set knownServletMappings) throws GBeanNotFoundException, GBeanAlreadyExistsException { for (Object defaultServlet : defaultServlets) { - GBeanData servletGBeanData = configureDefaultServlet(defaultServlet, earContext, moduleName, knownServletMappings, contextManager); + GBeanData servletGBeanData = configureDefaultServlet(defaultServlet, earContext, moduleName, knownServletMappings); moduleContext.addGBean(servletGBeanData); } } - private GBeanData configureDefaultServlet(Object defaultServlet, EARContext earContext, AbstractName moduleName, Set knownServletMappings, GBeanData contextManager) throws GBeanNotFoundException, GBeanAlreadyExistsException { + private GBeanData configureDefaultServlet(Object defaultServlet, EARContext earContext, AbstractName moduleName, Set knownServletMappings) throws GBeanNotFoundException, GBeanAlreadyExistsException { GBeanData servletGBeanData = getGBeanData(kernel, defaultServlet); AbstractName defaultServletObjectName = earContext.getNaming().createChildName(moduleName, (String) servletGBeanData.getAttribute("servletName"), NameFactory.SERVLET); servletGBeanData.setAbstractName(defaultServletObjectName); @@ -642,7 +636,6 @@ Set defaultServletMappings = new HashSet((Collection) servletGBeanData.getAttribute("servletMappings")); defaultServletMappings.removeAll(knownServletMappings); servletGBeanData.setAttribute("servletMappings", defaultServletMappings); - contextManager.addDependency(defaultServletObjectName); return servletGBeanData; } @@ -1036,8 +1029,7 @@ Module module, ServletType[] servletTypes, Map> servletMappings, - EARContext moduleContext, - GBeanData contextManager) throws DeploymentException { + EARContext moduleContext) throws DeploymentException { // this TreeSet will order the ServletTypes based on whether // they have a load-on-startup element and what its value is @@ -1059,7 +1051,6 @@ for (Object aLoadOrder : loadOrder) { ServletType servletType = (ServletType) aLoadOrder; previousServlet = addServlet(webModuleName, module, previousServlet, servletType, servletMappings, moduleContext); - contextManager.addDependency(previousServlet); } } @@ -1103,6 +1094,7 @@ servletData.setAttribute("servletClass", servletClassName); } else { servletData = new GBeanData(pojoWebServiceTemplate); + //TODO rfc 66 set classSource! servletData.setAbstractName(servletAbstractName); //let the web service builder deal with configuring the gbean with the web service stack // Object portInfo = portMap.get(servletName); @@ -1136,7 +1128,7 @@ if (null != previousServlet) { servletData.addDependency(previousServlet); } - + //TODO in init param setter, add classpath if jspFile is not null. servletData.setReferencePattern("JettyServletRegistration", webModuleName); servletData.setAttribute("servletName", servletName); Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java?rev=918179&r1=918178&r2=918179&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java Tue Mar 2 21:04:45 2010 @@ -70,7 +70,7 @@ @GBean(name="Jetty WebApplication Context", j2eeType=NameFactory.WEB_MODULE) -public class WebAppContextWrapper implements JettyServletRegistration, WebModule { +public class WebAppContextWrapper implements GBeanLifecycle, JettyServletRegistration, WebModule { private static final Logger log = LoggerFactory.getLogger(WebAppContextWrapper.class); public static final String GBEAN_ATTR_SESSION_TIMEOUT = "sessionTimeoutSeconds"; public static final String GBEAN_REF_SESSION_HANDLER_FACTORY = "SessionHandlerFactory"; @@ -302,17 +302,15 @@ } } } - + public void doStart() throws Exception { // reset the classsloader... jetty likes to set it to null when stopping - webAppContext.setClassLoader(webClassLoader); + this.webAppContext.setClassLoader(webClassLoader); jettyContainer.addContext(webAppContext); webAppContext.start(); - webAppContext.registerServletContext(); } public void doStop() throws Exception { - webAppContext.unregisterServletContext(); webAppContext.stop(); jettyContainer.removeContext(webAppContext); log.debug("WebAppContextWrapper stopped"); Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java?rev=918179&r1=918178&r2=918179&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java (original) +++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java Tue Mar 2 21:04:45 2010 @@ -79,24 +79,18 @@ integrationContext.restoreContext(context); integrationContext.completeTx(txActive, null); } - } - - public void registerServletContext() { // for OSGi Web Applications support register ServletContext in service registry Bundle bundle = integrationContext.getBundle(); if (WebApplicationUtils.isWebApplicationBundle(bundle)) { serviceRegistration = WebApplicationUtils.registerServletContext(bundle, getServletContext()); } } - - public void unregisterServletContext() { + + @Override + protected void doStop() throws Exception { if (serviceRegistration != null) { serviceRegistration.unregister(); } - } - - @Override - protected void doStop() throws Exception { javax.naming.Context context = integrationContext.setContext(); boolean txActive = integrationContext.isTxActive(); SharedConnectorInstanceContext newContext = integrationContext.newConnectorInstanceContext(null);