You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/12/25 19:53:13 UTC

svn commit: r1553407 - /tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java

Author: rmannibucau
Date: Wed Dec 25 18:53:13 2013
New Revision: 1553407

URL: http://svn.apache.org/r1553407
Log:
TOMEE-1099 war in ear are not named as the ear generally

Modified:
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1553407&r1=1553406&r2=1553407&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Wed Dec 25 18:53:13 2013
@@ -22,6 +22,7 @@ import org.apache.openejb.assembler.clas
 import org.apache.openejb.assembler.classic.Info;
 import org.apache.openejb.assembler.classic.ServletInfo;
 import org.apache.openejb.assembler.classic.WebAppInfo;
+import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.loader.Options;
 import org.apache.openejb.util.NetworkUtil;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
@@ -270,12 +271,16 @@ public abstract class TomEEContainer<Con
 
             String arquillianServlet;
             // Avoids "inconvertible types" error in windows build
-            if (archiveName.endsWith(".war") || (archiveName.endsWith(".ear") && appInfo.webApps.size() == 1)) {
-                arquillianServlet = "/" + getArchiveNameWithoutExtension(archive);
+            if (archiveName.endsWith(".war")) {
+                httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
+            } else if (archiveName.endsWith(".ear") && appInfo.webApps.size() > 0) {
+                for (final WebAppInfo web : appInfo.webApps) {
+                    httpContext.add(new Servlet("ArquillianServletRunner", "/" + web.contextRoot));
+                }
+                httpContext.add(new Servlet("ArquillianServletRunner", "/arquillian-protocol"));
             } else {
-                arquillianServlet = "/arquillian-protocol";
+                httpContext.add(new Servlet("ArquillianServletRunner", "/arquillian-protocol"));
             }
-            httpContext.add(new Servlet("ArquillianServletRunner", arquillianServlet));
             addServlets(httpContext, appInfo);
 
             return new ProtocolMetaData().addContext(httpContext);