You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/01/03 05:29:18 UTC
svn commit: r608336 -
/incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
Author: jsdelfino
Date: Wed Jan 2 20:29:17 2008
New Revision: 608336
URL: http://svn.apache.org/viewvc?rev=608336&view=rev
Log:
Sort lists of modules to make output deterministic.
Modified:
incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
Modified: incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java?rev=608336&r1=608335&r2=608336&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Wed Jan 2 20:29:17 2008
@@ -23,6 +23,7 @@
import java.io.FileOutputStream;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -277,25 +278,29 @@
private void generateBuildDependencies(PrintWriter pw) {
// Determine the module dependencies
- List<Artifact> tuscanyModules = new ArrayList<Artifact>();
- List<Artifact> otherModules = new ArrayList<Artifact>();
+ List<String> tuscanyModules = new ArrayList<String>();
+ List<String> otherModules = new ArrayList<String>();
for (Artifact artifact: (List<Artifact>)project.getRuntimeArtifacts()) {
if (artifact.getGroupId().startsWith("org.apache.tuscany.sca")) {
- tuscanyModules.add(artifact);
+ tuscanyModules.add(artifact.getFile().getName());
} else {
- otherModules.add(artifact);
+ otherModules.add(artifact.getFile().getName());
}
}
+
+ // Sort lists of modules, making output deterministic
+ Collections.sort(tuscanyModules);
+ Collections.sort(otherModules);
// Generate filesets for the tuscany and 3rd party dependencies
pw.println(" <fileset id=\"tuscany.jars\" dir=\"../../modules\">");
- for (Artifact artifact: tuscanyModules) {
- pw.println(" <include name=\"" + artifact.getFile().getName() +"\"/>");
+ for (String name: tuscanyModules) {
+ pw.println(" <include name=\"" + name +"\"/>");
}
pw.println(" </fileset>");
pw.println(" <fileset id=\"3rdparty.jars\" dir=\"../../lib\">");
- for (Artifact artifact: otherModules) {
- pw.println(" <include name=\"" + artifact.getFile().getName() +"\"/>");
+ for (String name: otherModules) {
+ pw.println(" <include name=\"" + name +"\"/>");
}
pw.println(" </fileset>");
pw.println();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org