svn commit: r1485083 - /karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java

[ffang]

Author: ffang
Date: Wed May 22 06:35:23 2013
New Revision: 1485083

URL: http://svn.apache.org/r1485083
Log:
[KARAF-2316]features-maven-plugin ignore proxy settings in maven settings.xml

Modified:
    
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java

Modified: 
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java?rev=1485083&r1=1485082&r2=1485083&view=diff
==============================================================================
--- 
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
 (original)
+++ 
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
 Wed May 22 06:35:23 2013
@@ -42,6 +42,7 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.plugin.AbstractMojo;
@@ -50,6 +51,7 @@ import org.apache.maven.project.MavenPro
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.settings.Proxy;
 
 public abstract class MojoSupport extends AbstractMojo {
 
@@ -113,6 +115,15 @@ public abstract class MojoSupport extend
      * @parameter default-value="xml"
      */
     private String featureArtifactType = "xml";
+    
+    /**
+     * The Maven session.
+     * 
+     * @parameter expression="${session}"
+     * @readonly
+     * @required
+     */
+    protected MavenSession mavenSession;
 
     protected MavenProject getProject() {
         return project;
@@ -386,6 +397,10 @@ public abstract class MojoSupport extend
                     repoUrl,
                     repoUrl,
                     new DefaultRepositoryLayout());
+            org.apache.maven.repository.Proxy mavenProxy = 
configureProxyToInlineRepo();
+            if (mavenProxy != null) {
+                repo.setProxy(mavenProxy);
+            }
             resourceLocation = resourceLocation.substring(repoDelimIntex + 1);
 
         }
@@ -421,4 +436,25 @@ public abstract class MojoSupport extend
         artifact.setRepository(repo);
         return artifact;
     }
+    
+    private org.apache.maven.repository.Proxy configureProxyToInlineRepo() {
+        if (mavenSession != null && mavenSession.getSettings() != null) {
+            Proxy proxy = mavenSession.getSettings().getActiveProxy();
+            org.apache.maven.repository.Proxy mavenProxy = new 
org.apache.maven.repository.Proxy();
+            if (proxy != null) {
+                mavenProxy.setProtocol(proxy.getProtocol());
+                mavenProxy.setHost(proxy.getHost());
+                mavenProxy.setPort(proxy.getPort());
+                mavenProxy.setNonProxyHosts(proxy.getNonProxyHosts());
+                mavenProxy.setUserName(proxy.getUsername());
+                mavenProxy.setPassword(proxy.getPassword());
+                return mavenProxy;
+            } else {
+                return null;
+            }
+            
+        } else {
+            return null;
+        }
+    }
 }