svn commit: r1455741 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/core/ container/openejb-core/src/main/java/org/apache/openejb/web/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/

[rmannibucau]

Author: rmannibucau
Date: Tue Mar 12 22:51:33 2013
New Revision: 1455741

URL: http://svn.apache.org/r1455741
Log:
TOMEE-792 host is needed in webcontext

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java?rev=1455741&r1=1455740&r2=1455741&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
 Tue Mar 12 22:51:33 2013
@@ -45,6 +45,7 @@ public class WebContext {
     private Map<Object, CreationalContext<?>> creatonalContexts = new 
ConcurrentHashMap<Object, CreationalContext<?>>();
     private WebBeansContext webbeansContext;
     private String contextRoot;
+    private String host;
     private Context initialContext;
 
     public Context getInitialContext() {
@@ -57,6 +58,14 @@ public class WebContext {
         return initialContext;
     }
 
+    public void setHost(final String host) {
+        this.host = host;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
     public void setInitialContext(final Context initialContext) {
         this.initialContext = initialContext;
     }

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java?rev=1455741&r1=1455740&r2=1455741&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
 Tue Mar 12 22:51:33 2013
@@ -118,6 +118,7 @@ public class LightweightWebAppBuilder im
             webContext.setClassLoader(classLoader);
             webContext.setId(webAppInfo.moduleId);
             webContext.setContextRoot(webAppInfo.contextRoot);
+            webContext.setHost(webAppInfo.host);
             webContext.getInjections().addAll(injections);
             webContext.setInitialContext(new 
EmbeddedInitialContext(webContext.getJndiEnc(), webContext.getBindings()));
 

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1455741&r1=1455740&r2=1455741&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Tue Mar 12 22:51:33 2013
@@ -1261,6 +1261,7 @@ public class TomcatWebAppBuilder impleme
                 webContext.setClassLoader(classLoader);
                 webContext.setId(webAppInfo.moduleId);
                 webContext.setContextRoot(webAppInfo.contextRoot);
+                webContext.setHost(webAppInfo.host);
                 webContext.setBindings(bindings);
                 webContext.getInjections().addAll(injections);
                 appContext.getWebContexts().add(webContext);
@@ -1621,7 +1622,9 @@ public class TomcatWebAppBuilder impleme
             final String name = removeFirstSlashAndWar(web.getContextRoot());
             if (stdName.equals(name)) {
                 webBeansContext = web.getWebbeansContext();
-                break;
+                if 
(contextInfo.standardContext.getHostname().equals(web.getHost())) {
+                    break;
+                } // else loop hoping to find a better matching
             }
         }