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

[rmannibucau]

Author: rmannibucau
Date: Fri Oct 25 13:30:12 2013
New Revision: 1535727

URL: http://svn.apache.org/r1535727
Log:
TOMEE-1065 when ear has a single war using the war context for arquillian

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=1535727&r1=1535726&r2=1535727&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
 Fri Oct 25 13:30:12 2013
@@ -247,17 +247,18 @@ public abstract class TomEEContainer<Con
             }
 
             final AppInfo appInfo;
+            final String archiveName = archive.getName();
             try {
                 appInfo = deployer().deploy(file.getAbsolutePath());
                 if (appInfo != null) {
-                    moduleIds.put(archive.getName(), new 
DeployedApp(appInfo.path, file.getParentFile()));
+                    moduleIds.put(archiveName, new DeployedApp(appInfo.path, 
file.getParentFile()));
                     Files.deleteOnExit(file); // "i" folder
                 } else {
                     LOGGER.severe("appInfo was not found for " + 
file.getPath() + ", available are: " + apps());
                     throw new OpenEJBException("can't get appInfo");
                 }
             } catch (OpenEJBException re) { // clean up in undeploy needs it
-                moduleIds.put(archive.getName(), new 
DeployedApp(file.getPath(), file.getParentFile()));
+                moduleIds.put(archiveName, new DeployedApp(file.getPath(), 
file.getParentFile()));
                 throw re;
             }
 
@@ -269,7 +270,7 @@ public abstract class TomEEContainer<Con
 
             String arquillianServlet;
             // Avoids "inconvertible types" error in windows build
-            if (archive instanceof WebArchive) {
+            if (archiveName.endsWith(".war") || (archiveName.endsWith(".ear") 
&& appInfo.webApps.size() == 1)) {
                 arquillianServlet = "/" + 
getArchiveNameWithoutExtension(archive);
             } else {
                 arquillianServlet = "/arquillian-protocol";