You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/06/28 11:39:53 UTC
svn commit: r789077 [2/4] - in /maven/components/trunk/maven-compat: ./
src/main/java/org/apache/maven/artifact/deployer/
src/main/java/org/apache/maven/artifact/factory/
src/main/java/org/apache/maven/artifact/installer/
src/main/java/org/apache/maven...
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -17,13 +17,10 @@
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -42,15 +39,13 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.component.configurator.BasicComponentConfigurator;
-import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
-import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
+//TODO: remove the update check manager
+//TODO: separate into retriever and publisher
+//TODO: rmeove hardcoding of checksum logic
@Component(role = WagonManager.class)
public class DefaultWagonManager
implements WagonManager
@@ -66,278 +61,33 @@
@Requirement
private PlexusContainer container;
- /** Map( String, XmlPlexusConfiguration ) with the repository id and the wagon configuration */
- private Map<String, XmlPlexusConfiguration> serverConfigurationMap = new HashMap<String, XmlPlexusConfiguration>();
-
@Requirement(role = Wagon.class)
- private Map<String,Wagon> wagons;
+ private Map<String, Wagon> wagons;
@Requirement
private UpdateCheckManager updateCheckManager;
- private String httpUserAgent = "Apache-Maven/3.0-alpha-1";
-
- private TransferListener downloadMonitor;
-
- public void setDownloadMonitor( TransferListener downloadMonitor )
- {
- this.downloadMonitor = downloadMonitor;
- }
-
- public Wagon getWagon( Repository repository )
- throws UnsupportedProtocolException, WagonConfigurationException
- {
- String protocol = repository.getProtocol();
-
- if ( protocol == null )
- {
- throw new UnsupportedProtocolException( "The repository " + repository + " does not specify a protocol" );
- }
-
- Wagon wagon = getWagon( protocol );
-
- configureWagon( wagon, repository.getId(), protocol );
-
- return wagon;
- }
-
- public Wagon getWagon( String protocol )
- throws UnsupportedProtocolException
- {
- if ( protocol == null )
- {
- throw new UnsupportedProtocolException( "Unspecified protocol" );
- }
-
- String hint = protocol.toLowerCase( java.util.Locale.ENGLISH );
- Wagon wagon = (Wagon) wagons.get( hint );
-
- if ( wagon == null )
- {
- throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: " + protocol );
- }
-
- return wagon;
- }
-
- public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository )
- throws TransferFailedException
- {
- putRemoteFile( deploymentRepository, source, deploymentRepository.pathOf( artifact ), downloadMonitor );
- }
-
- public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository, TransferListener downloadMonitor )
- throws TransferFailedException
- {
- putRemoteFile( deploymentRepository, source, deploymentRepository.pathOf( artifact ), downloadMonitor );
- }
-
- public void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
- throws TransferFailedException
- {
- logger.info( "Uploading " + artifactMetadata );
- putRemoteFile( repository, source, repository.pathOfRemoteRepositoryMetadata( artifactMetadata ), null );
- }
-
- public void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
- throws TransferFailedException
- {
- String protocol = repository.getProtocol();
-
- Wagon wagon;
- try
- {
- wagon = getWagon( protocol );
-
- configureWagon( wagon, repository );
- }
- catch ( UnsupportedProtocolException e )
- {
- throw new TransferFailedException( "Unsupported Protocol: '" + protocol + "': " + e.getMessage(), e );
- }
-
- if ( downloadMonitor != null )
- {
- wagon.addTransferListener( downloadMonitor );
- }
-
- Map<String, ChecksumObserver> checksums = new HashMap<String, ChecksumObserver>( 2 );
-
- Map<String, String> sums = new HashMap<String, String>( 2 );
-
- // TODO: configure these on the repository
- for ( int i = 0; i < CHECKSUM_IDS.length; i++ )
- {
- checksums.put( CHECKSUM_IDS[i], addChecksumObserver( wagon, CHECKSUM_ALGORITHMS[i] ) );
- }
-
- try
- {
- try
- {
- wagon.connect( new Repository( repository.getId(), repository.getUrl() ) );
-
- wagon.put( source, remotePath );
- }
- finally
- {
- if ( downloadMonitor != null )
- {
- wagon.removeTransferListener( downloadMonitor );
- }
- }
-
- // Pre-store the checksums as any future puts will overwrite them
- for ( String extension : checksums.keySet() )
- {
- ChecksumObserver observer = checksums.get( extension );
- sums.put( extension, observer.getActualChecksum() );
- }
-
- // We do this in here so we can checksum the artifact metadata too, otherwise it could be metadata itself
- for ( String extension : checksums.keySet() )
- {
- // TODO: shouldn't need a file intermediatary - improve wagon to take a stream
- File temp = File.createTempFile( "maven-artifact", null );
- temp.deleteOnExit();
- FileUtils.fileWrite( temp.getAbsolutePath(), "UTF-8", sums.get( extension ) );
-
- wagon.put( temp, remotePath + "." + extension );
- }
- }
- catch ( ConnectionException e )
- {
- throw new TransferFailedException( "Connection failed: " + e.getMessage(), e );
- }
- catch ( AuthenticationException e )
- {
- throw new TransferFailedException( "Authentication failed: " + e.getMessage(), e );
- }
- catch ( AuthorizationException e )
- {
- throw new TransferFailedException( "Authorization failed: " + e.getMessage(), e );
- }
- catch ( ResourceDoesNotExistException e )
- {
- throw new TransferFailedException( "Resource to deploy not found: " + e.getMessage(), e );
- }
- catch ( IOException e )
- {
- throw new TransferFailedException( "Error creating temporary file for deployment: " + e.getMessage(), e );
- }
- finally
- {
- // Remove every checksum listener
- for ( String aCHECKSUM_IDS : CHECKSUM_IDS )
- {
- TransferListener checksumListener = checksums.get( aCHECKSUM_IDS );
- if ( checksumListener != null )
- {
- wagon.removeTransferListener( checksumListener );
- }
- }
-
- disconnectWagon( wagon );
-
- releaseWagon( protocol, wagon );
- }
- }
-
- private ChecksumObserver addChecksumObserver( Wagon wagon, String algorithm )
- throws TransferFailedException
- {
- try
- {
- ChecksumObserver checksumObserver = new ChecksumObserver( algorithm );
- wagon.addTransferListener( checksumObserver );
- return checksumObserver;
- }
- catch ( NoSuchAlgorithmException e )
- {
- throw new TransferFailedException( "Unable to add checksum for unsupported algorithm " + algorithm, e );
- }
- }
-
- // NOTE: It is not possible that this method throws TransferFailedException under current conditions.
- // FIXME: Change the throws clause to reflect the fact that we're never throwing TransferFailedException
- public void getArtifact( Artifact artifact, ArtifactRepository remoteRepository, boolean force )
- throws TransferFailedException, ResourceDoesNotExistException
- {
- getArtifact( artifact, remoteRepository, downloadMonitor, force );
- }
-
- public void getArtifact( Artifact artifact, ArtifactRepository remoteRepository )
- throws TransferFailedException, ResourceDoesNotExistException
- {
- getArtifact( artifact, remoteRepository, downloadMonitor, true );
- }
-
- public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener downloadMonitor )
- throws TransferFailedException, ResourceDoesNotExistException
- {
- getArtifact( artifact, remoteRepositories, downloadMonitor, true );
- }
-
- public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener downloadMonitor, boolean force )
- throws TransferFailedException, ResourceDoesNotExistException
- {
- for ( ArtifactRepository repository : remoteRepositories )
- {
- try
- {
- getArtifact( artifact, repository, downloadMonitor, force );
-
- if ( artifact.isResolved() )
- {
- break;
- }
- }
- catch ( ResourceDoesNotExistException e )
- {
- // This one we will eat when looking through remote repositories
- // because we want to cycle through them all before squawking.
-
- logger.debug( "Unable to get resource '" + artifact.getId() + "' from repository " + repository.getId() + " (" + repository.getUrl() + ")", e );
- }
- catch ( TransferFailedException e )
- {
- logger.debug( "Unable to get resource '" + artifact.getId() + "' from repository " + repository.getId() + " (" + repository.getUrl() + ")", e );
- }
- }
-
- // if it already exists locally we were just trying to force it - ignore the update
- if ( !artifact.getFile().exists() )
- {
- throw new ResourceDoesNotExistException( "Unable to download the artifact from any repository" );
- }
- }
-
+ //
+ // Retriever
+ //
public void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener downloadMonitor )
throws TransferFailedException, ResourceDoesNotExistException
{
- getArtifact( artifact, repository, downloadMonitor, true );
- }
-
- //TODO: all of this needs to move into the repository system
-
- public void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener downloadMonitor, boolean force )
- throws TransferFailedException, ResourceDoesNotExistException
- {
String remotePath = repository.pathOf( artifact );
-
+
ArtifactRepositoryPolicy policy = artifact.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
-
+
boolean updateCheckIsRequired = updateCheckManager.isUpdateRequired( artifact, repository );
-
+
if ( !policy.isEnabled() )
- {
+ {
logger.debug( "Skipping disabled repository " + repository.getId() );
}
-
+
// If the artifact is a snapshot, we need to determine whether it's time to check this repository for an update:
// 1. If it's forced, then check
// 2. If the updateInterval has been exceeded since the last check for this artifact on this repository, then check.
- else if ( artifact.isSnapshot() && ( force || updateCheckIsRequired ) )
+ else if ( artifact.isSnapshot() && updateCheckIsRequired )
{
logger.debug( "Trying repository " + repository.getId() );
@@ -362,7 +112,7 @@
else if ( "pom".equals( artifact.getType() ) && !artifact.getFile().exists() )
{
// if POM is not present locally, try and get it if it's forced, out of date, or has not been attempted yet
- if ( force || updateCheckManager.isPomUpdateRequired( artifact, repository ) )
+ if ( updateCheckManager.isPomUpdateRequired( artifact, repository ) )
{
logger.debug( "Trying repository " + repository.getId() );
@@ -408,6 +158,40 @@
}
}
+ public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener downloadMonitor )
+ throws TransferFailedException, ResourceDoesNotExistException
+ {
+ for ( ArtifactRepository repository : remoteRepositories )
+ {
+ try
+ {
+ getArtifact( artifact, repository, downloadMonitor );
+
+ if ( artifact.isResolved() )
+ {
+ break;
+ }
+ }
+ catch ( ResourceDoesNotExistException e )
+ {
+ // This one we will eat when looking through remote repositories
+ // because we want to cycle through them all before squawking.
+
+ logger.debug( "Unable to get resource '" + artifact.getId() + "' from repository " + repository.getId() + " (" + repository.getUrl() + ")", e );
+ }
+ catch ( TransferFailedException e )
+ {
+ logger.debug( "Unable to get resource '" + artifact.getId() + "' from repository " + repository.getId() + " (" + repository.getUrl() + ")", e );
+ }
+ }
+
+ // if it already exists locally we were just trying to force it - ignore the update
+ if ( !artifact.getFile().exists() )
+ {
+ throw new ResourceDoesNotExistException( "Unable to download the artifact from any repository" );
+ }
+ }
+
public void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository repository, File destination, String checksumPolicy )
throws TransferFailedException, ResourceDoesNotExistException
{
@@ -428,20 +212,18 @@
throws TransferFailedException, ResourceDoesNotExistException
{
String protocol = repository.getProtocol();
-
+
Wagon wagon;
try
{
wagon = getWagon( protocol );
-
- configureWagon( wagon, repository );
}
catch ( UnsupportedProtocolException e )
{
throw new TransferFailedException( "Unsupported Protocol: '" + protocol + "': " + e.getMessage(), e );
}
-
+
if ( downloadMonitor != null )
{
wagon.addTransferListener( downloadMonitor );
@@ -454,7 +236,7 @@
boolean downloaded = false;
try
- {
+ {
wagon.connect( new Repository( repository.getId(), repository.getUrl() ) );
boolean firstRun = true;
@@ -635,6 +417,139 @@
}
}
+ //
+ // Publisher
+ //
+ public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository, TransferListener downloadMonitor )
+ throws TransferFailedException
+ {
+ putRemoteFile( deploymentRepository, source, deploymentRepository.pathOf( artifact ), downloadMonitor );
+ }
+
+ public void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
+ throws TransferFailedException
+ {
+ logger.info( "Uploading " + artifactMetadata );
+ putRemoteFile( repository, source, repository.pathOfRemoteRepositoryMetadata( artifactMetadata ), null );
+ }
+
+ public void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
+ throws TransferFailedException
+ {
+ String protocol = repository.getProtocol();
+
+ Wagon wagon;
+ try
+ {
+ wagon = getWagon( protocol );
+ }
+ catch ( UnsupportedProtocolException e )
+ {
+ throw new TransferFailedException( "Unsupported Protocol: '" + protocol + "': " + e.getMessage(), e );
+ }
+
+ if ( downloadMonitor != null )
+ {
+ wagon.addTransferListener( downloadMonitor );
+ }
+
+ Map<String, ChecksumObserver> checksums = new HashMap<String, ChecksumObserver>( 2 );
+
+ Map<String, String> sums = new HashMap<String, String>( 2 );
+
+ // TODO: configure these on the repository
+ for ( int i = 0; i < CHECKSUM_IDS.length; i++ )
+ {
+ checksums.put( CHECKSUM_IDS[i], addChecksumObserver( wagon, CHECKSUM_ALGORITHMS[i] ) );
+ }
+
+ try
+ {
+ try
+ {
+ wagon.connect( new Repository( repository.getId(), repository.getUrl() ) );
+
+ wagon.put( source, remotePath );
+ }
+ finally
+ {
+ if ( downloadMonitor != null )
+ {
+ wagon.removeTransferListener( downloadMonitor );
+ }
+ }
+
+ // Pre-store the checksums as any future puts will overwrite them
+ for ( String extension : checksums.keySet() )
+ {
+ ChecksumObserver observer = checksums.get( extension );
+ sums.put( extension, observer.getActualChecksum() );
+ }
+
+ // We do this in here so we can checksum the artifact metadata too, otherwise it could be metadata itself
+ for ( String extension : checksums.keySet() )
+ {
+ // TODO: shouldn't need a file intermediatary - improve wagon to take a stream
+ File temp = File.createTempFile( "maven-artifact", null );
+ temp.deleteOnExit();
+ FileUtils.fileWrite( temp.getAbsolutePath(), "UTF-8", sums.get( extension ) );
+
+ wagon.put( temp, remotePath + "." + extension );
+ }
+ }
+ catch ( ConnectionException e )
+ {
+ throw new TransferFailedException( "Connection failed: " + e.getMessage(), e );
+ }
+ catch ( AuthenticationException e )
+ {
+ throw new TransferFailedException( "Authentication failed: " + e.getMessage(), e );
+ }
+ catch ( AuthorizationException e )
+ {
+ throw new TransferFailedException( "Authorization failed: " + e.getMessage(), e );
+ }
+ catch ( ResourceDoesNotExistException e )
+ {
+ throw new TransferFailedException( "Resource to deploy not found: " + e.getMessage(), e );
+ }
+ catch ( IOException e )
+ {
+ throw new TransferFailedException( "Error creating temporary file for deployment: " + e.getMessage(), e );
+ }
+ finally
+ {
+ // Remove every checksum listener
+ for ( String aCHECKSUM_IDS : CHECKSUM_IDS )
+ {
+ TransferListener checksumListener = checksums.get( aCHECKSUM_IDS );
+ if ( checksumListener != null )
+ {
+ wagon.removeTransferListener( checksumListener );
+ }
+ }
+
+ disconnectWagon( wagon );
+
+ releaseWagon( protocol, wagon );
+ }
+ }
+
+ private ChecksumObserver addChecksumObserver( Wagon wagon, String algorithm )
+ throws TransferFailedException
+ {
+ try
+ {
+ ChecksumObserver checksumObserver = new ChecksumObserver( algorithm );
+ wagon.addTransferListener( checksumObserver );
+ return checksumObserver;
+ }
+ catch ( NoSuchAlgorithmException e )
+ {
+ throw new TransferFailedException( "Unable to add checksum for unsupported algorithm " + algorithm, e );
+ }
+ }
+
private void handleChecksumFailure( String checksumPolicy, String message, Throwable cause )
throws ChecksumFailedException
{
@@ -729,95 +644,23 @@
}
}
- /**
- * Checks the URL to see if this repository refers to an external repository
- *
- * @param originalRepository
- * @return true if external.
- */
- public boolean isExternalRepo( ArtifactRepository originalRepository )
+ @Deprecated
+ public Wagon getWagon( String protocol )
+ throws UnsupportedProtocolException
{
- try
- {
- URL url = new URL( originalRepository.getUrl() );
- return !( url.getHost().equals( "localhost" ) || url.getHost().equals( "127.0.0.1" ) || url.getProtocol().equals( "file" ) );
- }
- catch ( MalformedURLException e )
+ if ( protocol == null )
{
- // bad url just skip it here. It should have been validated already, but the wagon lookup will deal with it
- return false;
+ throw new UnsupportedProtocolException( "Unspecified protocol" );
}
- }
-
- /**
- * Applies the server configuration to the wagon
- *
- * @param wagon the wagon to configure
- * @param repository the repository that has the configuration
- * @throws WagonConfigurationException wraps any error given during configuration of the wagon
- * instance
- */
- private void configureWagon( Wagon wagon, ArtifactRepository repository )
- throws WagonConfigurationException
- {
- configureWagon( wagon, repository.getId(), repository.getProtocol() );
- }
- private void configureWagon( Wagon wagon, String repositoryId, String protocol )
- throws WagonConfigurationException
- {
- PlexusConfiguration config = (PlexusConfiguration) serverConfigurationMap.get( repositoryId );
+ String hint = protocol.toLowerCase( java.util.Locale.ENGLISH );
+ Wagon wagon = (Wagon) wagons.get( hint );
- if ( config != null )
+ if ( wagon == null )
{
- ComponentConfigurator componentConfigurator = null;
-
- try
- {
- componentConfigurator = new BasicComponentConfigurator();
-
- componentConfigurator.configureComponent( wagon, config, container.getContainerRealm() );
- }
- catch ( ComponentConfigurationException e )
- {
- throw new WagonConfigurationException( repositoryId, "Unable to apply wagon configuration.", e );
- }
- finally
- {
- if ( componentConfigurator != null )
- {
- try
- {
- container.release( componentConfigurator );
- }
- catch ( ComponentLifecycleException e )
- {
- logger.error( "Problem releasing configurator - ignoring: " + e.getMessage() );
- }
- }
-
- }
+ throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: " + protocol );
}
- }
- /**
- * {@inheritDoc}
- */
- public void setHttpUserAgent( String userAgent )
- {
- this.httpUserAgent = userAgent;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getHttpUserAgent()
- {
- return httpUserAgent;
- }
-
- public Set<String> getSupportProtocols()
- {
- return wagons.keySet();
+ return wagon;
}
}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.29
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java Sun Jun 28 09:39:49 2009
@@ -1,99 +1,59 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
- * 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.
+ * 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 java.io.File;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.UnsupportedProtocolException;
-import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.events.TransferListener;
-import org.apache.maven.wagon.repository.Repository;
-/**
- * Manages <a href="http://maven.apache.org/wagon">Wagon</a> related operations in Maven.
- *
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
- * @version $Id$
- */
public interface WagonManager
{
-
- void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener downloadMonitor, boolean forceUpdateCheck )
+ //
+ // Retriever
+ //
+ void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener transferListener )
throws TransferFailedException, ResourceDoesNotExistException;
- void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository, TransferListener downloadMonitor )
- throws TransferFailedException;
-
- /**
- * Get a Wagon provider that understands the protocol passed as argument.
- * It doesn't configure the Wagon.
- *
- * @param protocol the protocol the {@link Wagon} will handle
- * @return the {@link Wagon} instance able to handle the protocol provided
- * @throws UnsupportedProtocolException if there is no provider able to handle the protocol
- * @deprecated prone to errors. use {@link #getWagon(Repository)} instead.
- */
- Wagon getWagon( String protocol )
- throws UnsupportedProtocolException;
-
- /**
- * Get a Wagon provider for the provided repository.
- * It will configure the Wagon for that repository.
- *
- * @param repository the repository
- * @return the {@link Wagon} instance that can be used to connect to the repository
- * @throws UnsupportedProtocolException if there is no provider able to handle the protocol
- * @throws WagonConfigurationException if the wagon can't be configured for the repository
- */
- Wagon getWagon( Repository repository )
- throws UnsupportedProtocolException, WagonConfigurationException;
-
- void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener tl, boolean force )
+ void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener transferListener )
throws TransferFailedException, ResourceDoesNotExistException;
- void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener tl )
+ void getRemoteFile( ArtifactRepository repository, File destination, String remotePath, TransferListener downloadMonitor, String checksumPolicy, boolean force )
throws TransferFailedException, ResourceDoesNotExistException;
- void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
- throws TransferFailedException;
-
void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository remoteRepository, File destination, String checksumPolicy )
throws TransferFailedException, ResourceDoesNotExistException;
void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository remoteRepository, File file, String checksumPolicyWarn )
- throws TransferFailedException, ResourceDoesNotExistException;
-
- Set<String> getSupportProtocols();
-
- void getRemoteFile( ArtifactRepository repository, File destination, String remotePath, TransferListener downloadMonitor, String checksumPolicy, boolean force )
throws TransferFailedException, ResourceDoesNotExistException;
-
+
+ //
+ // Deployer
+ //
+ void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository, TransferListener downloadMonitor )
+ throws TransferFailedException;
+
void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
throws TransferFailedException;
-
+
+ void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
+ throws TransferFailedException;
}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.11
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/metadata:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/metadata:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/metadata:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/metadata:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/metadata:751453-767358,767708-768832
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java?rev=789077&r1=789018&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.metadata;
+package org.apache.maven.repository.legacy.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java?rev=789077&r1=789018&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.metadata;
+package org.apache.maven.repository.legacy.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java?rev=789077&r1=789018&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.metadata;
+package org.apache.maven.repository.legacy.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,7 @@
* @version $Id$
*/
public class ArtifactMetadataRetrievalException
- extends Exception
+ extends Exception
{
private Artifact artifact;
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java?rev=789077&r1=789018&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.metadata;
+package org.apache.maven.repository.legacy.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java?rev=789077&r1=789018&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.metadata;
+package org.apache.maven.repository.legacy.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java (from r788972, 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/repository/legacy/resolver/ArtifactCollector.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,10 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.conflict.ConflictResolver;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
/**
* Artifact collector - takes a set of original artifacts and resolves all of the best versions to use
@@ -36,6 +38,7 @@
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
+@Deprecated
public interface ArtifactCollector
{
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ArtifactCollector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java (from r788972, 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/repository/legacy/resolver/DefaultArtifactCollector.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -33,13 +33,19 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.conflict.ConflictResolver;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.CyclicDependencyException;
+import org.apache.maven.artifact.resolver.ResolutionListener;
+import org.apache.maven.artifact.resolver.ResolutionListenerForDepMgmt;
+import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -438,9 +444,7 @@
List<ArtifactVersion> versions = artifact.getAvailableVersions();
if ( versions == null )
{
- versions =
- source.retrieveAvailableVersions( artifact, localRepository,
- childRemoteRepositories );
+ versions = source.retrieveAvailableVersions( artifact, localRepository, childRemoteRepositories );
artifact.setAvailableVersions( versions );
}
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:751453-767358,767708-768832
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java:751453-767358,767708-768832
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java?rev=789077&r1=788972&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import java.util.Collection;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java Sun Jun 28 09:39:49 2009
@@ -1,13 +1,10 @@
-package org.apache.maven.artifact.transform;
+package org.apache.maven.repository.metadata;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataResolutionException;
-import org.apache.maven.artifact.resolver.metadata.MetadataTreeNode;
/**
* classpath container that is aware of the classpath scope
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java Sun Jun 28 09:39:49 2009
@@ -1,7 +1,6 @@
-package org.apache.maven.artifact.transform;
+package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
/**
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.transform;
+package org.apache.maven.repository.metadata;
import java.util.ArrayList;
import java.util.Arrays;
@@ -6,12 +6,6 @@
import java.util.List;
import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionException;
-import org.apache.maven.artifact.resolver.conflict.GraphConflictResolver;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java Sun Jun 28 09:39:49 2009
@@ -1,6 +1,5 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.codehaus.plexus.component.annotations.Component;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,11 +24,6 @@
import java.util.TreeSet;
import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
-import org.apache.maven.artifact.resolver.metadata.MetadataResolutionException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:751453-767358,767708-768832