svn commit: r1204045 - /openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Sat Nov 19 19:12:37 2011
New Revision: 1204045

URL: http://svn.apache.org/viewvc?rev=1204045&view=rev
Log:
fixing contextroot in TomcatWebAppBuilder for windows

Modified:
    
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1204045&r1=1204044&r2=1204045&view=diff
==============================================================================
--- 
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Sat Nov 19 19:12:37 2011
@@ -280,10 +280,10 @@ public class TomcatWebAppBuilder impleme
             }
 
             if (standardContext.getPath() != null) {
-                webApp.contextRoot = 
standardContext.getPath().replaceFirst("/", "").replaceFirst(File.separator, 
"");
+                webApp.contextRoot = standardContext.getPath();
             }
-            if (webApp.contextRoot.startsWith("/")) {
-                webApp.contextRoot = webApp.contextRoot.replaceFirst("/", "");
+            if (webApp.contextRoot.startsWith("/") || 
webApp.contextRoot.startsWith(File.separator)) {
+                webApp.contextRoot = webApp.contextRoot.substring(1);
             }
             if (webApp.contextRoot.startsWith(File.separator)) {
                 webApp.contextRoot = 
webApp.contextRoot.replaceFirst(File.separator, "");