Author: tchemit Date: 2009-09-25 23:43:33 +0200 (Fri, 25 Sep 2009) New Revision: 236 Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java Log: change incomig files format (one file by line) Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-09-25 08:10:54 UTC (rev 235) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-09-25 21:43:33 UTC (rev 236) @@ -21,7 +21,6 @@ package org.nuiton.jredmine.plugin; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -30,6 +29,7 @@ import java.util.Properties; import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.Attachment; +import org.nuiton.plugin.CollectFilesMojo; import org.nuiton.util.PluginHelper; /** @@ -78,7 +78,7 @@ * @since 1.0.0 */ protected boolean dryRun; - /** + /** * A flag to restirct only one run in a build (for multi-module context). * * @parameter expression="${redmine.runOnce}" default-value="true" @@ -86,7 +86,7 @@ */ private boolean runOnce; protected List<File> allFiles; - private boolean runOnceDone; + private boolean runOnceDone; public PublishAttachmentsMojo() { super(true, true, true); @@ -153,7 +153,7 @@ @Override protected void doAction() throws Exception { - if (runOnce && runOnceDone) { + if (runOnce && runOnceDone) { return; } if (isGoalSkip()) { @@ -209,10 +209,11 @@ Properties p = new Properties(); // load definition file + List<File> incoming = null; try { - p.load(new FileInputStream(filesFromProperties)); - getLog().info("Load " + filesFromProperties); + incoming = CollectFilesMojo.getFiles(filesFromProperties); + getLog().info("Loaded " + filesFromProperties); } catch (IOException ex) { throw new MojoExecutionException("could not load file " + filesFromProperties, ex); } @@ -221,7 +222,11 @@ // sort attachments by file names - List<String> names = new ArrayList<String>(p.stringPropertyNames()); + List<String> names = new ArrayList<String>(incoming.size()); + for (File f : incoming) { + names.add(f.getName()); + } + Collections.sort(names); for (String f : names) {