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

[rmannibucau]

Author: rmannibucau
Date: Tue Oct  2 06:11:28 2012
New Revision: 1392754

URL: http://svn.apache.org/viewvc?rev=1392754&view=rev
Log:
TOMEE-442 webapp id shouldnt contain the host (to respect standard jndi names)

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

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1392754&r1=1392753&r2=1392754&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Tue Oct  2 06:11:28 2012
@@ -1489,7 +1489,15 @@ public class TomcatWebAppBuilder impleme
     private AppModule loadApplication(final StandardContext standardContext) {
         final ServletContext servletContext = 
standardContext.getServletContext();
 
-        final TomcatDeploymentLoader tomcatDeploymentLoader = new 
TomcatDeploymentLoader(standardContext, getId(standardContext));
+        // don't use getId since the app id shouldnt get the host (jndi)
+        // final TomcatDeploymentLoader tomcatDeploymentLoader = new 
TomcatDeploymentLoader(standardContext, getId(standardContext));
+
+        String id = standardContext.getName();
+        if (id.startsWith("/")) {
+            id = id.substring(1);
+        }
+
+        final TomcatDeploymentLoader tomcatDeploymentLoader = new 
TomcatDeploymentLoader(standardContext, id);
         final AppModule appModule;
         try {
             appModule = tomcatDeploymentLoader.load(new 
File(servletContext.getRealPath(".")).getParentFile());