svn commit: r1506406 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jul 24 06:32:14 2013
New Revision: 1506406

URL: http://svn.apache.org/r1506406
Log:
TOMEE-1007 consistency of warFile and context attribute of tomee maven plugin

Modified:
    
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1506406&r1=1506405&r2=1506406&view=diff
==============================================================================
--- 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 (original)
+++ 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 Wed Jul 24 06:32:14 2013
@@ -500,7 +500,7 @@ public abstract class AbstractTomEEMojo 
 
     protected String destinationName() {
         if (context != null) {
-            if (!context.contains(".")) {
+            if (!context.contains(".") && !warFile.isDirectory()) {
                 return context + "." + packaging;
             }
             return context;