diff options
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java index a927c2c..81dc6b1 100644 --- a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java +++ b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java @@ -1,14 +1,16 @@ -package org.fedoraproject.maven.artifact.resolver; +package org.apache.maven.artifact.resolver; + +import org.apache.maven.artifact.repository.MavenJPackageDepmap; -import org.fedoraproject.maven.artifact.repository.MavenJPackageDepmap; import java.io.File; import java.util.List; import java.util.LinkedList; import java.util.Hashtable; -import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.repository.WorkspaceReader; import org.sonatype.aether.repository.WorkspaceRepository; +import org.sonatype.aether.artifact.Artifact; + public class JavadirWorkspaceReader implements WorkspaceReader @@ -28,15 +30,15 @@ public class JavadirWorkspaceReader } public File findArtifact( Artifact artifact ) { - System.err.println("=============JAVADIRREADER-FIND_ARTIFACT: " + artifact.getArtifactId()); + MavenJPackageDepmap.debug("=============JAVADIRREADER-FIND_ARTIFACT: " + artifact.getArtifactId()); StringBuffer path = new StringBuffer(); String artifactId = artifact.getArtifactId(); String groupId = artifact.getGroupId(); String version = artifact.getVersion(); - System.err.println("Wanted GROUPID=" + groupId); - System.err.println("Wanted ARTIFACTID=" + artifactId); + MavenJPackageDepmap.debug("Wanted GROUPID=" + groupId); + MavenJPackageDepmap.debug("Wanted ARTIFACTID=" + artifactId); if (!groupId.startsWith("JPP")) { MavenJPackageDepmap map = MavenJPackageDepmap.getInstance(); @@ -45,8 +47,8 @@ public class JavadirWorkspaceReader groupId = (String) newInfo.get("group"); artifactId = (String) newInfo.get("artifact"); } - System.err.println("Resolved GROUPID=" + groupId); - System.err.println("Resolved ARTIFACTID=" + artifactId); + MavenJPackageDepmap.debug("Resolved GROUPID=" + groupId); + MavenJPackageDepmap.debug("Resolved ARTIFACTID=" + artifactId); if (artifact.getExtension().equals("pom")) { path = getPOMPath(groupId, artifactId); @@ -60,13 +62,22 @@ public class JavadirWorkspaceReader path.append( artifactId ).append( ".jar" ); } - System.err.println("Returning " + path.toString()); - return new File(path.toString()); + MavenJPackageDepmap.debug("Returning " + path.toString()); + File ret = new File(path.toString()); + // if file doesn't exist return null to delegate to other + // resolvers (reactor/local repo) + if ( ret.isFile() ) { + MavenJPackageDepmap.debug("Returning " + path.toString()); + return ret; + } else { + MavenJPackageDepmap.debug("Returning null for gid:aid" + groupId + ":" + artifactId); + return null; + } } public List<String> findVersions( Artifact artifact ) { List<String> ret = new LinkedList<String>(); - ret.add("DUMMY_VER"); + ret.add("latest"); return ret; } @@ -74,18 +85,18 @@ public class JavadirWorkspaceReader StringBuffer path = new StringBuffer(); String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom"; - path.append(System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms")).append("/").append(fName); + path.append(System.getProperty("maven.jpp.pom.path", "JPP/maven2/poms")).append("/").append(fName); java.io.File f; // NOTE: We are returning default_poms/ as the path for this pom // even though it may not exist there. This may cause an error, // but that is fine because if the pom is not there, there is // a serious problem anyways.. - f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString()); + f = new java.io.File(System.getProperty("maven.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString()); //System.err.println("Checking path " + f.getAbsolutePath() + " for the pom"); if (!f.exists()) { path = new StringBuffer(); - path.append(System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName); + path.append(System.getProperty("maven.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName); } path.insert(0, "/usr/share/maven2/repository/"); return path; |