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 [6/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/...
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.installer;
+package org.apache.maven.repository.legacy.installer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,9 +24,9 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataInstallationException;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataInstallationException;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.15
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java Wed Jul 15 19:24:20 2009
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataStoreException;
/**
* Contains metadata about an artifact, and methods to retrieve/store it from an artifact repository.
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java Wed Jul 15 19:24:20 2009
@@ -22,8 +22,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-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.versioning.ArtifactVersion;
/**
* Provides some metadata operations, like querying the remote repository for a list of versions available for an
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java Wed Jul 15 19:24:20 2009
@@ -23,7 +23,7 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public class ResolutionGroup
{
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository;
+package org.apache.maven.repository.legacy.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -17,7 +17,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
public interface ArtifactRepository
{
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.10
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository;
+package org.apache.maven.repository.legacy.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -15,8 +15,8 @@
* the License.
*/
-import org.apache.maven.artifact.UnknownRepositoryLayoutException;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.UnknownRepositoryLayoutException;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
/** @author jdcasey */
public interface ArtifactRepositoryFactory
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository;
+package org.apache.maven.repository.legacy.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository;
+package org.apache.maven.repository.legacy.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.wagon.repository.Repository;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.10
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository;
+package org.apache.maven.repository.legacy.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.artifact.UnknownRepositoryLayoutException;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.UnknownRepositoryLayoutException;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository;
+package org.apache.maven.repository.legacy.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
//TODO: http://jira.codehaus.org/browse/MNG-4215
//TODO: completely separate local and remote artifact repositories
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.layout;
+package org.apache.maven.repository.legacy.repository.layout;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/** @author jdcasey */
public interface ArtifactRepositoryLayout
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.layout;
+package org.apache.maven.repository.legacy.repository.layout;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.10
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java Wed Jul 15 19:24:20 2009
@@ -1,9 +1,9 @@
-package org.apache.maven.artifact.repository.layout;
+package org.apache.maven.repository.legacy.repository.layout;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.layout;
+package org.apache.maven.repository.legacy.repository.layout;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.9
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,12 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.Snapshot;
+import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.Versioning;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* Metadata for the artifact directory of the repository.
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -24,11 +24,14 @@
import java.util.Map;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.Snapshot;
+import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.repository.legacy.UpdateCheckManager;
import org.apache.maven.repository.legacy.WagonManager;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.component.annotations.Component;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,9 @@
* under the License.
*/
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.Plugin;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import java.util.Iterator;
import java.util.List;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@
*/
//import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* Describes repository directory metadata.
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public interface RepositoryMetadataManager
{
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.repository.metadata;
+package org.apache.maven.repository.legacy.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.Snapshot;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* Metadata for the artifact version directory of the repository.