svn commit: r1006261 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/test/java/org/apache/maven/plugin/war/WarMojoTest.java

[dennisl]

Author: dennisl
Date: Sun Oct 10 09:20:28 2010
New Revision: 1006261

URL: http://svn.apache.org/viewvc?rev=1006261&view=rev
Log:
[MWAR-235] The web.xml file included twice into the result war
Submitted by: Michael Glauche
Reviewed by: Dennis Lundberg

o Added the submitted test case
o Updated to plexus-archiver 1.2

Modified:
    maven/plugins/trunk/maven-war-plugin/pom.xml
    
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1006261&r1=1006260&r2=1006261&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Oct 10 09:20:28 2010
@@ -98,7 +98,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0</version>
+      <version>1.2</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>

Modified: 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java?rev=1006261&r1=1006260&r2=1006261&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
 Sun Oct 10 09:20:28 2010
@@ -397,7 +397,8 @@ public class WarMojoTest
         while ( enumeration.hasMoreElements() )
         {
             entry = (JarEntry) enumeration.nextElement();
-            jarContent.put( entry.getName(), entry );
+            Object previousValue = jarContent.put( entry.getName(), entry );
+            assertNull( "Duplicate Entry in Jar File: " + entry.getName(), 
previousValue );
         }
 
         for ( int i = 0; i < files.length; i++ )