[java-sig-commits] [maven] Resolve poms also from /usr/share/maven-poms

[Stanislav Ochotnicky]

commit a170a2aaad3a7a30094b5438614f53ce0e82e7fc
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri Jun 10 11:17:07 2011 +0200

    Resolve poms also from /usr/share/maven-poms
    
    This will enable us to move fragments from etc

 JavadirWorkspaceReader.java |   17 ++++++++++++-----
 maven.spec                  |    2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/JavadirWorkspaceReader.java b/JavadirWorkspaceReader.java
index 22033cb..b84974b 100644
--- a/JavadirWorkspaceReader.java
+++ b/JavadirWorkspaceReader.java
@@ -1,15 +1,14 @@
 package org.apache.maven.artifact.resolver;
 
-import org.apache.maven.artifact.repository.MavenJPackageDepmap;
-
 import java.io.File;
-import java.util.List;
-import java.util.LinkedList;
 import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
 
+import org.apache.maven.artifact.repository.MavenJPackageDepmap;
+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 {
     private WorkspaceRepository workspaceRepository;
@@ -101,12 +100,20 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
             return new StringBuffer(f.getPath());
         }
 
+        // now maven 3 specific repository
         f = new File(System.getProperty("maven.local.default.repo",
                 "/usr/share/maven/repository") + "/" + m3path);
         if (f.exists()) {
             return new StringBuffer(f.getPath());
         }
 
+        // now try new path in /usr. This will be the only check after all
+        // packages are rebuilt
+        f = new File("/usr/share/maven-poms/" + fName);
+        if (f.exists()) {
+            return new StringBuffer(f.getPath());
+        }
+
         // final fallback to m2 default poms
         return new StringBuffer("/usr/share/maven2/repository/"
                 + System.getProperty("maven.local.default.repo",
diff --git a/maven.spec b/maven.spec
index 5b7f202..ebddb71 100644
--- a/maven.spec
+++ b/maven.spec
@@ -310,6 +310,8 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %changelog
 * Fri Jun 10 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.3-5
 - Process fragments directly instead of maven2-depmap.xml
+- Expect fragments in /usr/share/maven-fragments
+- Resolve poms also from /usr/share/maven-poms
 
 * Mon Jun  6 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.3-4
 - Add help to mvn-rpmbuild and mvn-local (rhbz#710448)