You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/01/14 16:13:53 UTC
svn commit: r369028 - in /maven/maven-1/plugins/trunk/eclipse: ./
src/main/org/apache/ src/main/org/apache/maven/
src/main/org/apache/maven/plugin/ src/main/org/apache/maven/plugin/eclipse/
src/main/org/maven/
Author: snicoll
Date: Sat Jan 14 07:13:44 2006
New Revision: 369028
URL: http://svn.apache.org/viewcvs?rev=369028&view=rev
Log:
MPECLIPSE-60: a couple of changes following Arnaud's comment.
Added:
maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/
maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/
maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/
maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/
maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java (contents, props changed)
- copied, changed from r368890, maven/maven-1/plugins/trunk/eclipse/src/main/org/maven/eclipse/JavaSourcesDownloader.java
Removed:
maven/maven-1/plugins/trunk/eclipse/src/main/org/maven/
Modified:
maven/maven-1/plugins/trunk/eclipse/plugin.jelly
maven/maven-1/plugins/trunk/eclipse/project.xml
Modified: maven/maven-1/plugins/trunk/eclipse/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/plugin.jelly?rev=369028&r1=369027&r2=369028&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/eclipse/plugin.jelly Sat Jan 14 07:13:44 2006
@@ -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">
Modified: maven/maven-1/plugins/trunk/eclipse/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/project.xml?rev=369028&r1=369027&r2=369028&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/project.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/project.xml Sat Jan 14 07:13:44 2006
@@ -134,6 +134,14 @@
<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>
<version>1.0.4</version>
Copied: maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java (from r368890, maven/maven-1/plugins/trunk/eclipse/src/main/org/maven/eclipse/JavaSourcesDownloader.java)
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java?p2=maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java&p1=maven/maven-1/plugins/trunk/eclipse/src/main/org/maven/eclipse/JavaSourcesDownloader.java&r1=368890&r2=369028&rev=369028&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/main/org/maven/eclipse/JavaSourcesDownloader.java (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java Sat Jan 14 07:13:44 2006
@@ -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 @@
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 @@
// 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(),
Propchange: maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/plugins/trunk/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision