ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r720189 - /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Date Mon, 24 Nov 2008 13:14:57 GMT
Author: hibou
Date: Mon Nov 24 05:14:57 2008
New Revision: 720189

URL: http://svn.apache.org/viewvc?rev=720189&view=rev
Log:
since Ivy is managing itself the detection of missing sources and javadocs declaration (related
to maven repo), remove the useless code in IvyDE (related to IVYDE-128)

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=720189&r1=720188&r2=720189&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Mon Nov 24 05:14:57 2008
@@ -35,9 +35,6 @@
 import java.util.Set;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.core.cache.ArtifactOrigin;
-import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
-import org.apache.ivy.core.cache.RepositoryCacheManager;
 import org.apache.ivy.core.event.IvyEvent;
 import org.apache.ivy.core.event.IvyListener;
 import org.apache.ivy.core.event.download.EndArtifactDownloadEvent;
@@ -46,13 +43,11 @@
 import org.apache.ivy.core.event.resolve.EndResolveDependencyEvent;
 import org.apache.ivy.core.event.resolve.StartResolveDependencyEvent;
 import org.apache.ivy.core.module.descriptor.Artifact;
-import org.apache.ivy.core.module.descriptor.DefaultArtifact;
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.module.id.ModuleId;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.core.report.ArtifactDownloadReport;
 import org.apache.ivy.core.report.ResolveReport;
-import org.apache.ivy.core.resolve.DownloadOptions;
 import org.apache.ivy.core.resolve.IvyNode;
 import org.apache.ivy.core.resolve.ResolveOptions;
 import org.apache.ivy.core.retrieve.RetrieveOptions;
@@ -548,11 +543,7 @@
                 return new Path(otherAdr.getLocalFile().getAbsolutePath());
             }
         }
-        if (shouldTestNonDeclaredSources()) {
-            return getMetaArtifactPath(adr, "source", "sources");
-        } else {
-            return null;
-        }
+        return null;
     }
 
     private Path getJavadocArtifactPath(ArtifactDownloadReport adr, Collection all) {
@@ -568,87 +559,6 @@
                 return new Path(otherAdr.getLocalFile().getAbsolutePath());
             }
         }
-        if (shouldTestNonDeclaredJavadocs()) {
-            return getMetaArtifactPath(adr, "javadoc", "javadoc");
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * meta artifact (source or javadoc) not found in resolved artifacts, try to see if a
non
-     * declared one is available
-     */
-    private Path getMetaArtifactPath(ArtifactDownloadReport adr, String metaType,
-            String metaClassifier) {
-        Artifact artifact = adr.getArtifact();
-        Map extraAtt = new HashMap(artifact.getExtraAttributes());
-        extraAtt.put("classifier", metaClassifier);
-        Artifact metaArtifact = new DefaultArtifact(artifact.getModuleRevisionId(), artifact
-                .getPublicationDate(), artifact.getName(), metaType, "jar", extraAtt);
-        RepositoryCacheManager cache = ivy.getSettings()
-                .getResolver(artifact.getModuleRevisionId()).getRepositoryCacheManager();
-        if (!(cache instanceof DefaultRepositoryCacheManager)) {
-            /*
-             * we're not using a default implementation of repository cache manager, so we
don't
-             * cache attempts to locate metadata artifacts
-             */
-            Path metaArtifactLocalPath = downloadMetaArtifact(adr, metaType, metaArtifact);
-            if (metaArtifactLocalPath != null) {
-                return metaArtifactLocalPath;
-            }
-            Message.info(metaType + " not found for " + artifact);
-            Message
-                    .verbose("Attempt not stored in cache because a non Default cache implementation
is used.");
-            return null;
-        }
-
-        File metaArtifactFile = ((DefaultRepositoryCacheManager) cache)
-                .getArchiveFileInCache(metaArtifact);
-        File attempt = new File(metaArtifactFile.getAbsolutePath() + ".notfound");
-        if (metaArtifactFile.exists()) {
-            return new Path(metaArtifactFile.getAbsolutePath());
-        } else if (attempt.exists()) {
-            return null;
-        }
-        Path metaArtifactLocalPath = downloadMetaArtifact(adr, metaType, metaArtifact);
-        if (metaArtifactLocalPath != null) {
-            return metaArtifactLocalPath;
-        }
-        Message.info(metaType + " not found for " + artifact);
-        /*
-         * meta artifact not found, we store this information to avoid other attempts later
-         */
-        try {
-            attempt.getParentFile().mkdirs();
-            attempt.createNewFile();
-        } catch (IOException e) {
-            Message.error("impossible to create attempt file " + attempt + ": " + e);
-        }
-        return null;
-    }
-
-    private Path downloadMetaArtifact(ArtifactDownloadReport adr, String metaType,
-            Artifact metaArtifact) {
-        Artifact artifact = adr.getArtifact();
-        Message.info("checking " + metaType + " for " + artifact);
-        ArtifactOrigin origin = ivy.getResolveEngine().locate(metaArtifact);
-        if (!ArtifactOrigin.isUnknown(origin)) {
-            /*
-             * fix for IVYDE-117: we need to check that the location of this metadata artifact
is
-             * different from the original artifact
-             */
-            if (adr.getArtifactOrigin() != null
-                    && (ArtifactOrigin.isUnknown(adr.getArtifactOrigin()) || !origin.getLocation()
-                            .equals(adr.getArtifactOrigin().getLocation()))) {
-                ArtifactDownloadReport metaAdr = ivy.getResolveEngine().download(origin,
-                    new DownloadOptions());
-                File localFile = metaAdr.getLocalFile();
-                if (localFile != null && localFile.exists()) {
-                    return new Path(localFile.getAbsolutePath());
-                }
-            }
-        }
         return null;
     }
 
@@ -702,14 +612,6 @@
         return (IClasspathAttribute[]) result.toArray(new IClasspathAttribute[result.size()]);
     }
 
-    public boolean shouldTestNonDeclaredSources() {
-        return true; // TODO: add settings for that
-    }
-
-    public boolean shouldTestNonDeclaredJavadocs() {
-        return true; // TODO: add settings for that
-    }
-
     public boolean isJavadocArtifactName(String jar, String javadoc) {
         return isArtifactName(jar, javadoc, conf.getInheritedJavadocSuffixes());
     }



Mime
View raw message