geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1349092 - in /geronimo/server/branches/2.2: plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java pom.xml
Date Tue, 12 Jun 2012 02:03:56 GMT
Author: xiaming
Date: Tue Jun 12 02:03:55 2012
New Revision: 1349092

URL: http://svn.apache.org/viewvc?rev=1349092&view=rev
Log:
GERONIMO-5882 Fix jetty part issue, patch provided by xiezhi

Modified:
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
    geronimo/server/branches/2.2/pom.xml

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java?rev=1349092&r1=1349091&r2=1349092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
Tue Jun 12 02:03:55 2012
@@ -132,6 +132,7 @@ public class JettyModuleBuilder extends 
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String,
String>();
     private static final Map<String, ElementConverter> GERONIMO_SCHEMA_CONVERSIONS
= new HashMap<String, ElementConverter>();
     private static final String JASPI_NAMESPACE = "http://geronimo.apache.org/xml/ns/geronimo-jaspi";
+    private static final String TOMCAT_DEFAULT_SERVLET_NAME = "default";
 
     static {
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
@@ -737,9 +738,11 @@ public class JettyModuleBuilder extends 
         for (ServletMappingType servletMappingType : servletMappingArray) {
             String servletName = servletMappingType.getServletName().getStringValue().trim();
             if (!knownServlets.contains(servletName)) {
-                throw new DeploymentException("Web app " + module.getName() +
-                        " contains a servlet mapping that refers to servlet '" + servletName
+
-                        "' but no such servlet was found!");
+                if (!TOMCAT_DEFAULT_SERVLET_NAME.equals(servletName)) {
+                    throw new DeploymentException("Web app " + module.getName() +
+                            " contains a servlet mapping that refers to servlet '" + servletName
+
+                            "' but no such servlet was found!");
+                }
             }
             UrlPatternType[] urlPatterns = servletMappingType.getUrlPatternArray();
             addMappingsForServlet(servletName, urlPatterns, knownServletMappings, servletMappings);

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=1349092&r1=1349091&r2=1349092&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Tue Jun 12 02:03:55 2012
@@ -1873,8 +1873,8 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
-                    <version>1.0.1</version>
-                     <dependencies>
+                    <version>2.3</version>
+                     <!--<dependencies>
                         <dependency>
                             <groupId>org.seleniumhq.selenium.server</groupId>
                             <artifactId>selenium-server</artifactId>
@@ -1891,7 +1891,7 @@
                                 </exclusion>
                             </exclusions>
                         </dependency>
-                    </dependencies>
+                    </dependencies>-->
                 
                 </plugin>
 



Mime
View raw message