You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/06/28 11:46:12 UTC
svn commit: r789080 - in /maven/components/trunk: ./
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/main/java/org/apache/maven/project/
maven-core/src/main/java/org/apache/maven/project/artif...
Author: jvanzyl
Date: Sun Jun 28 09:46:11 2009
New Revision: 789080
URL: http://svn.apache.org/viewvc?rev=789080&view=rev
Log:
MNG-4221: Another pass over making maven-compat only used by external consumers
Removed:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenSecurityDispatcher.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
maven/components/trunk/maven-repository/pom.xml
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Sun Jun 28 09:46:11 2009
@@ -222,9 +222,11 @@
if ( !collisions.isEmpty() )
{
- throw new org.apache.maven.DuplicateProjectException( "Two or more projects in the reactor"
+ /*
+ throw new DuplicateProjectException( "Two or more projects in the reactor"
+ " have the same identifier, please make sure that <groupId>:<artifactId>:<version>"
- + " is unique for each project: " + collisions, collisions );
+ + " is unique for each project: " + collisions );
+ */
}
return index;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java Sun Jun 28 09:46:11 2009
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
public class PluginVersionResolutionException
extends Exception
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java Sun Jun 28 09:46:11 2009
@@ -29,10 +29,10 @@
import org.apache.maven.artifact.InvalidArtifactRTException;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Resource;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadata;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java Sun Jun 28 09:46:11 2009
@@ -3,8 +3,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.metadata.ResolutionGroup;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java Sun Jun 28 09:46:11 2009
@@ -69,8 +69,7 @@
public void storeInLocalRepository( ArtifactRepository localRepository, ArtifactRepository remoteRepository )
throws RepositoryMetadataStoreException
{
- File destination = new File( localRepository.getBasedir(),
- localRepository.pathOfLocalRepositoryMetadata( this, remoteRepository ) );
+ File destination = new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( this, remoteRepository ) );
// ----------------------------------------------------------------------------
// I'm fully aware that the file could just be moved using File.rename but
@@ -117,4 +116,9 @@
throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() );
}
}
+
+ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
+ {
+ this.merge( (ArtifactMetadata)metadata );
+ }
}
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java Sun Jun 28 09:46:11 2009
@@ -11,8 +11,8 @@
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.metadata.MetadataSource;
import org.apache.maven.project.artifact.MavenMetadataSource;
+import org.apache.maven.repository.metadata.MetadataSource;
import org.codehaus.plexus.component.annotations.Component;
@Component(role=ArtifactMetadataSource.class,hint="classpath")
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java Sun Jun 28 09:46:11 2009
@@ -10,8 +10,6 @@
import java.util.TimeZone;
import org.apache.maven.embedder.MavenEmbedderLogger;
-import org.apache.maven.execution.ApplicationInformation;
-import org.apache.maven.execution.DefaultRuntimeInformation;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.Os;
Modified: maven/components/trunk/maven-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/pom.xml?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/pom.xml (original)
+++ maven/components/trunk/maven-repository/pom.xml Sun Jun 28 09:46:11 2009
@@ -62,6 +62,10 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jsecurity</groupId>
+ <artifactId>jsecurity</artifactId>
</dependency>
</dependencies>
<build>
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java Sun Jun 28 09:46:11 2009
@@ -32,58 +32,6 @@
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
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java Sun Jun 28 09:46:11 2009
@@ -29,8 +29,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.CyclicDependencyException;
-import org.apache.maven.artifact.resolver.DefaultArtifactCollector;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.resolver.DefaultArtifactCollector;
/**
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java Sun Jun 28 09:46:11 2009
@@ -105,7 +105,9 @@
// Map types of artifacts
+ //
// Raw file transfers
+ //
void publish( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
throws TransferFailedException;
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java Sun Jun 28 09:46:11 2009
@@ -30,7 +30,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -387,32 +386,6 @@
}
*/
- /*
- public void addPermissionInfo( String repositoryId, String filePermissions, String directoryPermissions )
- {
- RepositoryPermissions permissions = new RepositoryPermissions();
-
- boolean addPermissions = false;
-
- if ( filePermissions != null )
- {
- permissions.setFileMode( filePermissions );
- addPermissions = true;
- }
-
- if ( directoryPermissions != null )
- {
- permissions.setDirectoryMode( directoryPermissions );
- addPermissions = true;
- }
-
- if ( addPermissions )
- {
- serverPermissionsMap.put( repositoryId, permissions );
- }
- }
- */
-
// Mirror
public void addMirror( String id, String mirrorOf, String url )
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=789080&r1=789079&r2=789080&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sun Jun 28 09:46:11 2009
@@ -286,6 +286,11 @@
<artifactId>plexus-plugin-manager</artifactId>
<version>${plexusPluginManagerVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.jsecurity</groupId>
+ <artifactId>jsecurity</artifactId>
+ <version>0.9.0-RC2</version>
+ </dependency>
<!--bootstrap-start-comment-->
<dependency>
<groupId>easymock</groupId>