Fix handling of fallback pom destinations

2 files changed, 6 insertions, 19 deletions

diff --git a/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java b/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java
index 9b48a07..2567c0c 100644
--- a/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java
+++ b/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java
@@ -106,7 +106,6 @@ public class MavenJPackageDepmap {
         }
 
         jppCombination = (String) jppArtifactMap.get(idToCheck);
-
         jppDep = new Hashtable<String, String>();
         if (jppCombination != null && jppCombination != "") {
 
@@ -252,13 +251,10 @@ public class MavenJPackageDepmap {
                             + jppAD.artifactId + "," + jppAD.version);
                 }
             } else {
-                debug("Number of jpp sub-elements is not 1. Dropping dependency");
-                debug("*** Adding: " + mavenAD.groupId + ","
-                        + mavenAD.artifactId + "," + " => "
-                        + "JPP/maven2,empty-dep," + mavenAD.version
-                        + " to map...");
+                debug("Number of jpp sub-elements is not 1. Dropping dependency for "
+                        + mavenAD.groupId + ":" + mavenAD.artifactId);
                 jppArtifactMap.put(mavenAD.groupId + "," + mavenAD.artifactId,
-                        "JPP/maven2,empty-dep," + mavenAD.version);
+                        "JPP/maven,empty-dep," + mavenAD.version);
             }
         }
     }
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 b84974b..9fe54f1 100644
--- a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java
+++ b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java
@@ -84,25 +84,18 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
     }
 
     private StringBuffer getPOMPath(String groupId, String artifactId) {
-
         String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-"
                 + artifactId + ".pom";
-        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);
+        f = new File("/usr/share/maven2/poms/" + fName);
         if (f.exists()) {
             return new StringBuffer(f.getPath());
         }
 
         // now maven 3 specific repository
-        f = new File(System.getProperty("maven.local.default.repo",
-                "/usr/share/maven/repository") + "/" + m3path);
+        f = new File("/usr/share/maven/poms/" + fName);
         if (f.exists()) {
             return new StringBuffer(f.getPath());
         }
@@ -115,8 +108,6 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
         }
 
         // final fallback to m2 default poms
-        return new StringBuffer("/usr/share/maven2/repository/"
-                + System.getProperty("maven.local.default.repo",
-                        "JPP/maven2/default_poms") + "/" + fName);
+        return new StringBuffer("/usr/share/maven2/default_poms/" + fName);
     }
 }