You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2006/09/27 16:05:27 UTC

svn commit: r450445 - /geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java

Author: gdamour
Date: Wed Sep 27 07:05:26 2006
New Revision: 450445

URL: http://svn.apache.org/viewvc?view=rev&rev=450445
Log:
Minor bug fix: Jetty 5 was automatically prepending the contextPath with
a '/' if it was not already there. Jetty 6 does not do that automatically.
In the case of a standalone deployment, the contextPath is not prepended
with a '/' and when trying to start the WebAppContext, a MalformedURLException
is thrown when getURLFor is called.

Modified:
    geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?view=diff&rev=450445&r1=450444&r2=450445
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Wed Sep 27 07:05:26 2006
@@ -190,7 +190,7 @@
 
         if (isStandAlone) {
             // default configId is based on the moduleFile name
-            return trimPath(new File(moduleFile.getName()).getName());
+            return "/" + trimPath(new File(moduleFile.getName()).getName());
         }
 
         // default configId is based on the module uri from the application.xml