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/07/15 21:24:29 UTC
svn commit: r794373 [8/9] - in /maven/components/branches/MNG-4221:
maven-compat/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/src/main/java/org/apache/maven/artifact/...
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java Wed Jul 15 19:24:20 2009
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.handler.ArtifactHandlerMock;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
public class DefaultArtifactTest
extends TestCase
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java Wed Jul 15 19:24:20 2009
@@ -23,7 +23,8 @@
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.deployer.ArtifactDeployer;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.util.FileUtils;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java Wed Jul 15 19:24:20 2009
@@ -23,13 +23,13 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataSource;
import org.apache.maven.repository.legacy.metadata.ResolutionGroup;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
/** @author Jason van Zyl */
public class SimpleArtifactMetadataSource
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java Wed Jul 15 19:24:20 2009
@@ -20,7 +20,8 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.PlexusTestCase;
public class DefaultArtifactFactoryTest
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java Wed Jul 15 19:24:20 2009
@@ -1,5 +1,7 @@
package org.apache.maven.artifact.handler;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java Wed Jul 15 19:24:20 2009
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.repository.legacy.installer.ArtifactInstaller;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java Wed Jul 15 19:24:20 2009
@@ -5,10 +5,10 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java Wed Jul 15 19:24:20 2009
@@ -20,6 +20,8 @@
*/
+import org.apache.maven.repository.legacy.repository.MavenArtifactRepository;
+
import junit.framework.TestCase;
public class MavenArtifactRepositoryTest
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java Wed Jul 15 19:24:20 2009
@@ -22,6 +22,8 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.maven.repository.legacy.resolver.AbstractArtifactResolutionException;
+
import junit.framework.TestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java Wed Jul 15 19:24:20 2009
@@ -32,8 +32,11 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.ArtifactResolver;
+import org.apache.maven.repository.legacy.resolver.DefaultArtifactResolver;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
// It would be cool if there was a hook that i could use to setup a test environment.
// I want to setup a local/remote repositories for testing but i don't want to have
@@ -113,8 +116,6 @@
ArtifactResolutionResult result = artifactResolver.resolveTransitively( Collections.singleton( g ), projectArtifact, remoteRepositories(), localRepository(), null );
- printErrors( result );
-
assertEquals( 2, result.getArtifacts().size() );
assertTrue( result.getArtifacts().contains( g ) );
@@ -137,8 +138,6 @@
ArtifactResolutionResult result = artifactResolver.resolveTransitively( Collections.singleton( i ), projectArtifact, remoteRepositories(), localRepository(), null );
- printErrors( result );
-
assertEquals( 2, result.getArtifacts().size() );
assertTrue( result.getArtifacts().contains( i ) );
@@ -234,8 +233,6 @@
result =
artifactResolver.resolveTransitively( set, projectArtifact, remoteRepositories(), localRepository(), mds );
- printErrors( result );
-
Iterator i = result.getArtifacts().iterator();
assertEquals( "n should be first", n, i.next() );
assertEquals( "m should be second", m, i.next() );
@@ -248,30 +245,8 @@
result =
artifactResolver.resolveTransitively( set, projectArtifact, remoteRepositories(), localRepository(), mds );
- printErrors( result );
-
i = result.getArtifacts().iterator();
assertEquals( "m should be first", m, i.next() );
assertEquals( "n should be second", n, i.next() );
}
-
- private void printErrors( ArtifactResolutionResult result )
- {
- if ( result.hasMissingArtifacts() )
- {
- for ( Artifact artifact : result.getMissingArtifacts() )
- {
- System.err.println( "Missing: " + artifact );
- }
- }
-
- if ( result.hasExceptions() )
- {
- for ( Exception e : result.getExceptions() )
- {
- e.printStackTrace();
- }
- }
- }
-
-}
+}
\ No newline at end of file
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java Wed Jul 15 19:24:20 2009
@@ -1,5 +1,6 @@
package org.apache.maven.artifact.resolver;
+import org.apache.maven.repository.legacy.resolver.ArtifactResolver;
import org.codehaus.plexus.PlexusTestCase;
public class DefaultArtifactResolverTest
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java Wed Jul 15 19:24:20 2009
@@ -22,6 +22,8 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.maven.repository.legacy.resolver.filter.IncludesArtifactFilter;
+
import junit.framework.TestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java Wed Jul 15 19:24:20 2009
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.maven.repository.legacy.versioning.ComparableVersion;
+
import junit.framework.TestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Wed Jul 15 19:24:20 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+
import junit.framework.TestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java Wed Jul 15 19:24:20 2009
@@ -24,6 +24,12 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.versioning.Restriction;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
/**
* Tests version range construction.
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java Wed Jul 15 19:24:20 2009
@@ -1,9 +1,9 @@
package org.apache.maven.repository;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.DefaultRepositoryLayout;
import org.codehaus.plexus.PlexusTestCase;
public class MirrorProcessorTest
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java Wed Jul 15 19:24:20 2009
@@ -23,11 +23,11 @@
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.repository.legacy.DefaultUpdateCheckManager;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadata;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java Wed Jul 15 19:24:20 2009
@@ -26,18 +26,18 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.repository.legacy.ChecksumFailedException;
import org.apache.maven.repository.legacy.DefaultWagonManager;
import org.apache.maven.repository.legacy.UpdateCheckManager;
import org.apache.maven.repository.legacy.WagonManager;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.UnsupportedProtocolException;
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java Wed Jul 15 19:24:20 2009
@@ -21,9 +21,9 @@
import java.io.File;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.repository.LegacyRepositorySystem;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.PlexusTestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java Wed Jul 15 19:24:20 2009
@@ -31,23 +31,22 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.CyclicDependencyException;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ExclusionSetFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.PlexusTestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java Wed Jul 15 19:24:20 2009
@@ -20,11 +20,11 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.PlexusTestCase;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.util.Collections;
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.apache.maven.repository.legacy.resolver.conflict.FarthestConflictResolver;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.util.Collections;
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.apache.maven.repository.legacy.resolver.conflict.NearestConflictResolver;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.util.Collections;
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.apache.maven.repository.legacy.resolver.conflict.NewestConflictResolver;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.util.Collections;
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.apache.maven.repository.legacy.resolver.conflict.OldestConflictResolver;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,5 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.repository.metadata.ArtifactMetadata;
import org.apache.maven.repository.metadata.ClasspathContainer;
import org.apache.maven.repository.metadata.ClasspathTransformation;
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,5 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.repository.metadata.ArtifactMetadata;
import org.apache.maven.repository.metadata.GraphConflictResolver;
import org.apache.maven.repository.metadata.MetadataGraph;
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java Wed Jul 15 19:24:20 2009
@@ -5,13 +5,13 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataSource;
import org.apache.maven.repository.legacy.metadata.ResolutionGroup;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/lifecycle-executor.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/lifecycle-executor.txt?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/lifecycle-executor.txt (original)
+++ maven/components/branches/MNG-4221/maven-core/lifecycle-executor.txt Wed Jul 15 19:24:20 2009
@@ -68,7 +68,7 @@
<configuration>
<attached implementation="boolean" default-value="true"/>
- <localRepository implementation="org.apache.maven.artifact.repository.ArtifactRepository">${localRepository}</localRepository>
+ <localRepository implementation="org.apache.maven.repository.legacy.repository.ArtifactRepository">${localRepository}</localRepository>
<resources implementation="java.util.List">${project.resources}</resources>
<repositories implementation="java.util.List">${project.repositories}</repositories>
<remoteArtifactRepositories implementation="java.util.List">${project.remoteArtifactRepositories}</remoteArtifactRepositories>
@@ -143,7 +143,7 @@
</parameter>
<parameter>
<name>localRepository</name>
- <type>org.apache.maven.artifact.repository.ArtifactRepository</type>
+ <type>org.apache.maven.repository.legacy.repository.ArtifactRepository</type>
<required>true</required>
<editable>false</editable>
</parameter>
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java Wed Jul 15 19:24:20 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
public interface ArtifactFilterManager
{
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Wed Jul 15 19:24:20 2009
@@ -25,8 +25,8 @@
import java.util.List;
import java.util.Set;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ExclusionSetFilter;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Wed Jul 15 19:24:20 2009
@@ -28,7 +28,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.exception.DefaultExceptionHandler;
import org.apache.maven.exception.ExceptionHandler;
import org.apache.maven.exception.ExceptionSummary;
@@ -44,6 +43,7 @@
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.repository.DelegatingLocalArtifactRepository;
+import org.apache.maven.repository.legacy.ArtifactUtils;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java Wed Jul 15 19:24:20 2009
@@ -5,18 +5,18 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.OrArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.ResolutionErrorHandler;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.OrArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ScopeArtifactFilter;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java Wed Jul 15 19:24:20 2009
@@ -5,10 +5,10 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public interface ProjectDependenciesResolver
{
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java Wed Jul 15 19:24:20 2009
@@ -4,9 +4,9 @@
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.LocalArtifactRepository;
+import org.apache.maven.repository.legacy.ArtifactUtils;
/**
* An implementation of a repository that knows how to search the Maven reactor for artifacts.
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Wed Jul 15 19:24:20 2009
@@ -21,10 +21,10 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Wed Jul 15 19:24:20 2009
@@ -24,10 +24,10 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.model.Profile;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.logging.Logger;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Wed Jul 15 19:24:20 2009
@@ -27,10 +27,11 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.LegacyArtifactRepositoryAdapter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
@@ -98,10 +99,19 @@
{
return container;
}
+
+ public ArtifactRepository getLocalArtifactRepository()
+ {
+ return request.getLocalRepository();
+ }
+ //
+ // This requires an adapter to present the old interface to client code while
+ // using the new implementation code.
+ //
public ArtifactRepository getLocalRepository()
{
- return request.getLocalRepository();
+ return new LegacyArtifactRepositoryAdapter( request.getLocalRepository() );
}
public List<String> getGoals()
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java Wed Jul 15 19:24:20 2009
@@ -11,9 +11,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.ArtifactUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Wed Jul 15 19:24:20 2009
@@ -31,9 +31,7 @@
import java.util.StringTokenizer;
import org.apache.maven.ProjectDependenciesResolver;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataReadException;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
@@ -55,6 +53,8 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataReadException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java Wed Jul 15 19:24:20 2009
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.CycleDetectedInPluginGraphException;
@@ -33,6 +32,7 @@
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* @author Jason van Zyl
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/NoPluginFoundForPrefixException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/NoPluginFoundForPrefixException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/NoPluginFoundForPrefixException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/NoPluginFoundForPrefixException.java Wed Jul 15 19:24:20 2009
@@ -2,7 +2,7 @@
import java.util.List;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public class NoPluginFoundForPrefixException
extends Exception
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Wed Jul 15 19:24:20 2009
@@ -3,10 +3,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java Wed Jul 15 19:24:20 2009
@@ -26,12 +26,12 @@
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.ModelUtils;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Jul 15 19:24:20 2009
@@ -32,15 +32,10 @@
import org.apache.maven.ArtifactFilterManager;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
-import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
@@ -51,6 +46,11 @@
import org.apache.maven.project.DuplicateArtifactAttachmentException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.ResolutionErrorHandler;
+import org.apache.maven.repository.legacy.resolver.filter.AndArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.filter.ScopeArtifactFilter;
import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java Wed Jul 15 19:24:20 2009
@@ -22,9 +22,9 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
public interface PluginCache
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java Wed Jul 15 19:24:20 2009
@@ -2,9 +2,9 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
/**
* Signifies a failure to load a plugin. This is used to abstract the specific errors which may be
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Wed Jul 15 19:24:20 2009
@@ -17,11 +17,11 @@
import java.util.List;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
/**
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java Wed Jul 15 19:24:20 2009
@@ -1,10 +1,10 @@
package org.apache.maven.plugin;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import org.codehaus.plexus.component.repository.exception.ComponentRepositoryException;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java Wed Jul 15 19:24:20 2009
@@ -19,12 +19,9 @@
* under the License.
*/
-import java.util.List;
-
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.model.Plugin;
+import org.apache.maven.repository.legacy.resolver.AbstractArtifactResolutionException;
/**
* Exception occurring trying to resolve a plugin.
@@ -44,13 +41,6 @@
this.plugin = plugin;
}
- public PluginNotFoundException( Plugin plugin, List<ArtifactRepository> remoteRepositories )
- {
- super( "Plugin could not be found, please check its coordinates for typos", plugin.getGroupId(),
- plugin.getArtifactId(), plugin.getVersion(), "maven-plugin", null, remoteRepositories, null );
- this.plugin = plugin;
- }
-
public Plugin getPlugin()
{
return plugin;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java Wed Jul 15 19:24:20 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.Plugin;
+import org.apache.maven.repository.legacy.resolver.AbstractArtifactResolutionException;
/**
* Exception occurring trying to resolve a plugin.
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java Wed Jul 15 19:24:20 2009
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
public class PluginVersionResolutionException
extends Exception
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Jul 15 19:24:20 2009
@@ -21,12 +21,12 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java Wed Jul 15 19:24:20 2009
@@ -26,13 +26,13 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-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.repository.ArtifactRepository;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Resource;
+import org.apache.maven.repository.legacy.InvalidArtifactRTException;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.handler.manager.ArtifactHandlerManager;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadata;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Wed Jul 15 19:24:20 2009
@@ -21,12 +21,9 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Build;
@@ -43,6 +40,9 @@
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.resolver.ResolutionErrorHandler;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Wed Jul 15 19:24:20 2009
@@ -22,9 +22,9 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelEventListener;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
@Deprecated
public class DefaultProjectBuilderConfiguration
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java Wed Jul 15 19:24:20 2009
@@ -24,10 +24,9 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.ModelEventListener;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public class DefaultProjectBuildingRequest
implements ProjectBuildingRequest
@@ -42,7 +41,7 @@
private MavenProject topProject;
- private int validationLevel = ModelBuildingRequest.VALIDATION_LEVEL_STRICT;
+ private boolean lenientValidation;
private boolean processPlugins;
@@ -168,15 +167,15 @@
return this;
}
- public ProjectBuildingRequest setValidationLevel( int validationLevel )
+ public ProjectBuildingRequest setLenientValidation( boolean lenientValidation )
{
- this.validationLevel = validationLevel;
+ this.lenientValidation = lenientValidation;
return this;
}
- public int getValidationLevel()
+ public boolean istLenientValidation()
{
- return validationLevel;
+ return lenientValidation;
}
public List<String> getActiveProfileIds()
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java Wed Jul 15 19:24:20 2009
@@ -21,8 +21,8 @@
import java.io.File;
-import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.model.validation.ModelValidationResult;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class InvalidProjectModelException
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.io.File;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
public class InvalidProjectVersionException
extends ProjectBuildingException
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Wed Jul 15 19:24:20 2009
@@ -34,13 +34,6 @@
import java.util.Stack;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.model.Build;
import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Contributor;
@@ -68,7 +61,13 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.DependencyResolutionRequiredException;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ManagedVersionMap;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -168,8 +167,6 @@
private Map<String, Object> context;
- private ClassRealm classRealm;
-
//
public MavenProject()
@@ -242,6 +239,13 @@
this.projectBuilderConfiguration = projectBuilderConfiguration;
this.repositorySystem = repositorySystem;
originalModel = model;
+
+ remoteArtifactRepositories = projectBuilderConfiguration.getRemoteRepositories();
+ remoteArtifactRepositories = createArtifactRepositories( model.getRepositories(), remoteArtifactRepositories );
+
+ pluginArtifactRepositories = projectBuilderConfiguration.getPluginArtifactRepositories();
+ pluginArtifactRepositories =
+ createArtifactRepositories( model.getPluginRepositories(), pluginArtifactRepositories );
}
//TODO: need to integrate the effective scope and refactor it out of the MMS
@@ -264,6 +268,35 @@
return artifacts;
}
+
+ private List<ArtifactRepository> createArtifactRepositories( List<Repository> pomRepositories,
+ List<ArtifactRepository> externalRepositories )
+ {
+ List<ArtifactRepository> artifactRepositories = new ArrayList<ArtifactRepository>();
+
+ for ( Repository repository : pomRepositories )
+ {
+ try
+ {
+ artifactRepositories.add( repositorySystem.buildArtifactRepository( repository ) );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+
+ }
+ }
+
+ artifactRepositories = repositorySystem.getMirrors( artifactRepositories );
+
+ if ( externalRepositories != null )
+ {
+ artifactRepositories.addAll( externalRepositories );
+ }
+
+ artifactRepositories = repositorySystem.getEffectiveRepositories( artifactRepositories );
+
+ return artifactRepositories;
+ }
// TODO: Find a way to use <relativePath/> here...it's tricky, because the moduleProject
// usually doesn't have a file associated with it yet.
@@ -383,6 +416,16 @@
{
this.parent = parent;
}
+
+ public void setRemoteArtifactRepositories( List<ArtifactRepository> remoteArtifactRepositories )
+ {
+ this.remoteArtifactRepositories = remoteArtifactRepositories;
+ }
+
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
+ {
+ return remoteArtifactRepositories;
+ }
public boolean hasParent()
{
@@ -1339,21 +1382,6 @@
return build;
}
- public void setRemoteArtifactRepositories( List<ArtifactRepository> remoteArtifactRepositories )
- {
- this.remoteArtifactRepositories = remoteArtifactRepositories;
- }
-
- public List<ArtifactRepository> getRemoteArtifactRepositories()
- {
- if ( remoteArtifactRepositories == null )
- {
- remoteArtifactRepositories = new ArrayList<ArtifactRepository>();
- }
-
- return remoteArtifactRepositories;
- }
-
public void setPluginArtifactRepositories( List<ArtifactRepository> pluginArtifactRepositories )
{
this.pluginArtifactRepositories = pluginArtifactRepositories;
@@ -1365,11 +1393,6 @@
*/
public List<ArtifactRepository> getPluginArtifactRepositories()
{
- if ( pluginArtifactRepositories == null )
- {
- pluginArtifactRepositories = new ArrayList<ArtifactRepository>();
- }
-
return pluginArtifactRepositories;
}
@@ -1982,25 +2005,4 @@
}
return context.get( key );
}
-
- /**
- * Sets the project's class realm.
- *
- * @param classRealm The class realm hosting the build extensions of this project, may be {@code null}.
- */
- public void setClassRealm( ClassRealm classRealm )
- {
- this.classRealm = classRealm;
- }
-
- /**
- * Gets the project's class realm. This class realm hosts the build extensions of the project.
- *
- * @return The project's class realm or {@code null}.
- */
- public ClassRealm getClassRealm()
- {
- return classRealm;
- }
-
}
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Wed Jul 15 19:24:20 2009
@@ -19,8 +19,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
@Deprecated
public interface MavenProjectBuilder
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Wed Jul 15 19:24:20 2009
@@ -3,8 +3,8 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
@Deprecated
public interface ProjectBuilderConfiguration
Modified: maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java (original)
+++ maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java Wed Jul 15 19:24:20 2009
@@ -3,12 +3,12 @@
import java.io.File;
import java.io.IOException;
-import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.profiles.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/*