geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1140382 - /geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Date Tue, 28 Jun 2011 00:04:13 GMT
Author: djencks
Date: Tue Jun 28 00:04:13 2011
New Revision: 1140382

URL: http://svn.apache.org/viewvc?rev=1140382&view=rev
Log:
GERONIMO-6025 missed a use of url patterns

Modified:
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java

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=1140382&r1=1140381&r2=1140382&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
Tue Jun 28 00:04:13 2011
@@ -191,11 +191,15 @@ public class JspModuleBuilderExtension i
                 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>();
+            List<String> problems = new ArrayList<String>();
             for (JspConfig jspConfig : jspConfigs) {
                 for (JspPropertyGroup propertyGroup : jspConfig.getJspPropertyGroup()) {
-                    WebAppInfoBuilder.normalizeUrlPatterns(propertyGroup.getUrlPattern(),
jspMappings);
+                    WebAppInfoBuilder.normalizeUrlPatterns(propertyGroup.getUrlPattern(),
jspMappings, problems);
                 }
             }
+            if (!problems.isEmpty()) {
+                throw new DeploymentException("Invalid url patterns: " + problems);
+            }
 
             jspServlet.servletMappings.addAll(jspMappings);
             for (ServletInfo servletInfo: webAppInfo.servlets) {



Mime
View raw message