fix the zip goal, use the filesets if any or create one from dir/includes/excludes

svn path=/trunk/maven-plugins/glassfishbuild-maven-plugin/; revision=64739

Author: romain-grecourt

src/main/java/org/glassfish/build/ZipMojo.java

@@ -41,6 +41,9 @@
 package org.glassfish.build;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -99,23 +102,23 @@ public class ZipMojo extends AbstractMojo {
 
     /**
      * dir the root of the directory tree of the default FileSet ;
-     * Only when not fileset(s) provided.
+     * Only when no fileset(s) provided.
      * 
      * @parameter expression="${gfzip.dir}" default-value="${project.build.directory}"
      */
     protected File dir;
 
     /**
      * comma- or space-separated list of patterns of files that must be included ;
-     * all files are included when omitted ; Only when not fileset(s) provided.
+     * all files are included when omitted ; Only when no fileset(s) provided.
      *
      * @parameter expression="${gfzip.includes}"
      */
     protected String includes;
 
     /**
      * comma- or space-separated list of patterns of files that must be included ;
-     * all files are included when omitted ; Only when not fileset(s) provided.
+     * all files are included when omitted ; Only when no fileset(s) provided.
      *
      * @parameter expression="${gfzip.excludes}"
      */
@@ -137,17 +140,24 @@ public class ZipMojo extends AbstractMojo {
 
 
     public void execute() throws MojoExecutionException, MojoFailureException {
-        
+
         this.project.addCompileSourceRoot(null);
+        List<ZipFileSet> fsets;
+        if(filesets != null || filesets.length >0){
+            fsets = Arrays.asList(filesets);
+        } else {
+            fsets = new ArrayList<ZipFileSet>();
+            fsets.add(MavenUtils.createZipFileSet(dir, includes, excludes));
+        }
 
         File target = MavenUtils.createZip(
                 project.getProperties(),
                 getLog(),
                 duplicate,
-                MavenUtils.createZipFileSet(dir, includes, excludes),
+                fsets,
                 new File(outputDirectory, finalName + '.' + extension));
 
-        if (attach.booleanValue()) {
+        if (attach) {
             project.getArtifact().setFile(target);
             project.getArtifact().setArtifactHandler(new DistributionArtifactHandler(extension, project.getPackaging()));
         }

src/main/java/org/glassfish/build/utils/MavenUtils.java

@@ -1165,6 +1165,7 @@ private void zip(
             if (fsets == null){
                 fsets = new ArrayList<ZipFileSet>();
             }
+
             if(fsets.isEmpty()) {
                 ZipFileSet zfs = MavenUtils.createZipFileSet(new File(""), "","");
                 // work around for 
@@ -1173,10 +1174,13 @@ private void zip(
                 zfs.setFileMode("644");
                 fsets.add(zfs);
             }
-            
+
             for(ZipFileSet fset:fsets){
                 zip.addZipfileset(fset);
-                log.info(String.format("[zip] %s", fset.getDescription()));
+                String desc = fset.getDescription();
+                if(desc != null && !desc.isEmpty()){
+                    log.info(String.format("[zip] %s", desc));
+                }
             }
             zip.executeMain();
         }