geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1349091 - /geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
Date Tue, 12 Jun 2012 02:00:16 GMT
Author: xiaming
Date: Tue Jun 12 02:00:16 2012
New Revision: 1349091

URL: http://svn.apache.org/viewvc?rev=1349091&view=rev
Log:
GERONIMO-5882 Make sure the parent servlet configurations are visible in users' web.xml file,
patch provided by xiezhi

Modified:
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java

Modified: geronimo/server/branches/3.0-beta/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/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java?rev=1349091&r1=1349090&r2=1349091&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
Tue Jun 12 02:00:16 2012
@@ -77,6 +77,8 @@ public class WebAppInfoBuilder {
 
     private WebAppInfo webAppInfo;
 
+    private static final String TOMCAT_DEFAULT_SERVLET_NAME = "default";
+
     public WebAppInfoBuilder(WebApp webApp, WebAppInfoFactory webAppInfoFactory) {
         this.webApp = webApp;
         this.webAppInfoFactory = webAppInfoFactory;
@@ -246,7 +248,9 @@ public class WebAppInfoBuilder {
             String servletName = servletMapping.getServletName().trim();
             ServletInfo servletInfo = servletMap.get(servletName);
             if (servletInfo == null) {
-                problems.add("\nNo servlet matching servlet mappings for " + servletName);
+                if (!TOMCAT_DEFAULT_SERVLET_NAME.equals(servletName)) {
+                    problems.add("\nNo servlet matching servlet mappings for " + servletName);
+                }
             } else {
                 normalizeUrlPatterns(servletMapping.getUrlPattern(), servletInfo.servletMappings);
             }



Mime
View raw message