Author: dblevins Date: Sun May 31 01:09:15 2009 New Revision: 780356 URL: http://svn.apache.org/viewvc?rev=780356&view=rev Log: Merging r780175 - http://svn.apache.org/viewvc?rev=780175&view=rev
svn merge -r 780174:780175 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r780175 | dblevins | 2009-05-29 21:44:44 -0700 (Fri, 29 May 2009) | 2 lines Context paths are in URL syntax. ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.1/ (props changed) openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java Propchange: openejb/branches/openejb-3.1.1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 31 01:09:15 2009 @@ -1 +1 @@ -/openejb/trunk/openejb3:778585,778808,778810,779453-779454,779464,779466,780182 +/openejb/trunk/openejb3:778585,778808,778810,779453-779454,779464,779466,780175,780182 Modified: openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=780356&r1=780355&r2=780356&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java (original) +++ openejb/branches/openejb-3.1.1/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java Sun May 31 01:09:15 2009 @@ -59,7 +59,7 @@ contextRoot = contextRoot.substring(0, contextRoot.length() - ".war".length()); } } - if (contextRoot.startsWith(System.getProperty("file.separator"))) contextRoot = contextRoot.substring(1); + if (contextRoot.startsWith("/")) contextRoot = contextRoot.substring(1); this.contextRoot = contextRoot; this.classLoader = classLoader; this.jarLocation = jarLocation;
