svn commit: r1391186 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: AbstractWarMojo.java WarMojo.java

[krosenvold]

Author: krosenvold
Date: Thu Sep 27 19:36:49 2012
New Revision: 1391186

URL: http://svn.apache.org/viewvc?rev=1391186&view=rev
Log:
[MWAR-292] Added flag recompressZippedFiles

Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1391186&r1=1391185&r2=1391186&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
 Thu Sep 27 19:36:49 2012
@@ -305,6 +305,16 @@ public abstract class AbstractWarMojo
     protected String escapeString;
 
     /**
+     * Indicates if zip archives (jar,zip etc) being added to the war should be
+     * compressed again. Compressing again can result in smaller archive size, 
but
+     * gives noticeably longer execution time.
+     *
+     * @since 2.3
+     */
+    @Parameter( defaultValue = "false" )
+    private boolean recompressZippedFiles;
+
+    /**
      * The archive configuration to use.
      * See <a 
href="http://maven.apache.org/shared/maven-archiver/index.html";>Maven Archiver 
Reference</a>.
      */
@@ -896,4 +906,9 @@ public abstract class AbstractWarMojo
     {
         return this.session;
     }
+
+    protected boolean isRecompressZippedFiles()
+    {
+        return recompressZippedFiles;
+    }
 }

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=1391186&r1=1391185&r2=1391186&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
 Thu Sep 27 19:36:49 2012
@@ -230,6 +230,9 @@ public class WarMojo
         {
             warArchiver.setWebxml( webXmlFile );
         }
+
+        warArchiver.setRecompressAddedZips( isRecompressZippedFiles()  );
+
         if ( !failOnMissingWebXml )
         {
             getLog().debug( "Build won't fail if web.xml file is missing." );