diff options
author | Stanislav Ochotnicky <sochotnicky@redhat.com> | 2011-06-10 09:34:35 +0200 |
---|---|---|
committer | Stanislav Ochotnicky <sochotnicky@redhat.com> | 2011-06-10 09:34:35 +0200 |
commit | a6fbda0f70b9b0c83b569e95ddb9dffc5e73428a (patch) | |
tree | 0ba6f7557580e6a03bc7d590bc116b579d4b3581 | |
parent | b06a3341bfa3b96e30f9260e782e89b8f6376404 (diff) | |
download | maven-javadir-resolver-a6fbda0f70b9b0c83b569e95ddb9dffc5e73428a.tar.gz maven-javadir-resolver-a6fbda0f70b9b0c83b569e95ddb9dffc5e73428a.tar.xz maven-javadir-resolver-a6fbda0f70b9b0c83b569e95ddb9dffc5e73428a.zip |
Improve resolver to resolve poms also from maven 3 pomdir
-rw-r--r-- | src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java | 45 |
1 files changed, 23 insertions, 22 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 df843f5..22033cb 100644 --- a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java +++ b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java @@ -72,7 +72,7 @@ public class JavadirWorkspaceReader implements WorkspaceReader { MavenJPackageDepmap.debug("Returning " + path.toString()); return ret; } else { - MavenJPackageDepmap.debug("Returning null for gid:aid" + groupId + MavenJPackageDepmap.debug("Returning null for gid:aid =>" + groupId + ":" + artifactId); return null; } @@ -86,29 +86,30 @@ public class JavadirWorkspaceReader implements WorkspaceReader { private StringBuffer getPOMPath(String groupId, String artifactId) { - StringBuffer path = new StringBuffer(); String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom"; - 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("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("maven.jpp.default.pom.path", - "JPP/maven2/default_poms")).append("/") - .append(fName); + String m2path = System.getProperty("maven2.local.pom.path", + "JPP/maven2/poms") + "/" + fName; + String m3path = System.getProperty("maven.local.pom.path", + "JPP/maven/poms") + "/" + fName; + File f; + + // let's try maven 2 repo first + f = new File(System.getProperty("maven2.local.default.repo", + "/usr/share/maven2/repository") + "/" + m2path); + if (f.exists()) { + return new StringBuffer(f.getPath()); + } + + f = new File(System.getProperty("maven.local.default.repo", + "/usr/share/maven/repository") + "/" + m3path); + if (f.exists()) { + return new StringBuffer(f.getPath()); } - path.insert(0, "/usr/share/maven2/repository/"); - return path; + + // final fallback to m2 default poms + return new StringBuffer("/usr/share/maven2/repository/" + + System.getProperty("maven.local.default.repo", + "JPP/maven2/default_poms") + "/" + fName); } } |