svn commit: r1392110 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

[rmannibucau]

Author: rmannibucau
Date: Sun Sep 30 21:19:04 2012
New Revision: 1392110

URL: http://svn.apache.org/viewvc?rev=1392110&view=rev
Log:
better handling of jndi: urls (bad file path construction)

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

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1392110&r1=1392109&r2=1392110&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 Sun Sep 30 21:19:04 2012
@@ -174,10 +174,21 @@ public class OpenEJBContextConfig extend
                 }
 
                 final String file = currentUrl.getFile();
-                final String webAppDir = new File(path).getName();
-                final int idx = file.indexOf(webAppDir);
+                String webAppDir = new File(path).getName();
+                int idx = file.indexOf(webAppDir);
+
+                // some more tries to manage context config (path can be 
different from context)
+                if (idx < 0) {
+                    webAppDir = webAppInfo.moduleId;
+                    idx = file.indexOf(webAppDir);
+                }
+                if (idx < 0) {
+                    webAppDir = webAppInfo.contextRoot;
+                    idx = file.indexOf(webAppDir);
+                }
+
                 if (idx > 0) {
-                    String pathUnderWebapp = path + file.substring(idx + 
webAppDir.length());
+                    String pathUnderWebapp = file.substring(idx + 
webAppDir.length());
                     if (!pathUnderWebapp.startsWith("/")) {
                         pathUnderWebapp = '/' + pathUnderWebapp;
                     }