svn commit: r769395 - in /openejb/trunk/openejb3/container/openejb-core/src: main/java/org/apache/openejb/config/WebModule.java test/java/org/apache/openejb/config/ConfigurationFactoryTest.java

[mnour]

Author: mnour
Date: Tue Apr 28 13:37:21 2009
New Revision: 769395

URL: http://svn.apache.org/viewvc?rev=769395&view=rev
Log:
OPENEJB-1022

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
    
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=769395&r1=769394&r2=769395&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java
 Tue Apr 28 13:37:21 2009
@@ -59,7 +59,7 @@
                 contextRoot = contextRoot.substring(0, contextRoot.length() - 
".war".length());
             }
         }
-        if (contextRoot.startsWith("/")) contextRoot = 
contextRoot.substring(1);
+        if (contextRoot.startsWith(System.getProperty("file.separator"))) 
contextRoot = contextRoot.substring(1);
         this.contextRoot = contextRoot;
         this.classLoader = classLoader;
         this.jarLocation = jarLocation;

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java?rev=769395&r1=769394&r2=769395&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java
 Tue Apr 28 13:37:21 2009
@@ -56,14 +56,16 @@
 
     @Test
     public void testConfigureApplicationWebModule() throws OpenEJBException {
+       final String moduleId = "testConfigureApplicationWebModule";
+       final String fileSeparator = System.getProperty("file.separator");
+       
         
SystemInstance.get().setProperty(ConfigurationFactory.VALIDATION_SKIP_PROPERTY, 
"false");
         
SystemInstance.get().setProperty(DeploymentsResolver.SEARCH_CLASSPATH_FOR_DEPLOYMENTS_PROPERTY,
 "false");
-        ConfigurationFactory factory = new ConfigurationFactory();
-        final String moduleId = "testConfigureApplicationWebModule";
+        ConfigurationFactory factory = new ConfigurationFactory();        
         WebApp webApp = new WebApp();
         // no real classes engaged so disable metadata (annotation) processing
         webApp.setMetadataComplete(true);
-        WebModule webModule = new WebModule(webApp, null, null, 
"/some/where.war", moduleId);
+        WebModule webModule = new WebModule(webApp, null, null, fileSeparator 
+ "some" + fileSeparator+ "where.war", moduleId);
         WebAppInfo info = factory.configureApplication(webModule);
         assertEquals(moduleId, info.moduleId);
     }