Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 7968 invoked from network); 28 May 2009 16:43:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 May 2009 16:43:43 -0000 Received: (qmail 39220 invoked by uid 500); 28 May 2009 16:43:56 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 39135 invoked by uid 500); 28 May 2009 16:43:55 -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 39070 invoked by uid 99); 28 May 2009 16:43:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 May 2009 16:43:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 May 2009 16:43:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 62E9F2388872; Thu, 28 May 2009 16:43:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r779655 - in /maven/components/branches/MNG-2766: maven-compat/src/main/java/org/apache/maven/artifact/resolver/ maven-core/src/test/java/org/apache/maven/project/ maven-repository/src/main/java/org/apache/maven/repository/ maven-repository... Date: Thu, 28 May 2009 16:43:21 -0000 To: commits@maven.apache.org From: jvanzyl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090528164321.62E9F2388872@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Thu May 28 16:43:20 2009 New Revision: 779655 URL: http://svn.apache.org/viewvc?rev=779655&view=rev Log: o adding in some changes before moving to the trunk Added: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java (with props) maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java (with props) maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/legacy/ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java - copied, changed from r779312, maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Removed: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java?rev=779655&r1=779654&r2=779655&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (original) +++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java Thu May 28 16:43:20 2009 @@ -21,15 +21,14 @@ private Artifact artifact; // Needs to go away + // These are really overrides now, projects defining dependencies for a plugin that override what is + // specified in the plugin itself. private Set artifactDependencies; private ArtifactRepository localRepository; private List remoteRepositories; - // Not sure what to do with this? - // Scope - // Lock down lists private ArtifactFilter filter; // Needs to go away Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java?rev=779655&r1=779654&r2=779655&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (original) +++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java Thu May 28 16:43:20 2009 @@ -1,8 +1,8 @@ package org.apache.maven.project; import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.repository.LegacyRepositorySystem; import org.apache.maven.repository.RepositorySystem; +import org.apache.maven.repository.legacy.LegacyRepositorySystem; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; Added: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java?rev=779655&view=auto ============================================================================== --- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java (added) +++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java Thu May 28 16:43:20 2009 @@ -0,0 +1,106 @@ +package org.apache.maven.repository; + +public class Authentication +{ + /** + * Username used to login to the host + */ + private String userName; + + /** + * Password associated with the login + */ + private String password; + + /** + * Passphrase of the user's private key file + */ + private String passphrase; + + /** + * The absolute path to private key file + */ + private String privateKey; + + /** + * Get the passphrase of the private key file. The passphrase is used only when host/protocol + * supports authentication via exchange of private/public keys and private key was used for + * authentication. + * + * @return passphrase of the private key file + */ + public String getPassphrase() + { + return passphrase; + } + + /** + * Set the passphrase of the private key file. + * + * @param passphrase passphrase of the private key file + */ + public void setPassphrase( String passphrase ) + { + this.passphrase = passphrase; + } + + /** + * Get the absolute path to the private key file. + * + * @return absolute path to private key + */ + public String getPrivateKey() + { + return privateKey; + } + + /** + * Set the absolute path to private key file. + * + * @param privateKey path to private key in local file system + */ + public void setPrivateKey( String privateKey ) + { + this.privateKey = privateKey; + } + + /** + * Get the user's password which is used when connecting to the repository. + * + * @return password of user + */ + public String getPassword() + { + return password; + } + + /** + * Set the user's password which is used when connecting to the repository. + * + * @param password password of the user + */ + public void setPassword( String password ) + { + this.password = password; + } + + /** + * Get the username used to access the repository. + * + * @return username at repository + */ + public String getUserName() + { + return userName; + } + + /** + * Set username used to access the repository. + * + * @param userName the username used to access repository + */ + public void setUserName( final String userName ) + { + this.userName = userName; + } +} Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java?rev=779655&r1=779654&r2=779655&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java (original) +++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java Thu May 28 16:43:20 2009 @@ -35,7 +35,7 @@ Collection nodes; /** entry point for tree-like structures */ - MetadataGraphNode entry; + MetadataGraphNode entry; public MetadataGraph( MetadataGraphNode entry ) { @@ -63,12 +63,15 @@ public MetadataGraphNode findNode( MavenArtifactMetadata md ) { for( MetadataGraphNode mgn : nodes ) + { if( mgn.metadata.equals( md ) ) + { return mgn; + } + } MetadataGraphNode node = new MetadataGraphNode( md ); - addNode( node ); - + addNode( node ); return node; } Added: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java?rev=779655&view=auto ============================================================================== --- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java (added) +++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java Thu May 28 16:43:20 2009 @@ -0,0 +1,178 @@ +package org.apache.maven.repository; + +public class Proxy +{ + public final static String PROXY_SOCKS5 = "SOCKS_5"; + + public final static String PROXY_SOCKS4 = "SOCKS4"; + + public final static String PROXY_HTTP = "HTTP"; + + /** + * Proxy server host + */ + private String host; + + /** + * Username used to access the proxy server + */ + private String userName; + + /** + * Password associated with the proxy server + */ + private String password; + + /** + * Proxy server port + */ + private int port; + + /** + * Type of the proxy + */ + private String type; + + /** + * The non-proxy hosts. Follows Java system property format: *.foo.com|localhost. + */ + private String nonProxyHosts; + + /** + * For NTLM proxies, specifies the NTLM host. + */ + private String ntlmHost; + + /** + * For NTLM proxies, specifies the NTLM domain. + */ + private String ntlmDomain; + + /** + * Return proxy server host name. + * + * @return proxy server host name + */ + public String getHost() + { + return host; + } + + /** + * Set proxy host name. + * + * @param host proxy server host name + */ + public void setHost( String host ) + { + this.host = host; + } + + /** + * Get user's password used to login to proxy server. + * + * @return user's password at proxy host + */ + public String getPassword() + { + return password; + } + + /** + * Set the user's password for the proxy server. + * + * @param password password to use to login to a proxy server + */ + public void setPassword( String password ) + { + this.password = password; + } + + /** + * Get the proxy port. + * + * @return proxy server port + */ + public int getPort() + { + return port; + } + + /** + * Set the proxy port. + * + * @param port proxy server port + */ + public void setPort( int port ) + { + this.port = port; + } + + /** + * Get the proxy username. + * + * @return username for the proxy server + */ + public String getUserName() + { + return userName; + } + + /** + * Set the proxy username. + * + * @param userName username for the proxy server + */ + public void setUserName( String userName ) + { + this.userName = userName; + } + + /** + * Get the type of the proxy server. + * + * @return the type of the proxy server + */ + public String getType() + { + return type; + } + + /** + * @param type the type of the proxy server like SOCKSv4 + */ + public void setType( String type ) + { + this.type = type; + } + + public String getNonProxyHosts() + { + return nonProxyHosts; + } + + public void setNonProxyHosts( String nonProxyHosts ) + { + this.nonProxyHosts = nonProxyHosts; + } + + public String getNtlmHost() + { + return ntlmHost; + } + + public void setNtlmHost( String ntlmHost ) + { + this.ntlmHost = ntlmHost; + } + + public void setNtlmDomain( String ntlmDomain ) + { + this.ntlmDomain = ntlmDomain; + } + + public String getNtlmDomain() + { + return ntlmDomain; + } +} Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Copied: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java (from r779312, maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java) URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?p2=maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java&p1=maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java&r1=779312&r2=779655&rev=779655&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (original) +++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java Thu May 28 16:43:20 2009 @@ -1,4 +1,4 @@ -package org.apache.maven.repository; +package org.apache.maven.repository.legacy; /* * Licensed to the Apache Software Foundation (ASF) under one or more contributor license @@ -36,6 +36,12 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.Repository; import org.apache.maven.model.RepositoryPolicy; +import org.apache.maven.repository.DelegatingLocalArtifactRepository; +import org.apache.maven.repository.LocalArtifactRepository; +import org.apache.maven.repository.MetadataResolutionRequest; +import org.apache.maven.repository.MetadataResolutionResult; +import org.apache.maven.repository.MirrorBuilder; +import org.apache.maven.repository.RepositorySystem; import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.TransferFailedException; import org.apache.maven.wagon.events.TransferListener;