MPECLIPSE-60: a couple of changes following Arnaud's comment.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@369028 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
<define:taglib uri="eclipse">
|
||||
<define:jellybean
|
||||
name="download-sources"
|
||||
className="org.apache.maven.eclipse.JavaSourcesDownloader"
|
||||
className="org.apache.maven.plugin.eclipse.JavaSourcesDownloader"
|
||||
method="downloadJavaSources"/>
|
||||
|
||||
<define:tag name="write-classpath-entry">
|
||||
|
||||
@@ -133,6 +133,14 @@
|
||||
<artifactId>maven</artifactId>
|
||||
<version>1.0.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>maven</groupId>
|
||||
<artifactId>maven-model</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<properties>
|
||||
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
|
||||
</properties>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.apache.maven.eclipse;
|
||||
package org.apache.maven.plugin.eclipse;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
@@ -39,6 +39,9 @@ import java.util.Iterator;
|
||||
public class JavaSourcesDownloader
|
||||
extends AbstractMavenComponent
|
||||
{
|
||||
private static final String PROXY_LOGINHOST = "maven.proxy.ntlm.host";
|
||||
private static final String PROXY_LOGINDOMAIN = "maven.proxy.ntlm.domain";
|
||||
|
||||
private static final Log log = LogFactory.getLog( JavaSourcesDownloader.class );
|
||||
|
||||
private Project project;
|
||||
@@ -213,13 +216,8 @@ public class JavaSourcesDownloader
|
||||
// of the checksum file was successful.
|
||||
try
|
||||
{
|
||||
String loginHost = (String) getProject().getContext().getVariable( MavenConstants.PROXY_LOGINHOST );
|
||||
String loginDomain = (String) getProject().getContext().getVariable( MavenConstants.PROXY_LOGINDOMAIN );
|
||||
String meterType = (String) getProject().getContext().getVariable( MavenConstants.DOWNLOAD_METER );
|
||||
if ( meterType != null )
|
||||
{
|
||||
HttpUtils.setMeterType( meterType );
|
||||
}
|
||||
String loginHost = (String) getProject().getContext().getVariable( PROXY_LOGINHOST );
|
||||
String loginDomain = (String) getProject().getContext().getVariable( PROXY_LOGINDOMAIN );
|
||||
HttpUtils.getFile( url, destinationFile, false, true, getProject().getContext().getProxyHost(),
|
||||
getProject().getContext().getProxyPort(),
|
||||
getProject().getContext().getProxyUserName(),
|
||||
Reference in New Issue
Block a user