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 [5/9] - in /maven/components/branches/MNG-4221:
maven-compat/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/src/main/java/org/apache/maven/artifact/...
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java Wed Jul 15 19:24:20 2009
@@ -20,8 +20,8 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.MavenArtifactRepository;
public abstract class LocalArtifactRepository
extends MavenArtifactRepository
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MirrorBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MirrorBuilder.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MirrorBuilder.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MirrorBuilder.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public interface MirrorBuilder
{
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java Wed Jul 15 19:24:20 2009
@@ -1,39 +1,49 @@
package org.apache.maven.repository;
/*
- * 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.InvalidRepositoryException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Repository;
+import org.apache.maven.repository.legacy.InvalidRepositoryException;
+import org.apache.maven.repository.legacy.WagonConfigurationException;
+import org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.installer.ArtifactInstallationException;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadataSource;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.resolver.ResolutionListener;
+import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
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;
/**
@@ -42,13 +52,13 @@
public interface RepositorySystem
{
static final String DEFAULT_LOCAL_REPO_ID = "local";
-
+
static final String userHome = System.getProperty( "user.home" );
-
+
static final File userMavenConfigurationHome = new File( userHome, ".m2" );
-
+
static final File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
-
+
static final String DEFAULT_REMOTE_REPO_ID = "central";
static final String DEFAULT_REMOTE_REPO_URL = "http://repo1.maven.org/maven2";
@@ -60,57 +70,88 @@
Artifact createProjectArtifact( String groupId, String artifactId, String version );
Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, String classifier );
-
+
Artifact createPluginArtifact( Plugin plugin );
-
+
Artifact createDependencyArtifact( Dependency dependency );
-
+
ArtifactRepository buildArtifactRepository( Repository repository )
throws InvalidRepositoryException;
-
+
ArtifactRepository createDefaultRemoteRepository()
- throws InvalidRepositoryException;
-
+ throws InvalidRepositoryException;
+
ArtifactRepository createDefaultLocalRepository()
throws InvalidRepositoryException;
-
+
ArtifactRepository createLocalRepository( File localRepository )
throws InvalidRepositoryException;
ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
-
+
/**
- * Calculates the effective repositories for the given input repositories. This process will essentially remove
- * duplicate repositories by merging them into one equivalent repository. It is worth to point out that merging does
- * not simply choose one of the input repositories and discards the others but actually combines their possibly
- * different policies.
+ * Calculates the effective repositories for the given input repositories. This process will
+ * essentially remove duplicate repositories by merging them into one equivalent repository. It
+ * is worth to point out that merging does not simply choose one of the input repositories and
+ * discards the others but actually combines their possibly different policies.
*
* @param repositories The original repositories, may be {@code null}.
* @return The effective repositories or {@code null} if the input was {@code null}.
*/
- List<ArtifactRepository> getEffectiveRepositories( List<ArtifactRepository> repositories );
+ List<ArtifactRepository> getEffectiveRepositories( List<ArtifactRepository> repositories );
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
- MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request );
-
+ void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, TransferListener downloadMonitor, boolean force )
+ throws ArtifactResolutionException, ArtifactNotFoundException;
+
//TODO: remove the request should already be processed to select the mirror for the request instead of the processing happen internally.
// Mirrors
- void addMirror( String id, String mirrorOf, String url );
- List<ArtifactRepository> getMirrors( List<ArtifactRepository> repositories );
-
+ void addMirror( String id, String mirrorOf, String url );
+
+ List<ArtifactRepository> getMirrors( List<ArtifactRepository> repositories );
+
// Install
-
+
// Deploy
-
+
// Map types of artifacts
-
+
//
// Raw file transfers
//
void publish( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
throws TransferFailedException;
-
+
void retrieve( ArtifactRepository repository, File destination, String remotePath, TransferListener downloadMonitor )
- throws TransferFailedException, ResourceDoesNotExistException;
-}
+ throws TransferFailedException, ResourceDoesNotExistException;
+
+ // Metadata / Collector
+
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners, List<ConflictResolver> conflictResolvers );
+
+ // used by maven-dependency-tree and maven-dependency-plugin
+ @Deprecated
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners );
+
+ // Deployment
+
+ void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository, ArtifactRepository localRepository )
+ throws ArtifactDeploymentException;
+
+ // Install
+
+ void install( File source, Artifact artifact, ArtifactRepository localRepository )
+ throws ArtifactInstallationException;
+
+ Wagon getWagon( org.apache.maven.wagon.repository.Repository repository )
+ throws UnsupportedProtocolException, WagonConfigurationException;
+
+ // WagonManager
+ Wagon getWagon( String protocol )
+ throws UnsupportedProtocolException;
+
+ ArtifactHandler getArtifactHandler( String type );
+}
\ No newline at end of file
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java Wed Jul 15 19:24:20 2009
@@ -23,7 +23,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;
public class UserLocalArtifactRepository
extends LocalArtifactRepository
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java Wed Jul 15 19:24:20 2009
@@ -21,9 +21,9 @@
import java.io.File;
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
+import org.apache.maven.repository.legacy.ArtifactUtils;
+import org.apache.maven.repository.legacy.versioning.InvalidVersionSpecificationException;
/**
* Thrown if a dependency has an invalid version.
Added: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java?rev=794373&view=auto
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java (added)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java Wed Jul 15 19:24:20 2009
@@ -0,0 +1,561 @@
+package org.apache.maven.repository.artifact;
+
+/*
+ * 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.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadata;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * @author Jason van Zyl
+ */
+public class DefaultMavenArtifact
+ implements MavenArtifact
+{
+ private String groupId;
+
+ private String artifactId;
+
+ private String baseVersion;
+
+ private final String type;
+
+ private final String classifier;
+
+ private String scope;
+
+ private File file;
+
+ private ArtifactRepository repository;
+
+ private String downloadUrl;
+
+ private ArtifactFilter dependencyFilter;
+
+ private ArtifactHandler artifactHandler;
+
+ private List<String> dependencyTrail;
+
+ private String version;
+
+ private VersionRange versionRange;
+
+ private boolean resolved;
+
+ private boolean release;
+
+ private List<ArtifactVersion> availableVersions;
+
+ private Map<Object,ArtifactMetadata> metadataMap;
+
+ private boolean optional;
+
+ public DefaultMavenArtifact( String groupId, String artifactId, String version, String scope, String type, String classifier, ArtifactHandler artifactHandler )
+ {
+ this( groupId, artifactId, VersionRange.createFromVersion( version ), scope, type, classifier, artifactHandler, false );
+ }
+
+ public DefaultMavenArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type, String classifier, ArtifactHandler artifactHandler )
+ {
+ this( groupId, artifactId, versionRange, scope, type, classifier, artifactHandler, false );
+ }
+
+ public DefaultMavenArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type, String classifier, ArtifactHandler artifactHandler, boolean optional )
+ {
+ this.groupId = groupId;
+
+ this.artifactId = artifactId;
+
+ this.versionRange = versionRange;
+
+ selectVersionFromNewRangeIfAvailable();
+
+ this.artifactHandler = artifactHandler;
+
+ this.scope = scope;
+
+ this.type = type;
+
+ if ( classifier == null )
+ {
+ classifier = artifactHandler.getClassifier();
+ }
+
+ this.classifier = classifier;
+
+ this.optional = optional;
+ }
+
+ private boolean empty( String value )
+ {
+ return ( value == null ) || ( value.trim().length() < 1 );
+ }
+
+ public String getClassifier()
+ {
+ return classifier;
+ }
+
+ public boolean hasClassifier()
+ {
+ return StringUtils.isNotEmpty( classifier );
+ }
+
+ public String getScope()
+ {
+ return scope;
+ }
+
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ setBaseVersionInternal( version );
+ versionRange = null;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setFile( File file )
+ {
+ this.file = file;
+ }
+
+ public File getFile()
+ {
+ return file;
+ }
+
+ public ArtifactRepository getRepository()
+ {
+ return repository;
+ }
+
+ public void setRepository( ArtifactRepository repository )
+ {
+ this.repository = repository;
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ public String getId()
+ {
+ return getDependencyConflictId() + ":" + getBaseVersion();
+ }
+
+ public String getDependencyConflictId()
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append( getGroupId() );
+ sb.append( ":" );
+ appendArtifactTypeClassifierString( sb );
+ return sb.toString();
+ }
+
+ private void appendArtifactTypeClassifierString( StringBuffer sb )
+ {
+ sb.append( getArtifactId() );
+ sb.append( ":" );
+ sb.append( getType() );
+ if ( hasClassifier() )
+ {
+ sb.append( ":" );
+ sb.append( getClassifier() );
+ }
+ }
+
+ public void addMetadata( ArtifactMetadata metadata )
+ {
+ if ( metadataMap == null )
+ {
+ metadataMap = new HashMap<Object,ArtifactMetadata>();
+ }
+
+ ArtifactMetadata m = metadataMap.get( metadata.getKey() );
+ if ( m != null )
+ {
+ m.merge( metadata );
+ }
+ else
+ {
+ metadataMap.put( metadata.getKey(), metadata );
+ }
+ }
+
+ public Collection<ArtifactMetadata> getMetadataList()
+ {
+ if (metadataMap == null) {
+ return Collections.emptyList();
+ }
+
+ return metadataMap.values();
+ }
+
+ // ----------------------------------------------------------------------
+ // Object overrides
+ // ----------------------------------------------------------------------
+
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer();
+ if ( getGroupId() != null )
+ {
+ sb.append( getGroupId() );
+ sb.append( ":" );
+ }
+ appendArtifactTypeClassifierString( sb );
+ sb.append( ":" );
+ if ( getBaseVersionInternal() != null )
+ {
+ sb.append( getBaseVersionInternal() );
+ }
+ else
+ {
+ sb.append( versionRange.toString() );
+ }
+ if ( scope != null )
+ {
+ sb.append( ":" );
+ sb.append( scope );
+ }
+ return sb.toString();
+ }
+
+ public int hashCode()
+ {
+ int result = 17;
+ result = 37 * result + groupId.hashCode();
+ result = 37 * result + artifactId.hashCode();
+ result = 37 * result + type.hashCode();
+ if ( version != null )
+ {
+ result = 37 * result + version.hashCode();
+ }
+ result = 37 * result + ( classifier != null ? classifier.hashCode() : 0 );
+ return result;
+ }
+
+ public boolean equals( Object o )
+ {
+ if ( o == this )
+ {
+ return true;
+ }
+
+ if ( !( o instanceof Artifact ) )
+ {
+ return false;
+ }
+
+ Artifact a = (Artifact) o;
+
+ if ( !a.getGroupId().equals( groupId ) )
+ {
+ return false;
+ }
+ else if ( !a.getArtifactId().equals( artifactId ) )
+ {
+ return false;
+ }
+ else if ( !a.getVersion().equals( version ) )
+ {
+ return false;
+ }
+ else if ( !a.getType().equals( type ) )
+ {
+ return false;
+ }
+ else if ( a.getClassifier() == null ? classifier != null : !a.getClassifier().equals( classifier ) )
+ {
+ return false;
+ }
+
+ // We don't consider the version range in the comparison, just the resolved version
+
+ return true;
+ }
+
+ public String getBaseVersion()
+ {
+ if ( baseVersion == null )
+ {
+ if ( version == null )
+ {
+ throw new NullPointerException( "version was null for " + groupId + ":" + artifactId );
+ }
+ setBaseVersionInternal( version );
+ }
+ return baseVersion;
+ }
+
+ protected String getBaseVersionInternal()
+ {
+ if ( ( baseVersion == null ) && ( version != null ) )
+ {
+ setBaseVersionInternal( version );
+ }
+
+ return baseVersion;
+ }
+
+ public void setBaseVersion( String baseVersion )
+ {
+ setBaseVersionInternal( baseVersion );
+ }
+
+ protected void setBaseVersionInternal( String baseVersion )
+ {
+ Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
+
+ if ( m.matches() )
+ {
+ this.baseVersion = m.group( 1 ) + "-" + SNAPSHOT_VERSION;
+ }
+ else
+ {
+ this.baseVersion = baseVersion;
+ }
+ }
+
+ public int compareTo( Object o )
+ {
+ Artifact a = (Artifact) o;
+
+ int result = groupId.compareTo( a.getGroupId() );
+ if ( result == 0 )
+ {
+ result = artifactId.compareTo( a.getArtifactId() );
+ if ( result == 0 )
+ {
+ result = type.compareTo( a.getType() );
+ if ( result == 0 )
+ {
+ if ( classifier == null )
+ {
+ if ( a.getClassifier() != null )
+ {
+ result = 1;
+ }
+ }
+ else
+ {
+ if ( a.getClassifier() != null )
+ {
+ result = classifier.compareTo( a.getClassifier() );
+ }
+ else
+ {
+ result = -1;
+ }
+ }
+ if ( result == 0 )
+ {
+ // We don't consider the version range in the comparison, just the resolved version
+ result = new DefaultArtifactVersion( version ).compareTo(
+ new DefaultArtifactVersion( a.getVersion() ) );
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ public String getDownloadUrl()
+ {
+ return downloadUrl;
+ }
+
+ public void setDownloadUrl( String downloadUrl )
+ {
+ this.downloadUrl = downloadUrl;
+ }
+
+ public ArtifactFilter getDependencyFilter()
+ {
+ return dependencyFilter;
+ }
+
+ public void setDependencyFilter( ArtifactFilter artifactFilter )
+ {
+ dependencyFilter = artifactFilter;
+ }
+
+ public ArtifactHandler getArtifactHandler()
+ {
+ return artifactHandler;
+ }
+
+ public List<String> getDependencyTrail()
+ {
+ return dependencyTrail;
+ }
+
+ public void setDependencyTrail( List<String> dependencyTrail )
+ {
+ this.dependencyTrail = dependencyTrail;
+ }
+
+ public void setScope( String scope )
+ {
+ this.scope = scope;
+ }
+
+ public VersionRange getVersionRange()
+ {
+ return versionRange;
+ }
+
+ public void setVersionRange( VersionRange versionRange )
+ {
+ this.versionRange = versionRange;
+
+ selectVersionFromNewRangeIfAvailable();
+ }
+
+ private void selectVersionFromNewRangeIfAvailable()
+ {
+ if ( ( versionRange != null ) && ( versionRange.getRecommendedVersion() != null ) )
+ {
+ selectVersion( versionRange.getRecommendedVersion().toString() );
+ }
+ else
+ {
+ version = null;
+ baseVersion = null;
+ }
+ }
+
+ public void selectVersion( String version )
+ {
+ this.version = version;
+ setBaseVersionInternal( version );
+ }
+
+ public void setGroupId( String groupId )
+ {
+ this.groupId = groupId;
+ }
+
+ public void setArtifactId( String artifactId )
+ {
+ this.artifactId = artifactId;
+ }
+
+ public boolean isSnapshot()
+ {
+ return getBaseVersion() != null && (getBaseVersion().endsWith(SNAPSHOT_VERSION) || getBaseVersion().equals(LATEST_VERSION));
+ }
+
+ public void setResolved( boolean resolved )
+ {
+ this.resolved = resolved;
+ }
+
+ public boolean isResolved()
+ {
+ return resolved;
+ }
+
+ public void setResolvedVersion( String version )
+ {
+ this.version = version;
+ // retain baseVersion
+ }
+
+ public void setArtifactHandler( ArtifactHandler artifactHandler )
+ {
+ this.artifactHandler = artifactHandler;
+ }
+
+ public void setRelease( boolean release )
+ {
+ this.release = release;
+ }
+
+ public boolean isRelease()
+ {
+ return release;
+ }
+
+ public List<ArtifactVersion> getAvailableVersions()
+ {
+ return availableVersions;
+ }
+
+ public void setAvailableVersions( List<ArtifactVersion> availableVersions )
+ {
+ this.availableVersions = availableVersions;
+ }
+
+ public boolean isOptional()
+ {
+ return optional;
+ }
+
+ public void setOptional( boolean optional )
+ {
+ this.optional = optional;
+ }
+
+ private boolean fromAuthoritativeRepository;
+
+ public void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository )
+ {
+ this.fromAuthoritativeRepository = fromAuthoritativeRepository;
+ }
+
+ public boolean isFromAuthoritativeRepository()
+ {
+ return fromAuthoritativeRepository;
+ }
+}
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java?rev=794373&view=auto
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java (added)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java Wed Jul 15 19:24:20 2009
@@ -0,0 +1,149 @@
+package org.apache.maven.repository.artifact;
+
+/*
+ * 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.Collection;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadata;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
+
+/**
+ * @author Jason van Zyl
+ */
+public interface MavenArtifact
+ extends Comparable
+{
+ String LATEST_VERSION = "LATEST";
+
+ String SNAPSHOT_VERSION = "SNAPSHOT";
+
+ String RELEASE_VERSION = "RELEASE";
+
+ Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
+
+ String SCOPE_COMPILE = "compile";
+
+ String SCOPE_TEST = "test";
+
+ String SCOPE_RUNTIME = "runtime";
+
+ String SCOPE_RUNTIME_PLUS_SYSTEM = "runtime_plus_system";
+
+ String SCOPE_PROVIDED = "provided";
+
+ String SCOPE_SYSTEM = "system";
+
+ String SCOPE_IMPORT = "import"; // Used to import dependencyManagement dependencies
+
+ String getGroupId();
+
+ String getArtifactId();
+
+ String getVersion();
+
+ void setVersion( String version );
+
+ String getScope();
+
+ String getType();
+
+ String getClassifier();
+
+ boolean hasClassifier();
+
+ File getFile();
+
+ void setFile( File destination );
+
+ String getBaseVersion();
+
+ void setBaseVersion( String baseVersion );
+
+ String getId();
+
+ String getDependencyConflictId();
+
+ void addMetadata( ArtifactMetadata metadata );
+
+ Collection<ArtifactMetadata> getMetadataList();
+
+ void setRepository( ArtifactRepository remoteRepository );
+
+ ArtifactRepository getRepository();
+
+ String getDownloadUrl();
+
+ void setDownloadUrl( String downloadUrl );
+
+ ArtifactFilter getDependencyFilter();
+
+ void setDependencyFilter( ArtifactFilter artifactFilter );
+
+ ArtifactHandler getArtifactHandler();
+
+ List<String> getDependencyTrail();
+
+ void setDependencyTrail( List<String> dependencyTrail );
+
+ void setScope( String scope );
+
+ VersionRange getVersionRange();
+
+ void setVersionRange( VersionRange newRange );
+
+ void selectVersion( String version );
+
+ void setGroupId( String groupId );
+
+ void setArtifactId( String artifactId );
+
+ boolean isSnapshot();
+
+ void setResolved( boolean resolved );
+
+ boolean isResolved();
+
+ void setResolvedVersion( String version );
+
+ void setArtifactHandler( ArtifactHandler handler );
+
+ boolean isRelease();
+
+ void setRelease( boolean release );
+
+ List<ArtifactVersion> getAvailableVersions();
+
+ void setAvailableVersions( List<ArtifactVersion> versions );
+
+ boolean isOptional();
+
+ void setOptional( boolean optional );
+
+ void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository );
+
+ boolean isFromAuthoritativeRepository();
+}
\ No newline at end of file
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,9 @@
import java.util.Map;
import java.util.regex.Matcher;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
public final class ArtifactUtils
{
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.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/ArtifactUtils.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/ArtifactUtils.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/ArtifactUtils.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java Wed Jul 15 19:24:20 2009
@@ -32,9 +32,9 @@
import java.util.Properties;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadata;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,6 @@
-package org.apache.maven.artifact;
+package org.apache.maven.repository.legacy;
+
+import org.apache.maven.artifact.Artifact;
/*
* 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/DependencyResolutionRequiredException.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.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/DependencyResolutionRequiredException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact;
+package org.apache.maven.repository.legacy;
/*
* 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/InvalidArtifactRTException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.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/InvalidArtifactRTException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact;
+package org.apache.maven.repository.legacy;
import java.net.MalformedURLException;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.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/InvalidRepositoryException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,6 @@
-package org.apache.maven.artifact;
+package org.apache.maven.repository.legacy;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.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/UnknownRepositoryLayoutException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java Wed Jul 15 19:24:20 2009
@@ -1,41 +1,38 @@
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 org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadata;
-public interface UpdateCheckManager {
+public interface UpdateCheckManager
+{
- String ROLE = UpdateCheckManager.class.getName();
+ String ROLE = UpdateCheckManager.class.getName();
- boolean isUpdateRequired( Artifact artifact, ArtifactRepository repository );
+ boolean isUpdateRequired( Artifact artifact, ArtifactRepository repository );
- void touch( Artifact artifact, ArtifactRepository repository );
+ void touch( Artifact artifact, ArtifactRepository repository );
boolean isUpdateRequired( RepositoryMetadata metadata, ArtifactRepository repository, File file );
- void touch( RepositoryMetadata metadata, ArtifactRepository repository, File file );
+ void touch( RepositoryMetadata metadata, ArtifactRepository repository, File file );
boolean isPomUpdateRequired( Artifact artifact, ArtifactRepository repository );
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.deployer;
+package org.apache.maven.repository.legacy.deployer;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -18,7 +18,7 @@
import java.io.File;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
public interface ArtifactDeployer
{
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.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/deployer/ArtifactDeployer.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.deployer;
+package org.apache.maven.repository.legacy.deployer;
/*
* 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/deployer/ArtifactDeploymentException.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.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/deployer/ArtifactDeploymentException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.deployer;
+package org.apache.maven.repository.legacy.deployer;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -20,10 +20,10 @@
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.RepositoryMetadataDeploymentException;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.repository.legacy.WagonManager;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataDeploymentException;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager;
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/deployer/DefaultArtifactDeployer.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.9
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.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/deployer/DefaultArtifactDeployer.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.handler;
+package org.apache.maven.repository.legacy.handler;
/*
* 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/handler/ArtifactHandler.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.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/handler/ArtifactHandler.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.handler;
+package org.apache.maven.repository.legacy.handler;
import org.codehaus.plexus.component.annotations.Component;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.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/handler/DefaultArtifactHandler.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.handler.manager;
+package org.apache.maven.repository.legacy.handler.manager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@
import java.util.Map;
-import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
/**
* @author Jason van Zyl
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.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/handler/manager/ArtifactHandlerManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.handler.manager;
+package org.apache.maven.repository.legacy.handler.manager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.handler.DefaultArtifactHandler;
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/handler/manager/DefaultArtifactHandlerManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.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/handler/manager/DefaultArtifactHandlerManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.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
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.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/ArtifactInstallationException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.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 or more contributor license
@@ -18,7 +18,7 @@
import java.io.File;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* @author <a href="michal@codehaus.org">Michal Maczka</a>
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.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/ArtifactInstaller.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java:751453-767358,767708-768832