geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r483251 - in /geronimo/server/trunk: configs/jetty6-deployer/src/plan/ modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/ modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/
Date Wed, 06 Dec 2006 21:50:06 GMT
Author: djencks
Date: Wed Dec  6 13:50:05 2006
New Revision: 483251

URL: http://svn.apache.org/viewvc?view=rev&rev=483251
Log:
GERONIMO-2631 parameterize the jsp servlet class name

Modified:
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=483251&r1=483250&r2=483251
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Wed Dec  6 13:50:05 2006
@@ -24,6 +24,7 @@
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
+        <attribute name="jspServletClassName">org.apache.jasper.servlet.JspServlet</attribute>
         <references name="DefaultServlets">
             <pattern>
                 <name>StaticContent</name>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=483251&r1=483250&r2=483251
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Wed Dec  6 13:50:05 2006
@@ -137,12 +137,13 @@
     private final Integer defaultSessionTimeoutSeconds;
 
     private static final String JETTY_NAMESPACE = JettyWebAppDocument.type.getDocumentElementName().getNamespaceURI();
+    private String jspServletClassName;
 
     public JettyModuleBuilder(Environment defaultEnvironment,
             Integer defaultSessionTimeoutSeconds,
             List defaultWelcomeFiles,
             AbstractNameQuery jettyContainerName,
-            Collection defaultServlets,
+            String jspServletClassName, Collection defaultServlets,
             Collection defaultFilters,
             Collection defaultFilterMappings,
             Object pojoWebServiceTemplate,
@@ -157,6 +158,7 @@
         this.defaultEnvironment = defaultEnvironment;
         this.defaultSessionTimeoutSeconds = (defaultSessionTimeoutSeconds == null) ? new
Integer(30 * 60) : defaultSessionTimeoutSeconds;
         this.jettyContainerObjectName = jettyContainerName;
+        this.jspServletClassName = jspServletClassName;
         this.defaultServlets = defaultServlets;
         this.defaultFilters = defaultFilters;
         this.defaultFilterMappings = defaultFilterMappings;
@@ -979,7 +981,7 @@
             servletData = new GBeanData(servletAbstractName, JettyServletHolder.GBEAN_INFO);
             servletData.setAttribute("jspFile", servletType.getJspFile().getStringValue().trim());
             //TODO MAKE THIS CONFIGURABLE!!! Jetty uses the servlet mapping set up from the
default-web.xml
-            servletData.setAttribute("servletClass", "org.apache.jasper.servlet.JspServlet");
+            servletData.setAttribute("servletClass", jspServletClassName);
             initParams.put("development", "false");
         } else {
             throw new DeploymentException("Neither servlet class nor jsp file is set for
" + servletName); // TODO identify web app in message
@@ -1032,6 +1034,7 @@
         infoBuilder.addAttribute("defaultSessionTimeoutSeconds", Integer.class, true, true);
         infoBuilder.addAttribute("defaultWelcomeFiles", List.class, true, true);
         infoBuilder.addAttribute("jettyContainerObjectName", AbstractNameQuery.class, true,
true);
+        infoBuilder.addAttribute("jspServletClassName", String.class, true, true);
         infoBuilder.addReference("DefaultServlets", JettyDefaultServletHolder.class, NameFactory.SERVLET_TEMPLATE);
         infoBuilder.addReference("DefaultFilters", Object.class);
         infoBuilder.addReference("DefaultFilterMappings", Object.class);
@@ -1050,6 +1053,7 @@
                 "defaultSessionTimeoutSeconds",
                 "defaultWelcomeFiles",
                 "jettyContainerObjectName",
+                "jspServletClassName",
                 "DefaultServlets",
                 "DefaultFilters",
                 "DefaultFilterMappings",

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java?view=diff&rev=483251&r1=483250&r2=483251
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
Wed Dec  6 13:50:05 2006
@@ -269,7 +269,7 @@
                 new Integer(1800),
                 Collections.EMPTY_LIST,
                 new AbstractNameQuery(containerName),
-                defaultServlets,
+                null, defaultServlets,
                 defaultFilters,
                 defaultFilterMappings,
                 pojoWebServiceTemplate,

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java?view=diff&rev=483251&r1=483250&r2=483251
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java
Wed Dec  6 13:50:05 2006
@@ -5,11 +5,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.jar.JarFile;
 
-import javax.xml.namespace.QName;
-
 import org.apache.geronimo.deployment.util.UnpackedJarFile;
 import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
@@ -26,7 +23,6 @@
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
-import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.geronimo.testsupport.XmlBeansTestSupport;
 import org.apache.geronimo.web.deployment.GenericToSpecificPlanConverter;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
@@ -58,7 +54,7 @@
                 new Integer(1800),
                 null,
                 jettyContainerObjectName,
-                new HashSet(),
+                null, new HashSet(),
                 new HashSet(),
                 new HashSet(),
                 pojoWebServiceTemplate,



Mime
View raw message