You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/07/15 00:24:05 UTC

svn commit: r556346 - /geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java

Author: djencks
Date: Sat Jul 14 15:24:04 2007
New Revision: 556346

URL: http://svn.apache.org/viewvc?view=rev&rev=556346
Log:
GERONIMO-3321 um, keep the default jsp mappings too along with all the weird explicit ones

Modified:
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java

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=556346&r1=556345&r2=556346
==============================================================================
--- 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 Sat Jul 14 15:24:04 2007
@@ -411,7 +411,9 @@
             if (jspServlet != null) {
                 configureTagLibs(module, webApp, webModuleData, servletMappings, knownServletMappings, jspServlet.getServletName());
                 GBeanData jspServletData = configureDefaultServlet(jspServlet, earContext, moduleName, knownServletMappings, moduleContext);
-                jspServletData.setAttribute("servletMappings", new HashSet<String>(knownServletMappings));
+                Set<String> jspMappings = (Set<String>) jspServletData.getAttribute("servletMappings");
+                jspMappings.addAll(knownServletMappings);
+                jspServletData.setAttribute("servletMappings", jspMappings);
             }
 
             // configure login configs.