Changeset 4150

Timestamp:

01/07/08 04:33:38 (5 years ago)

Author:

t_yano

Message:

fix some bugs related to eternal looping for resolving dependencies.

Location:

lang/java/mvnbeans/trunk

Files:

• . (modified) (1 prop)
• pom.xml (modified) (1 diff)
• src/main/java/jp/javelindev/mvnbeans/App.java (modified) (7 diffs)

lang/java/mvnbeans/trunk/pom.xml

@@ -27 +27 @@
                     <source>1.5</source>
                     <target>1.5</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>RELEASE</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>

lang/java/mvnbeans/trunk/src/main/java/jp/javelindev/mvnbeans/App.java

@@ -7 +7 @@
 import java.io.InputStream;
 import java.nio.channels.Channels;
+import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -105 +108 @@
         switch(cmd) {
             case FETCH:
-                fetchAllArtifact(artifact, 0);
+                fetchAllArtifact(artifact, 0, null);
                 break;
             case SEARCH:
@@ -136 +139 @@
     }
     
-    static void fetchAllArtifact(Artifact artifact, int count) throws RepositoryIOException, IOException {
+    static void fetchAllArtifact(Artifact artifact, int count, Set<Artifact> reserved) throws RepositoryIOException, IOException {
+        Set<Artifact> reservedArtifacts = null;
+        if(reserved == null) {
+            reservedArtifacts = new HashSet<Artifact>();
+        } else {
+            reservedArtifacts = reserved;
+        }
+        
         String fileName = artifact.getArtifactId() + "-" + artifact.getVersion() + ".jar";
         File artifactFile = new File(fileName);
@@ -143 +153 @@
             if(artifactFile.exists()) {
                 System.out.println(repeatString("--", count) + "> " + fileName + "...already exists.");
+            } else if(reservedArtifacts.contains(artifact)) {
+                //the artifact is already reserved for downloading.
+                System.out.println(repeatString("--", count) + "> " + fileName + "...is already reserved for downloading.");
             } else {
                 
@@ -150 +163 @@
                 if(deps.size() > 0) {
                     System.out.println(repeatString("--", count) + "> processing " + fileName + "(" + artifact.getFileURL() + ")...");
+                    
+                    //the artifact has some dependencies, so we can not download the artifact just now 
+                    //and need to wait until the end of downloading of all the dependencies.
+                    //the artifact will be download after downloading the dependencies,
+                    //we hold the instance into our reminder cache.
+                    reservedArtifacts.add(artifact);
                 } else {
                     System.out.print(repeatString("--", count) + "> processing " + fileName + "(" + artifact.getFileURL() + ")...");
@@ -156 +175 @@
                 //download all the dependencies.
                 for (Artifact dependency : artifact.getDependencies()) {
-                    fetchAllArtifact(dependency, count + 1);
+                    fetchAllArtifact(dependency, count + 1, reserved);
                 }      
                 
@@ -183 +202 @@
                 if(deps.size() > 0) {
                     System.out.println(repeatString("--", count) + "> end.");
+                    
+                    //finally we have download the artifact.
+                    //remove the instance from our reminder cache.
+                    reservedArtifacts.remove(artifact);
                 } else {
                     System.out.println("end.");