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 2008/05/23 17:11:52 UTC

svn commit: r659567 - in /maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact: resolver/metadata/ resolver/metadata/resolver/ resolver/metadata/transform/ resolver/metadata/version/ transform/

Author: jvanzyl
Date: Fri May 23 08:11:51 2008
New Revision: 659567

URL: http://svn.apache.org/viewvc?rev=659567&view=rev
Log:
o move straggler in the transformation package

Added:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java
Removed:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java
Modified:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java?rev=659567&r1=659566&r2=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java Fri May 23 08:11:51 2008
@@ -19,10 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-
 /**
  * Specifies the repository used for artifact handling.
  *
@@ -33,11 +29,6 @@
 {
     String pathOf( Artifact artifact );
 
-    String pathOfRemoteRepositoryMetadata( ArtifactMetadata artifactMetadata );
-
-    String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
-                                          ArtifactRepository repository );
-
     String getUrl();
 
     String getBasedir();
@@ -46,12 +37,6 @@
 
     String getId();
 
-    ArtifactRepositoryPolicy getSnapshots();
-
-    ArtifactRepositoryPolicy getReleases();
-
-    ArtifactRepositoryLayout getLayout();
-
     String getKey();
 
     boolean isUniqueVersion();

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java?rev=659567&r1=659566&r2=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java Fri May 23 08:11:51 2008
@@ -22,8 +22,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
 import org.apache.maven.artifact.resolver.metadata.Artifact;
 import org.apache.maven.wagon.TransferFailedException;
 
@@ -71,21 +69,6 @@
         super( message, artifact, remoteRepositories );
     }
 
-    public ArtifactResolutionException( String message,
-                                        Artifact artifact,
-                                        ArtifactMetadataRetrievalException cause )
-    {
-        super( message, artifact, null, cause );
-    }
-
-    protected ArtifactResolutionException( String message,
-                                           Artifact artifact,
-                                           List remoteRepositories,
-                                           ArtifactMetadataRetrievalException cause )
-    {
-        super( message, artifact, remoteRepositories, cause );
-    }
-
     protected ArtifactResolutionException( String message,
                                            Artifact artifact,
                                            List remoteRepositories,
@@ -101,11 +84,4 @@
     {
         super( message, artifact, remoteRepositories, cause );
     }
-
-    public ArtifactResolutionException( String message,
-                                        Artifact artifact,
-                                        RepositoryMetadataResolutionException cause )
-    {
-        super( message, artifact, null, cause );
-    }
 }

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java?rev=659567&r1=659566&r2=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java Fri May 23 08:11:51 2008
@@ -5,7 +5,7 @@
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathContainer;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathTransformation;
-import org.apache.maven.artifact.transform.MetadataGraphTransformationException;
+import org.apache.maven.artifact.resolver.metadata.transform.MetadataGraphTransformationException;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java?rev=659567&r1=659566&r2=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java Fri May 23 08:11:51 2008
@@ -2,7 +2,6 @@
 
 import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
-import org.apache.maven.artifact.transform.MetadataGraphTransformationException;
 
 
 /**

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java?rev=659567&r1=659566&r2=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java Fri May 23 08:11:51 2008
@@ -12,7 +12,6 @@
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphVertex;
-import org.apache.maven.artifact.transform.MetadataGraphTransformationException;
 
 /**
  * default implementation of the metadata classpath transformer

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java&r1=659112&r2=659567&rev=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java Fri May 23 08:11:51 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.transform;
+package org.apache.maven.artifact.resolver.metadata.transform;
 
 /**
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 08:11:51 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:658725

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java?rev=659567&r1=659566&r2=659567&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java Fri May 23 08:11:51 2008
@@ -21,9 +21,9 @@
 
 import java.util.List;
 
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.metadata.Artifact;
 import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactResolutionException;
 
 /**
  * Occurs when ranges exclude each other and no valid value remains.