You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2007/10/10 14:59:33 UTC
svn commit: r583459 - in
/maven/components/branches/maven-2.0.x/maven-artifact/src:
main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
Author: markh
Date: Wed Oct 10 05:59:32 2007
New Revision: 583459
URL: http://svn.apache.org/viewvc?rev=583459&view=rev
Log:
o Replaced remaining uses of \n in AbstractArtifactResolutionException to use line.separator
o Used line.separator in ArtifactResolutionExceptionTest to fix test under Windows
o Removed System.outs from ArtifactResolutionExceptionTest
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/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.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?rev=583459&r1=583458&r2=583459&view=diff
==============================================================================
--- 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 Wed Oct 10 05:59:32 2007
@@ -243,7 +243,8 @@
sb.append( groupId );
sb.append( " -DartifactId=" );
sb.append( artifactId );
- sb.append( " \\\n");
+ sb.append( " \\");
+ sb.append( LS );
sb.append( indentation );
sb.append( " " );
sb.append( "-Dversion=" );
@@ -271,7 +272,8 @@
sb.append( groupId );
sb.append( " -DartifactId=" );
sb.append( artifactId );
- sb.append( " \\\n");
+ sb.append( " \\");
+ sb.append( LS );
sb.append( indentation );
sb.append( " " );
sb.append( "-Dversion=" );
@@ -286,7 +288,8 @@
sb.append( " -Dpackaging=" );
sb.append( type );
sb.append( " -Dfile=/path/to/file" );
- sb.append( " \\\n");
+ sb.append( " \\");
+ sb.append( LS );
sb.append( indentation );
sb.append( " " );
sb.append( " -Durl=[url] -DrepositoryId=[id]" );
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java?rev=583459&r1=583458&r2=583459&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java Wed Oct 10 05:59:32 2007
@@ -32,6 +32,8 @@
public class ArtifactResolutionExceptionTest
extends TestCase
{
+ private static final String LS = System.getProperty( "line.separator" );
+
public void testMissingArtifactMessageFormat()
{
String message = "Missing artifact";
@@ -43,27 +45,25 @@
String classifier = "aClassifier";
String downloadUrl = "http://somewhere.com/download";
List path = Arrays.asList(new String[]{"dependency1", "dependency2"});
- String expected = "Missing artifact\n" +
- "\n" +
- " Try downloading the file manually from: \n" +
- " http://somewhere.com/download\n" +
- "\n" +
- " Then, install it using the command: \n" +
- " mvn install:install-file -DgroupId=aGroupId -DartifactId=anArtifactId \\\n" +
- " -Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file\n" +
- "\n" +
- " Alternatively, if you host your own repository you can deploy the file there: \n" +
- " mvn deploy:deploy-file -DgroupId=aGroupId -DartifactId=anArtifactId \\\n" +
- " -Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file \\\n" +
- " -Durl=[url] -DrepositoryId=[id]\n" +
- "\n" +
- " Path to dependency: \n" +
- " \t1) dependency1\n" +
- " \t2) dependency2\n" +
- "\n";
+ String expected = "Missing artifact" + LS +
+ LS +
+ " Try downloading the file manually from: " + LS +
+ " http://somewhere.com/download" + LS +
+ LS +
+ " Then, install it using the command: " + LS +
+ " mvn install:install-file -DgroupId=aGroupId -DartifactId=anArtifactId \\" + LS +
+ " -Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file" + LS +
+ LS +
+ " Alternatively, if you host your own repository you can deploy the file there: " + LS +
+ " mvn deploy:deploy-file -DgroupId=aGroupId -DartifactId=anArtifactId \\" + LS +
+ " -Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file \\" + LS +
+ " -Durl=[url] -DrepositoryId=[id]" + LS +
+ LS +
+ " Path to dependency: " + LS +
+ " \t1) dependency1" + LS +
+ " \t2) dependency2" + LS +
+ LS;
String actual = AbstractArtifactResolutionException.constructMissingArtifactMessage(message, indentation, groupId, artifactId, version, type, classifier, downloadUrl, path);
- System.out.println(expected);
- System.out.println(actual);
assertEquals(expected, actual);
}
}