geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r995287 - in /geronimo/server/trunk/plugins: j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/ jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/ jasper/geronimo-jasper-builde...
Date Thu, 09 Sep 2010 00:12:07 GMT
Author: djencks
Date: Thu Sep  9 00:12:07 2010
New Revision: 995287

URL: http://svn.apache.org/viewvc?rev=995287&view=rev
Log:
GERONIMO-5567 fix some more integration issues with Registration based web.xml processing.
 Functional but needs cleanup.

Added:
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
  (with props)
Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/DefaultWebAppInfoFactory.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/StandardWebAppInfoFactory.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoFactory.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
    geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/DefaultWebAppInfoFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/DefaultWebAppInfoFactory.java?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/DefaultWebAppInfoFactory.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/DefaultWebAppInfoFactory.java
Thu Sep  9 00:12:07 2010
@@ -51,4 +51,30 @@ public class DefaultWebAppInfoFactory im
     public ServletInfo newJspInfo(String jspFile) {
         throw new IllegalStateException("default does not support jsps");
     }
+
+    @Override
+    public ServletInfo copy(ServletInfo servletInfo) {
+         ServletInfo copy = new ServletInfo();
+         copy.servletClass = servletInfo.servletClass;
+         copy.servletMappings.addAll(servletInfo.servletMappings);
+         copy.servletName = servletInfo.servletName;
+         copy.asyncSupported = servletInfo.asyncSupported;
+         copy.initParams.putAll(servletInfo.initParams);
+         copy.loadOnStartup = servletInfo.loadOnStartup;
+         copy.runAsRole = servletInfo.runAsRole;
+         return copy;
+     }
+
+     @Override
+     public FilterInfo copy(FilterInfo filterInfo) {
+         FilterInfo copy = new FilterInfo();
+         copy.filterName = filterInfo.filterName;
+         copy.filterClass = filterInfo.filterClass;
+         copy.servletMappings.addAll(filterInfo.servletMappings);
+         copy.urlMappings.addAll(filterInfo.urlMappings);
+         copy.asyncSupported = filterInfo.asyncSupported;
+         copy.initParams.putAll(filterInfo.initParams);
+         return copy;
+     }
+    
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/StandardWebAppInfoFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/StandardWebAppInfoFactory.java?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/StandardWebAppInfoFactory.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/StandardWebAppInfoFactory.java
Thu Sep  9 00:12:07 2010
@@ -41,10 +41,10 @@ public class StandardWebAppInfoFactory e
 
     @Override
     public void complete(WebAppInfo webAppInfo) {
-        for (ServletInfo servletInfo: defaultWebAppInfo.servlets) {
+        for (ServletInfo servletInfo : defaultWebAppInfo.servlets) {
             webAppInfo.servlets.add(copy(servletInfo));
         }
-        for (FilterInfo filterInfo: defaultWebAppInfo.filters) {
+        for (FilterInfo filterInfo : defaultWebAppInfo.filters) {
             webAppInfo.filters.add(copy(filterInfo));
         }
         webAppInfo.listeners.addAll(defaultWebAppInfo.listeners);
@@ -59,26 +59,4 @@ public class StandardWebAppInfoFactory e
         return servletInfo;
     }
 
-    protected ServletInfo copy(ServletInfo servletInfo) {
-        ServletInfo copy = new ServletInfo();
-        copy.servletClass = servletInfo.servletClass;
-        copy.servletMappings.addAll(servletInfo.servletMappings);
-        copy.servletName = servletInfo.servletName;
-        copy.asyncSupported = servletInfo.asyncSupported;
-        copy.initParams.putAll(servletInfo.initParams);
-        copy.loadOnStartup = servletInfo.loadOnStartup;
-        copy.runAsRole = servletInfo.runAsRole;
-        return copy;
-    }
-
-    protected FilterInfo copy(FilterInfo filterInfo) {
-        FilterInfo copy = new FilterInfo();
-        copy.filterName = filterInfo.filterName;
-        copy.filterClass = filterInfo.filterClass;
-        copy.servletMappings.addAll(filterInfo.servletMappings);
-        copy.urlMappings.addAll(filterInfo.urlMappings);
-        copy.asyncSupported = filterInfo.asyncSupported;
-        copy.initParams.putAll(filterInfo.initParams);
-        return copy;
-    }
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
Thu Sep  9 00:12:07 2010
@@ -50,6 +50,7 @@ public class WebAppInfoBuilder {
 
     private final WebApp webApp;
     private final WebAppInfoFactory webAppInfoFactory;
+    private WebAppInfo webAppInfo;
 
     public WebAppInfoBuilder(WebApp webApp, WebAppInfoFactory webAppInfoFactory) {
         this.webApp = webApp;
@@ -57,17 +58,20 @@ public class WebAppInfoBuilder {
     }
 
     public WebAppInfo build() throws DeploymentException {
+        if (webAppInfo != null) {
+            throw new IllegalStateException("already built");
+        }
         List<String> problems = new ArrayList<String>();
         WebAppInfo webAppInfo = webAppInfoFactory.newWebAppInfo();
         addParams(webApp.getContextParam(), webAppInfo.contextParams);
         webAppInfo.contextRoot = webApp.getContextRoot();
 
-        for (Listener listener: webApp.getListener()) {
+        for (Listener listener : webApp.getListener()) {
             webAppInfo.listeners.add(listener.getListenerClass());
         }
 
         Map<String, ServletInfo> servletMap = new HashMap<String, ServletInfo>();
-        for (Servlet servlet: webApp.getServlet()) {
+        for (Servlet servlet : webApp.getServlet()) {
             ServletInfo servletInfo;
             if (servlet.getServletClass() != null) {
                 servletInfo = webAppInfoFactory.newServletInfo();
@@ -99,7 +103,7 @@ public class WebAppInfoBuilder {
             webAppInfo.servlets.add(servletInfo);
             servletMap.put(servletInfo.servletName, servletInfo);
         }
-        for (ServletMapping servletMapping: webApp.getServletMapping()) {
+        for (ServletMapping servletMapping : webApp.getServletMapping()) {
             String servletName = servletMapping.getServletName();
             ServletInfo servletInfo = servletMap.get(servletName);
             if (servletInfo == null) {
@@ -110,7 +114,7 @@ public class WebAppInfoBuilder {
         }
 
         Map<String, FilterInfo> filterMap = new HashMap<String, FilterInfo>();
-        for (Filter filter: webApp.getFilter()) {
+        for (Filter filter : webApp.getFilter()) {
             FilterInfo filterInfo = webAppInfoFactory.newFilterInfo();
             filterInfo.filterName = filter.getFilterName();
             filterInfo.filterClass = filter.getFilterClass();
@@ -119,7 +123,7 @@ public class WebAppInfoBuilder {
             webAppInfo.filters.add(filterInfo);
             filterMap.put(filterInfo.filterName, filterInfo);
         }
-        for (FilterMapping filterMapping: webApp.getFilterMapping()) {
+        for (FilterMapping filterMapping : webApp.getFilterMapping()) {
             String filterName = filterMapping.getFilterName();
             FilterInfo filterInfo = filterMap.get(filterName);
             if (filterInfo == null) {
@@ -145,11 +149,29 @@ public class WebAppInfoBuilder {
         if (!problems.isEmpty()) {
             throw new DeploymentException("Problems encountered parsing web.xml: " + problems);
         }
+        this.webAppInfo = webAppInfo;
+        return webAppInfo;
+    }
+
+    public WebApp getWebApp() {
+        return webApp;
+    }
+
+    public WebAppInfo getWebAppInfo() {
         return webAppInfo;
     }
 
+    public ServletInfo copy(ServletInfo servletInfo) {
+        return webAppInfoFactory.copy(servletInfo);
+    }
+
+    public FilterInfo copy(FilterInfo filterInfo) {
+        return webAppInfoFactory.copy(filterInfo);
+    }
+
+
     public static void normalizeUrlPatterns(List<String> source, List<String>
target) {
-        for (String pattern: source) {
+        for (String pattern : source) {
             pattern = pattern.trim();
             if (!pattern.startsWith("*") && !pattern.startsWith("/")) {
                 pattern = "/" + pattern;
@@ -160,7 +182,7 @@ public class WebAppInfoBuilder {
     }
 
     protected void addParams(List<ParamValue> params, Map<String, String> paramMap)
{
-        for (ParamValue paramValue: params) {
+        for (ParamValue paramValue : params) {
             if (!paramMap.containsKey(paramValue.getParamName())) {
                 paramMap.put(paramValue.getParamName(), paramValue.getParamValue());
             }
@@ -172,7 +194,7 @@ public class WebAppInfoBuilder {
             return EnumSet.of(DispatcherType.REQUEST);
         }
         List<DispatcherType> types = new ArrayList<DispatcherType>(dispatchers.size());
-        for (Dispatcher dispatcher: dispatchers) {
+        for (Dispatcher dispatcher : dispatchers) {
             types.add(toDispatcherType(dispatcher));
         }
         return EnumSet.copyOf(types);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoFactory.java?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoFactory.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoFactory.java
Thu Sep  9 00:12:07 2010
@@ -37,4 +37,7 @@ public interface WebAppInfoFactory {
 
     ServletInfo newJspInfo(String jspFile);
 
+    ServletInfo copy(ServletInfo servletInfo);
+
+    FilterInfo copy(FilterInfo filterInfo);
 }

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Thu Sep  9 00:12:07 2010
@@ -58,10 +58,13 @@ import org.apache.geronimo.kernel.GBeanA
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.web.info.ServletInfo;
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.geronimo.web25.deployment.AbstractWebModuleBuilder;
+import org.apache.geronimo.web25.deployment.WebAppInfoBuilder;
 import org.apache.openejb.jee.JaxbJavaee;
 import org.apache.openejb.jee.JspConfig;
+import org.apache.openejb.jee.JspPropertyGroup;
 import org.apache.openejb.jee.Listener;
 import org.apache.openejb.jee.Tag;
 import org.apache.openejb.jee.Taglib;
@@ -92,15 +95,21 @@ public class JspModuleBuilderExtension i
     private final Environment defaultEnvironment;
     private final NamingBuilder namingBuilders;
     private final Set<String> excludedListenerNames = new HashSet<String>();
+    private final ServletInfo defaultJspServletInfo;
 
     public JspModuleBuilderExtension(@ParamAttribute(name = "defaultEnvironment") Environment
defaultEnvironment,
                                      @ParamAttribute(name = "excludedListenerNames") Collection<String>
excludedListenerNames,
+                                     @ParamAttribute(name = "defaultJspServlet") WebAppInfo
defaultJspServlet,
                                      @ParamReference(name = "NamingBuilders", namingType
= NameFactory.MODULE_BUILDER) NamingBuilder namingBuilders) {
         this.defaultEnvironment = defaultEnvironment;
         this.namingBuilders = namingBuilders;
         if (excludedListenerNames != null) {
             this.excludedListenerNames.addAll(excludedListenerNames);
         }
+        if (defaultJspServlet == null || defaultJspServlet.servlets.size() != 1) {
+            throw new IllegalArgumentException("Must supply exactly one default jsp servlet");
+        }
+        defaultJspServletInfo = defaultJspServlet.servlets.get(0);
     }
 
     public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder
idBuilder) throws DeploymentException {
@@ -168,9 +177,27 @@ public class JspModuleBuilderExtension i
             webAppData.setReferencePattern("ContextCustomizer", jspLifecycleName);
         }
 
-        WebAppInfo webAppInfo = (WebAppInfo)sharedContext.get(WebModule.WEB_APP_INFO);
-        if (webAppInfo != null) {
+        WebAppInfoBuilder webAppInfoBuilder = (WebAppInfoBuilder)sharedContext.get(WebModule.WEB_APP_INFO);
+        if (webAppInfoBuilder != null) {
+            WebAppInfo webAppInfo = webAppInfoBuilder.getWebAppInfo();
             webAppInfo.listeners.addAll(listenerNames);
+            //install default jsp servlet....
+            ServletInfo jspServlet = webAppInfoBuilder.copy(defaultJspServletInfo);
+            List<JspConfig> jspConfigs = webApp.getJspConfig();
+            if (jspConfigs.size() > 1) {
+                throw new DeploymentException("Web app " + module.getName() + " cannot have
more than one jsp-config element.  Currently has " + jspConfigs.size() + " jsp-config elements.");
+            }
+            List<String> jspMappings = new ArrayList<String>();
+            for (JspConfig jspConfig : jspConfigs) {
+                for (JspPropertyGroup propertyGroup : jspConfig.getJspPropertyGroup()) {
+                    WebAppInfoBuilder.normalizeUrlPatterns(propertyGroup.getUrlPattern(),
jspMappings);
+                }
+            }
+            jspServlet.servletMappings.addAll(jspMappings);
+            for (ServletInfo servletInfo: webAppInfo.servlets) {
+                servletInfo.servletMappings.removeAll(jspMappings);
+            }
+            webAppInfo.servlets.add(jspServlet);
         } else {
             GBeanData jspServletData = AbstractWebModuleBuilder.DEFAULT_JSP_SERVLET_KEY.get(sharedContext);
             if (jspServletData != null) {

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
Thu Sep  9 00:12:07 2010
@@ -24,14 +24,18 @@ import java.util.Collections;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
+import org.apache.geronimo.web.info.ServletInfo;
+import org.apache.geronimo.web.info.WebAppInfo;
 
 /**
  * @version $Rev$ $Date$
  */
 public class BasicTest extends TestCase {
     
-    public void testMyFacesModuleBuilderExtension() throws Exception {
-        JspModuleBuilderExtension instance = new JspModuleBuilderExtension(null, null, new
NamingBuilderCollection(Collections.EMPTY_SET));
+    public void testJspModuleBuilderExtension() throws Exception {
+        WebAppInfo webAppInfo = new WebAppInfo();
+        webAppInfo.servlets.add(new ServletInfo());
+        JspModuleBuilderExtension instance = new JspModuleBuilderExtension(null, null, webAppInfo,
new NamingBuilderCollection(Collections.EMPTY_SET));
     }
 
 }

Added: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java?rev=995287&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
(added)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
Thu Sep  9 00:12:07 2010
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.jasper;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.jasper.Constants;
+import org.apache.jasper.servlet.JspServlet;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JspFileServlet extends JspServlet {
+
+    private String jspFile;
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+        jspFile = config.getInitParameter("jspFile");
+        if (jspFile == null) {
+            throw new ServletException("Must supply jspFile init param");
+        }
+    }
+
+    @Override
+    public void service(HttpServletRequest request, HttpServletResponse response) throws
ServletException, IOException {
+        request.setAttribute(Constants.JSP_FILE, jspFile);
+        try {
+            super.service(request, response);
+        } finally {
+            request.removeAttribute(Constants.JSP_FILE);
+        }
+    }
+}

Propchange: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspFileServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Thu Sep  9 00:12:07 2010
@@ -63,6 +63,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>
+                    </deploymentConfigs>
                     <category>JavaEE deployment</category>
                     <dependencies>
                         <dependency>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/plan/plan.xml?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/plan/plan.xml Thu Sep  9
00:12:07 2010
@@ -25,6 +25,44 @@
         <reference name="NamingBuilders">
             <name>NamingBuilders</name>
         </reference>
+        <xml-attribute name="defaultJspServlet">
+            <web-app xmlns="http://java.sun.com/xml/ns/javaee">
+
+                <servlet>
+                     <servlet-name>jsp</servlet-name>
+                     <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+                     <init-param>
+                         <param-name>development</param-name>
+                         <param-value>false</param-value>
+                     </init-param>
+                     <init-param>
+                         <param-name>fork</param-name>
+                         <param-value>false</param-value>
+                     </init-param>
+                     <init-param>
+                         <param-name>logVerbosityLevel</param-name>
+                         <param-value>DEBUG</param-value>
+                     </init-param>
+                     <init-param>
+                         <param-name>xpoweredBy</param-name>
+                         <param-value>false</param-value>
+                     </init-param>
+                     <init-param>
+                         <param-name>engineOptionsClass</param-name>
+                         <param-value>org.apache.geronimo.jasper.JspServletOptions</param-value>
+                     </init-param>
+                     <load-on-startup>0</load-on-startup>
+                 </servlet>
+                 <servlet-mapping>
+                     <servlet-name>jsp</servlet-name>
+                     <url-pattern>*.jsp</url-pattern>
+                     <url-pattern>*.jspf</url-pattern>
+                     <url-pattern>*.jspx</url-pattern>
+                     <url-pattern>*.xsp</url-pattern>
+                 </servlet-mapping>
+
+            </web-app>
+        </xml-attribute>
     </gbean>
 
 </module>

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=995287&r1=995286&r2=995287&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
Thu Sep  9 00:12:07 2010
@@ -550,7 +550,7 @@ public class JettyModuleBuilder extends 
 
             webModuleData.setAttribute("webAppInfo", webAppInfo);
 
-            webModule.getSharedContext().put(WebModule.WEB_APP_INFO, webAppInfo);
+            webModule.getSharedContext().put(WebModule.WEB_APP_INFO, webAppInfoBuilder);
 
 //            configure context parameters.
 //            configureContextParams(webApp, webModuleData);
@@ -588,15 +588,15 @@ public class JettyModuleBuilder extends 
             configureErrorPages(webApp, webModuleData);
 
             // configure tag libs.
-            if (defaultJspServletName != null) {
-                for (ServletInfo servletInfo: webAppInfo.servlets) {
-                    if (defaultJspServletName.equals(servletInfo.servletName)) {
-                        configureTagLibs(module, webApp, webModuleData, servletInfo);
-                    }
-                }
-//                GBeanData jspServletData = configureDefaultServlet(jspServlet, earContext,
moduleName, knownJspMappings);
-//                module.getSharedContext().put(DEFAULT_JSP_SERVLET_KEY, jspServletData);
-            }
+//            if (defaultJspServletName != null) {
+//                for (ServletInfo servletInfo: webAppInfo.servlets) {
+//                    if (defaultJspServletName.equals(servletInfo.servletName)) {
+//                        configureTagLibs(module, webApp, webModuleData, servletInfo);
+//                    }
+//                }
+////                GBeanData jspServletData = configureDefaultServlet(jspServlet, earContext,
moduleName, knownJspMappings);
+////                module.getSharedContext().put(DEFAULT_JSP_SERVLET_KEY, jspServletData);
+//            }
 
             // configure login configs.
             configureAuthentication(module, webApp, jettyWebApp, webModuleData);

Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
Thu Sep  9 00:12:07 2010
@@ -26,4 +26,29 @@
         <artifactId>geronimo-jetty8-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jacc_1.4_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-locator</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml?rev=995287&r1=995286&r2=995287&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml Thu Sep  9
00:12:07 2010
@@ -104,45 +104,12 @@
                     <url-pattern>/</url-pattern>
                 </servlet-mapping>
 
-                <servlet>
-                     <servlet-name>jsp</servlet-name>
-                     <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-                     <init-param>
-                         <param-name>development</param-name>
-                         <param-value>false</param-value>
-                     </init-param>
-                     <init-param>
-                         <param-name>fork</param-name>
-                         <param-value>false</param-value>
-                     </init-param>
-                     <init-param>
-                         <param-name>logVerbosityLevel</param-name>
-                         <param-value>DEBUG</param-value>
-                     </init-param>
-                     <init-param>
-                         <param-name>xpoweredBy</param-name>
-                         <param-value>false</param-value>
-                     </init-param>
-                     <init-param>
-                         <param-name>engineOptionsClass</param-name>
-                         <param-value>org.apache.geronimo.jasper.JspServletOptions</param-value>
-                     </init-param>
-                     <load-on-startup>0</load-on-startup>
-                 </servlet>
-                 <servlet-mapping>
-                     <servlet-name>jsp</servlet-name>
-                     <url-pattern>*.jsp</url-pattern>
-                     <url-pattern>*.jspf</url-pattern>
-                     <url-pattern>*.jspx</url-pattern>
-                     <url-pattern>*.xsp</url-pattern>
-                 </servlet-mapping>
-
             </web-app>
         </xml-attribute>
         <xml-attribute name="jspServlet">
             <web-app xmlns="http://java.sun.com/xml/ns/javaee">
                 <servlet>
-                    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+                    <servlet-class>org.apache.geronimo.jasper.JspFileServlet</servlet-class>
                     <init-param>
                         <param-name>development</param-name>
                         <param-value>false</param-value>



Mime
View raw message