Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 4435 invoked from network); 14 Jan 2006 15:14:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jan 2006 15:14:19 -0000 Received: (qmail 79641 invoked by uid 500); 14 Jan 2006 15:14:18 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 79226 invoked by uid 500); 14 Jan 2006 15:14:15 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 79215 invoked by uid 99); 14 Jan 2006 15:14:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jan 2006 07:14:15 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 14 Jan 2006 07:14:14 -0800 Received: (qmail 4085 invoked by uid 65534); 14 Jan 2006 15:13:54 -0000 Message-ID: <20060114151354.4084.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Sat, 14 Jan 2006 15:13:53 -0000 To: commits@maven.apache.org From: snicoll@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ 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 @@ 1.0.2 + maven + maven-model + 3.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + commons-logging commons-logging 1.0.4 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