Author: jvanzyl
Date: Fri May 23 19:08:00 2008
New Revision: 659745
URL: http://svn.apache.org/viewvc?rev=659745&view=rev
Log: (empty)
Removed:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/CyclicDependencyException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/InvalidArtifactRTException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java
Modified:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.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/DefaultArtifactResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java
Modified:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java
URL:
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java?rev=659745&r1=659744&r2=659745&view=diff
==============================================================================
---
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java
(original)
+++
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java
Fri May 23 19:08:00 2008
@@ -19,8 +19,6 @@
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.artifact.resolver.metadata.version.VersionRange;
-
/*
* Description of an artifact.
*
@@ -80,11 +78,6 @@
void setFile( File destination );
- String getBaseVersion();
-
- /** @todo would like to get rid of this - or at least only have one. Base
version should be immutable. */
- void setBaseVersion( String baseVersion );
-
// ----------------------------------------------------------------------
String getId();
@@ -107,10 +100,6 @@
void setScope( String scope );
- VersionRange getVersionRange();
-
- void setVersionRange( VersionRange newRange );
-
void selectVersion( String version );
void setGroupId( String groupId );
Modified:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java
URL:
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java?rev=659745&r1=659744&r2=659745&view=diff
==============================================================================
---
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java
(original)
+++
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java
Fri May 23 19:08:00 2008
@@ -16,16 +16,9 @@
*/
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.resolver.metadata.version.ArtifactVersion;
-import
org.apache.maven.artifact.resolver.metadata.version.OverConstrainedVersionException;
-import org.apache.maven.artifact.resolver.metadata.version.VersionRange;
import org.codehaus.plexus.util.StringUtils;
/*
@@ -55,8 +48,6 @@
private String version;
- private VersionRange versionRange;
-
// This is Maven specific. jvz/
private String classifier;
@@ -82,17 +73,10 @@
{
if ( version == null )
{
- throw new InvalidArtifactRTException( groupId, artifactId,
version, type, "Version cannot be null." );
+ throw new IllegalArgumentException( "Version cannot be null." );
}
- VersionRange versionRange = VersionRange.createFromVersion( version );
-
- initialize( groupId, artifactId, versionRange, type, classifier,
optional, scope, inheritedScope );
- }
-
- public DefaultArtifact( String groupId, String artifactId, VersionRange
versionRange, String type, String classifier, boolean optional, String scope,
String inheritedScope )
- {
- initialize( groupId, artifactId, versionRange, type, classifier,
optional, scope, inheritedScope );
+ initialize( groupId, artifactId, version, type, classifier, optional,
scope, inheritedScope );
}
public String getInheritedScope()
@@ -100,13 +84,11 @@
return inheritedScope;
}
- private void initialize( String groupId, String artifactId, VersionRange
versionRange, String type, String classifier, boolean optional, String scope,
String inheritedScope )
+ private void initialize( String groupId, String artifactId, String
version, String type, String classifier, boolean optional, String scope, String
inheritedScope )
{
this.inheritedScope = inheritedScope;
this.groupId = groupId;
this.artifactId = artifactId;
- this.versionRange = versionRange;
- selectVersionFromNewRangeIfAvailable();
//this.scope = scope;
this.type = type;
this.classifier = classifier;
@@ -159,22 +141,22 @@
{
if ( empty( groupId ) )
{
- throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type, "The groupId cannot be empty." );
+ throw new IllegalArgumentException( "The groupId cannot be empty."
);
}
if ( artifactId == null )
{
- throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type, "The artifactId cannot be empty." );
+ throw new IllegalArgumentException( "The artifactId cannot be
empty." );
}
if ( type == null )
{
- throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type, "The type cannot be empty." );
+ throw new IllegalArgumentException( "The type cannot be empty." );
}
- if ( ( version == null ) && ( versionRange == null ) )
+ if ( ( version == null ) )
{
- throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type, "The version cannot be empty." );
+ throw new IllegalArgumentException( "The version cannot be empty."
);
}
}
@@ -216,8 +198,6 @@
public void setVersion( String version )
{
this.version = version;
- setBaseVersionInternal( version );
- versionRange = null;
}
public String getType()
@@ -289,14 +269,12 @@
}
appendArtifactTypeClassifierString( sb );
sb.append( ":" );
- if ( getBaseVersionInternal() != null )
+
+ if ( getVersion() != null )
{
sb.append( getBaseVersionInternal() );
}
- else
- {
- sb.append( versionRange.toString() );
- }
+
if ( scope != null )
{
sb.append( ":" );
@@ -473,31 +451,6 @@
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;
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=659745&r1=659744&r2=659745&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 19:08:00 2008
@@ -23,65 +23,12 @@
import java.util.List;
import org.apache.maven.artifact.resolver.metadata.Artifact;
-import org.apache.maven.wagon.TransferFailedException;
/**
* @author Jason van Zyl
* @version $Id$
*/
public class ArtifactResolutionException
- extends AbstractArtifactResolutionException
+ extends Exception
{
- public ArtifactResolutionException( String message,
- String groupId,
- String artifactId,
- String version,
- String type,
- String classifier,
- List remoteRepositories,
- List path,
- Throwable t )
- {
- super( message, groupId, artifactId, version, type, classifier,
remoteRepositories, path, t );
- }
-
- public ArtifactResolutionException( String message,
- String groupId,
- String artifactId,
- String version,
- String type,
- String classifier,
- Throwable t )
- {
- super( message, groupId, artifactId, version, type, classifier, null,
null, t );
- }
-
- public ArtifactResolutionException( String message,
- Artifact artifact )
- {
- super( message, artifact );
- }
-
- public ArtifactResolutionException( String message,
- Artifact artifact,
- List remoteRepositories )
- {
- super( message, artifact, remoteRepositories );
- }
-
- protected ArtifactResolutionException( String message,
- Artifact artifact,
- List remoteRepositories,
- TransferFailedException cause )
- {
- super( message, artifact, remoteRepositories, cause );
- }
-
- protected ArtifactResolutionException( String message,
- Artifact artifact,
- List remoteRepositories,
- IOException cause )
- {
- super( message, artifact, remoteRepositories, cause );
- }
}
Modified:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java?rev=659745&r1=659744&r2=659745&view=diff
==============================================================================
---
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java
(original)
+++
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java
Fri May 23 19:08:00 2008
@@ -19,19 +19,43 @@
* under the License.
*/
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.apache.maven.mercury.client.MercuryException;
+import org.apache.maven.mercury.client.retrieve.DefaultRetrievalRequest;
+import org.apache.maven.mercury.client.retrieve.DefaultRetriever;
+import org.apache.maven.mercury.client.retrieve.RetrievalRequest;
+import org.apache.maven.mercury.client.retrieve.Retriever;
/**
* @author Jason van Zyl
* @plexus.component
*/
public class DefaultArtifactResolver
- extends AbstractLogEnabled
implements ArtifactResolver
{
public ResolutionResult resolve( ResolutionRequest request )
{
ResolutionResult result = new ResolutionResult();
+
+ // Setup the HTTP client
+
+ Retriever retriever;
+
+ try
+ {
+ retriever = new DefaultRetriever();
+ }
+ catch ( MercuryException e )
+ {
+ result.addException( e );
+
+ return result;
+ }
+
+ // Create the retrieval request
+
+ RetrievalRequest rr = new DefaultRetrievalRequest();
+
+ retriever.retrieve( rr );
return result;
}
Modified:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java?rev=659745&r1=659744&r2=659745&view=diff
==============================================================================
---
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
(original)
+++
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
Fri May 23 19:08:00 2008
@@ -51,7 +51,7 @@
ResolutionResult result = artifactResolver.resolve( request );
// Here we just need to deal with basic retrieval problems.
- if ( result.hasMetadataResolutionExceptions() )
+ if ( result.hasExceptions() )
{
pomArtifact.setResolved( false );
}
@@ -71,8 +71,8 @@
if ( dependencies != null && dependencies.size() > 0 )
{
- int nKids = dependencies.size();
- node.setNChildren( nKids );
+ int numberOfChildren = dependencies.size();
+ node.setNChildren( numberOfChildren );
int kidNo = 0;
for ( ArtifactMetadata a : dependencies )
{
Modified:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java
URL:
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java?rev=659745&r1=659744&r2=659745&view=diff
==============================================================================
---
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java
(original)
+++
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java
Fri May 23 19:08:00 2008
@@ -25,7 +25,7 @@
import java.util.Set;
import org.apache.maven.artifact.resolver.metadata.Artifact;
-import
org.apache.maven.artifact.resolver.metadata.version.OverConstrainedVersionException;
+import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
/**
* Specific problems during resolution that we want to account for:
@@ -45,175 +45,54 @@
*/
public class ResolutionResult
{
- private Artifact originatingArtifact;
+ private Artifact artifact;
- private List versionRangeViolations;
+ private List<ArtifactRepository> repositories;
- private List metadataResolutionExceptions;
+ private List<Exception> exceptions;
- private List missingArtifacts;
-
- private List errorArtifactExceptions;
-
- // file system errors
-
- private List repositories;
-
- private Set artifacts;
-
- //
-
- public Artifact getOriginatingArtifact()
- {
- return originatingArtifact;
- }
-
- public ResolutionResult ListOriginatingArtifact( Artifact
originatingArtifact )
- {
- this.originatingArtifact = originatingArtifact;
-
- return this;
- }
-
- /**
- *
- * @return set of Artifact instances
- */
-
- public Set getArtifacts()
- {
- return artifacts;
- }
-
- public List getMissingArtifacts()
+ public Artifact getArtifact()
{
- return missingArtifacts == null ? Collections.EMPTY_LIST :
missingArtifacts;
+ return artifact;
}
- public ResolutionResult addMissingArtifact( Artifact artifact )
+ public void setArtifact( Artifact artifact )
{
- missingArtifacts = initList( missingArtifacts );
-
- missingArtifacts.add( artifact );
-
- return this;
+ this.artifact = artifact;
}
- public ResolutionResult setUnresolvedArtifacts( List unresolvedArtifacts )
+ public List<ArtifactRepository> getRepositories()
{
- this.missingArtifacts = unresolvedArtifacts;
-
- return this;
+ return repositories;
}
- // ------------------------------------------------------------------------
- // Version Range Violations
- // ------------------------------------------------------------------------
-
- public boolean hasVersionRangeViolations()
+ public void setRepositories( List<ArtifactRepository> repositories )
{
- return versionRangeViolations != null;
- }
-
- /**
- * @TODO this needs to accept a [EMAIL PROTECTED]
OverConstrainedVersionException} as returned by
- * [EMAIL PROTECTED] #getVersionRangeViolation(int)} but it's not used
like that in
- * [EMAIL PROTECTED] DefaultArtifactCollector}
- */
- public ResolutionResult addVersionRangeViolation( Exception e )
- {
- versionRangeViolations = initList( versionRangeViolations );
-
- versionRangeViolations.add( e );
-
- return this;
- }
-
- public OverConstrainedVersionException getVersionRangeViolation( int i )
- {
- return (OverConstrainedVersionException) versionRangeViolations.get( i
);
- }
-
- public List getVersionRangeViolations()
- {
- return versionRangeViolations == null ? Collections.EMPTY_LIST :
versionRangeViolations;
- }
-
- // ------------------------------------------------------------------------
- // Metadata Resolution Exceptions: ArtifactResolutionExceptions
- // ------------------------------------------------------------------------
-
- public boolean hasMetadataResolutionExceptions()
- {
- return metadataResolutionExceptions != null;
- }
-
- public ResolutionResult addMetadataResolutionException(
ArtifactResolutionException e )
- {
- metadataResolutionExceptions = initList( metadataResolutionExceptions
);
-
- metadataResolutionExceptions.add( e );
-
- return this;
- }
-
- public ArtifactResolutionException getMetadataResolutionException( int i )
- {
- return (ArtifactResolutionException) metadataResolutionExceptions.get(
i );
- }
-
- public List getMetadataResolutionExceptions()
- {
- return metadataResolutionExceptions == null ? Collections.EMPTY_LIST :
metadataResolutionExceptions;
- }
-
- // ------------------------------------------------------------------------
- // ErrorArtifactExceptions: ArtifactResolutionExceptions
- // ------------------------------------------------------------------------
-
- public boolean hasErrorArtifactExceptions()
- {
- return errorArtifactExceptions != null;
- }
-
- public ResolutionResult addErrorArtifactException(
ArtifactResolutionException e )
- {
- errorArtifactExceptions = initList( errorArtifactExceptions );
-
- errorArtifactExceptions.add( e );
-
- return this;
+ this.repositories = repositories;
}
- public List getErrorArtifactExceptions()
+ public List<Exception> getExceptions()
{
- return errorArtifactExceptions == null ? Collections.EMPTY_LIST :
errorArtifactExceptions;
+ return exceptions;
}
- // ------------------------------------------------------------------------
- //
- // ------------------------------------------------------------------------
-
- // Repositories
-
- public List getRepositories()
+ public void addException( Exception e )
{
- return repositories == null ? Collections.EMPTY_LIST : repositories;
+ if ( exceptions == null )
+ {
+ exceptions = new ArrayList();
+ }
+
+ exceptions.add( e );
}
-
- public ResolutionResult setRepositories( List repositories )
+
+ public void setExceptions( List<Exception> exceptions )
{
- this.repositories = repositories;
-
- return this;
+ this.exceptions = exceptions;
}
- private List initList( List l )
+ public boolean hasExceptions()
{
- if ( l == null )
- {
- return new ArrayList();
- }
- return l;
+ return exceptions != null;
}
}
