You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2007/04/08 19:25:15 UTC
svn commit: r526578 - in /maven/components/branches/maven-2.0.x:
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
maven-core/src/main/java/org/apache/maven/plugin/
Author: brianf
Date: Sun Apr 8 10:25:14 2007
New Revision: 526578
URL: http://svn.apache.org/viewvc?view=rev&rev=526578
Log:
MNG-2880 added classifier to install-file instructions when an artifact can't be found that needs a classifier
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?view=diff&rev=526578&r1=526577&r2=526578
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java Sun Apr 8 10:25:14 2007
@@ -42,6 +42,8 @@
private String version;
private String type;
+
+ private String classifier;
private List remoteRepositories;
@@ -52,7 +54,7 @@
static final String LS = System.getProperty( "line.separator" );
protected AbstractArtifactResolutionException( String message, String groupId, String artifactId, String version,
- String type, List remoteRepositories, List path )
+ String type, String classifier, List remoteRepositories, List path )
{
super( constructMessageBase( message, groupId, artifactId, version, type, remoteRepositories, path ) );
@@ -60,13 +62,14 @@
this.groupId = groupId;
this.artifactId = artifactId;
this.type = type;
+ this.classifier = classifier;
this.version = version;
this.remoteRepositories = remoteRepositories;
this.path = constructArtifactPath( path, "" );
}
protected AbstractArtifactResolutionException( String message, String groupId, String artifactId, String version,
- String type, List remoteRepositories, List path, Throwable t )
+ String type, String classifier, List remoteRepositories, List path, Throwable t )
{
super( constructMessageBase( message, groupId, artifactId, version, type, remoteRepositories, path ), t );
@@ -74,6 +77,7 @@
this.groupId = groupId;
this.artifactId = artifactId;
this.type = type;
+ this.classifier = classifier;
this.version = version;
this.remoteRepositories = remoteRepositories;
this.path = constructArtifactPath( path, "" );
@@ -87,14 +91,14 @@
protected AbstractArtifactResolutionException( String message, Artifact artifact, List remoteRepositories )
{
this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
- remoteRepositories, artifact.getDependencyTrail() );
+ artifact.getClassifier(),remoteRepositories, artifact.getDependencyTrail() );
}
protected AbstractArtifactResolutionException( String message, Artifact artifact, List remoteRepositories,
Throwable t )
{
this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
- remoteRepositories, artifact.getDependencyTrail(), t );
+ artifact.getClassifier(),remoteRepositories, artifact.getDependencyTrail(), t );
}
public String getGroupId()
@@ -117,6 +121,22 @@
return type;
}
+ /**
+ * @return the classifier
+ */
+ public String getClassifier()
+ {
+ return this.classifier;
+ }
+
+ /**
+ * @return the path
+ */
+ public String getPath()
+ {
+ return this.path;
+ }
+
public List getRemoteRepositories()
{
return remoteRepositories;
@@ -188,7 +208,7 @@
}
protected static String constructMissingArtifactMessage( String message, String indentation, String groupId, String artifactId, String version,
- String type, String downloadUrl, List path )
+ String type, String classifier, String downloadUrl, List path )
{
StringBuffer sb = new StringBuffer( message );
@@ -228,6 +248,13 @@
sb.append( " " );
sb.append( "-Dversion=" );
sb.append( version );
+
+ //insert classifier only if it was used in the artifact
+ if (classifier !=null && !classifier.equals( "" ))
+ {
+ sb.append( " -Dclassifier=" );
+ sb.append( classifier );
+ }
sb.append( " -Dpackaging=" );
sb.append( type );
sb.append( " -Dfile=/path/to/file" );
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java?view=diff&rev=526578&r1=526577&r2=526578
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java Sun Apr 8 10:25:14 2007
@@ -39,30 +39,30 @@
public ArtifactNotFoundException( String message, Artifact artifact )
{
- this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(), null,
- artifact.getDownloadUrl(), artifact.getDependencyTrail() );
+ this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
+ artifact.getClassifier(), null, artifact.getDownloadUrl(), artifact.getDependencyTrail() );
}
protected ArtifactNotFoundException( String message, Artifact artifact, List remoteRepositories, Throwable t )
{
- this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
+ this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getClassifier(),
remoteRepositories, artifact.getDownloadUrl(), artifact.getDependencyTrail(), t );
}
- public ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type,
+ public ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type, String classifier,
List remoteRepositories, String downloadUrl, List path, Throwable t )
{
- super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, downloadUrl, path ), groupId, artifactId,
- version, type, remoteRepositories, null, t );
+ super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier,downloadUrl, path ), groupId, artifactId,
+ version, type, classifier, remoteRepositories, null, t );
this.downloadUrl = downloadUrl;
}
private ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type,
- List remoteRepositories, String downloadUrl, List path )
+ String classifier, List remoteRepositories, String downloadUrl, List path )
{
- super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, downloadUrl, path ), groupId, artifactId,
- version, type, remoteRepositories, null );
+ super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier, downloadUrl, path ), groupId, artifactId,
+ version, type, classifier, remoteRepositories, null );
this.downloadUrl = downloadUrl;
}
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?view=diff&rev=526578&r1=526577&r2=526578
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Sun Apr 8 10:25:14 2007
@@ -31,15 +31,15 @@
extends AbstractArtifactResolutionException
{
public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type,
- List remoteRepositories, List path, Throwable t )
+ String classifier, List remoteRepositories, List path, Throwable t )
{
- super( message, groupId, artifactId, version, type, remoteRepositories, path, t );
+ super( message, groupId, artifactId, version, type, classifier, remoteRepositories, path, t );
}
public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type,
- Throwable t )
+ String classifier, Throwable t )
{
- super( message, groupId, artifactId, version, type, null, null, t );
+ super( message, groupId, artifactId, version, type, classifier,null, null, t );
}
public ArtifactResolutionException( String message, Artifact artifact )
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java?view=diff&rev=526578&r1=526577&r2=526578
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java Sun Apr 8 10:25:14 2007
@@ -47,7 +47,7 @@
String message = ( ++counter ) + ") " + artifact.getId();
buffer.append( constructMissingArtifactMessage( message, " ", artifact.getGroupId(), artifact
- .getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getDownloadUrl(), artifact
+ .getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getClassifier(), artifact.getDownloadUrl(), artifact
.getDependencyTrail() ) );
}
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java?view=diff&rev=526578&r1=526577&r2=526578
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java Sun Apr 8 10:25:14 2007
@@ -34,6 +34,6 @@
public PluginNotFoundException( ArtifactNotFoundException e )
{
super( "Plugin could not be found - check that the goal name is correct: " + e.getMessage(), e.getGroupId(),
- e.getArtifactId(), e.getVersion(), "maven-plugin", e.getRemoteRepositories(), null, e.getCause() );
+ e.getArtifactId(), e.getVersion(), "maven-plugin",null, e.getRemoteRepositories(), null, e.getCause() );
}
}