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/30 05:04:36 UTC
svn commit: r789541 - in /maven/components/trunk: ./ maven-compat/
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-compat/src/main/java/org/apache/maven/execution/
maven-compat/src/main/java/org/apache/maven/project/ maven-compat/s...
Author: jvanzyl
Date: Tue Jun 30 03:04:34 2009
New Revision: 789541
URL: http://svn.apache.org/viewvc?rev=789541&view=rev
Log:
MNG-4221: putting the repository and compat modules together while completely hide the legacy implementation
Added:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (with props)
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (with props)
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java (with props)
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java (with props)
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Authentication.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
- copied, changed from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java (contents, props changed)
- copied, changed from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MirrorBuilder.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Proxy.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
- copied, changed from r789083, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
- copied, changed from r789083, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/security/ (props changed)
- copied from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security/
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java (props changed)
- copied unchanged from r789083, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java (contents, props changed)
- copied, changed from r789083, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java (contents, props changed)
- copied, changed from r789083, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
Removed:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/security/DefaultRepositorySystemSecurityManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/security/RepositorySystemSecurityManager.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
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/DefaultMirrorBuilder.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.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/MirrorBuilder.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Proxy.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/UserLocalArtifactRepository.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security/
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
Modified:
maven/components/trunk/maven-compat/pom.xml
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=789541&r1=789540&r2=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Tue Jun 30 03:04:34 2009
@@ -57,6 +57,12 @@
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
+
+
+ <dependency>
+ <groupId>org.jsecurity</groupId>
+ <artifactId>jsecurity</artifactId>
+ </dependency>
</dependencies>
<build>
Added: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=789541&view=auto
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (added)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+package org.apache.maven.artifact.resolver;
+
+@Deprecated
+public interface ArtifactCollector
+ extends org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector
+{
+}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=789541&r1=789540&r2=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java Tue Jun 30 03:04:34 2009
@@ -24,7 +24,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.repository.legacy.resolver.DefaultArtifactCollector;
+import org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector;
/**
* Specific problems during resolution that we want to account for:
@@ -162,7 +162,7 @@
/**
* @TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
* {@link #getVersionRangeViolation(int)} but it's not used like that in
- * {@link DefaultArtifactCollector}
+ * {@link DefaultLegacyArtifactCollector}
*/
public ArtifactResolutionResult addVersionRangeViolation( Exception e )
{
Added: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=789541&view=auto
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (added)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Tue Jun 30 03:04:34 2009
@@ -0,0 +1,11 @@
+package org.apache.maven.artifact.resolver;
+
+import org.codehaus.plexus.component.annotations.Component;
+
+@Deprecated
+@Component(role=ArtifactCollector.class)
+public class DefaultArtifactCollector
+ extends org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector
+ implements ArtifactCollector
+{
+}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=789541&r1=789540&r2=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Tue Jun 30 03:04:34 2009
@@ -37,7 +37,6 @@
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.repository.legacy.WagonManager;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadata;
-import org.apache.maven.repository.legacy.resolver.ArtifactCollector;
import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager;
import org.apache.maven.wagon.ResourceDoesNotExistException;
Added: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java?rev=789541&view=auto
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java (added)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java Tue Jun 30 03:04:34 2009
@@ -0,0 +1,87 @@
+package org.apache.maven.execution;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.util.IOUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Describes runtime information about the application.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+@Deprecated
+@Component(role=RuntimeInformation.class)
+public class DefaultRuntimeInformation
+ implements RuntimeInformation, Initializable
+{
+ private static final String MAVEN_GROUPID = "org.apache.maven";
+
+ private static final String MAVEN_PROPERTIES = "META-INF/maven/" + MAVEN_GROUPID + "/maven-core/pom.properties";
+
+ private ArtifactVersion applicationVersion;
+
+ public ArtifactVersion getApplicationVersion()
+ {
+ return applicationVersion;
+ }
+
+ public void initialize()
+ throws InitializationException
+ {
+ InputStream resourceAsStream = null;
+ try
+ {
+ Properties properties = new Properties();
+ resourceAsStream = getClass().getClassLoader().getResourceAsStream( MAVEN_PROPERTIES );
+
+ if ( resourceAsStream == null )
+ {
+ throw new IllegalStateException( "Unable to find Maven properties in classpath: " + MAVEN_PROPERTIES );
+ }
+ properties.load( resourceAsStream );
+
+ String property = properties.getProperty( "version" );
+ if ( property == null )
+ {
+ throw new InitializationException( "maven-core properties did not include the version" );
+ }
+
+ applicationVersion = new DefaultArtifactVersion( property );
+ }
+ catch ( IOException e )
+ {
+ throw new InitializationException( "Unable to read properties file from maven-core", e );
+ }
+ finally
+ {
+ IOUtil.close( resourceAsStream );
+ }
+ }
+}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java?rev=789541&view=auto
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java (added)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java Tue Jun 30 03:04:34 2009
@@ -0,0 +1,33 @@
+package org.apache.maven.execution;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+
+/**
+ * Describes runtime information about the application.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public interface RuntimeInformation
+{
+ ArtifactVersion getApplicationVersion();
+}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Authentication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Authentication.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Authentication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (from r789083, 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-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java&p1=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java&r1=789083&r2=789541&rev=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Tue Jun 30 03:04:34 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.legacy;
+package org.apache.maven.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -51,6 +51,7 @@
import org.apache.maven.repository.MetadataResolutionResult;
import org.apache.maven.repository.MirrorBuilder;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.WagonManager;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.events.TransferListener;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java (from r789083, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java&p1=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java&r1=789083&r2=789541&rev=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java Tue Jun 30 03:04:34 2009
@@ -30,7 +30,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.CyclicDependencyException;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.repository.legacy.resolver.DefaultArtifactCollector;
+import org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector;
/**
@@ -166,7 +166,7 @@
/**
* @TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
* {@link #getVersionRangeViolation(int)} but it's not used like that in
- * {@link DefaultArtifactCollector}
+ * {@link DefaultLegacyArtifactCollector}
*/
public MetadataResolutionResult addVersionRangeViolation( Exception e )
{
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Proxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Proxy.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/Proxy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (from r789083, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java&r1=789083&r2=789541&rev=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Tue Jun 30 03:04:34 2009
@@ -54,9 +54,9 @@
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author Jason van Zyl
*/
-@Component(role=ArtifactCollector.class)
-public class DefaultArtifactCollector
- implements ArtifactCollector
+@Component(role=LegacyArtifactCollector.class)
+public class DefaultLegacyArtifactCollector
+ implements LegacyArtifactCollector
{
@Requirement(hint="nearest")
private ConflictResolver defaultConflictResolver;
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java (from r789083, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java&r1=789083&r2=789541&rev=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java Tue Jun 30 03:04:34 2009
@@ -39,7 +39,7 @@
* @version $Id$
*/
@Deprecated
-public interface ArtifactCollector
+public interface LegacyArtifactCollector
{
ArtifactResolutionResult collect( Set<Artifact> artifacts,
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/security/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/security:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/security:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/security:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/security:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/security:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/security:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security/DefaultRepositorySystemSecurityManager.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:738757-738972
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/security/RepositorySystemSecurityManager.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:738757-738972
+/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java (from r789083, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java&p1=maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java&r1=789083&r2=789541&rev=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java Tue Jun 30 03:04:34 2009
@@ -27,6 +27,7 @@
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.LegacyRepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
/**
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:738757-738972
+/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/DummyArtifactMetadataSource.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java (from r789083, maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java&p1=maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java&r1=789083&r2=789541&rev=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java Tue Jun 30 03:04:34 2009
@@ -22,6 +22,7 @@
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.codehaus.plexus.PlexusTestCase;
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 30 03:04:34 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:738757-738972
+/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:751453-767358,767708-768832
Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java?rev=789541&r1=789540&r2=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java Tue Jun 30 03:04:34 2009
@@ -47,7 +47,7 @@
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.resolver.ArtifactCollector;
+import org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -59,7 +59,7 @@
public class DefaultArtifactCollectorTest
extends PlexusTestCase
{
- private ArtifactCollector artifactCollector;
+ private LegacyArtifactCollector artifactCollector;
private ArtifactFactory artifactFactory;
@@ -77,7 +77,7 @@
source = new Source();
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- artifactCollector = (ArtifactCollector) lookup( ArtifactCollector.class );
+ artifactCollector = (LegacyArtifactCollector) lookup( LegacyArtifactCollector.class );
projectArtifact = createArtifactSpec( "project", "1.0", null );
}
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java?rev=789541&r1=789540&r2=789541&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java Tue Jun 30 03:04:34 2009
@@ -1,8 +1,8 @@
package org.apache.maven.project;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.repository.LegacyRepositorySystem;
import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.repository.legacy.LegacyRepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=789541&r1=789540&r2=789541&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Jun 30 03:04:34 2009
@@ -137,7 +137,10 @@
<module>maven-model-builder</module>
<module>maven-embedder</module>
<module>maven-compat</module>
+ <!--
+ While working on the compatibility layer I've merged the code with maven-compat
<module>maven-repository</module>
+ -->
</modules>
<scm>