Author: brianf
Date: Fri Jan 4 19:32:21 2008
New Revision: 609086
URL: http://svn.apache.org/viewvc?rev=609086&view=rev
Log:
MNG-3024: put command on single line (merge 585332-33 from 2.0.x)
Added:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?rev=609086&r1=609085&r2=609086&view=diff
==============================================================================
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
Fri Jan 4 19:32:21 2008
@@ -270,10 +270,7 @@
sb.append( groupId );
sb.append( " -DartifactId=" );
sb.append( artifactId );
- sb.append( " \\\n" );
- sb.append( indentation );
- sb.append( " " );
- sb.append( "-Dversion=" );
+ sb.append( " -Dversion=" );
sb.append( version );
//insert classifier only if it was used in the artifact
@@ -288,7 +285,8 @@
sb.append( LS );
// If people want to deploy it
-
+ sb.append( LS );
+ sb.append( indentation );
sb.append( "Alternatively, if you host your own repository you can
deploy the file there: " );
sb.append( LS );
sb.append( indentation );
@@ -296,10 +294,7 @@
sb.append( groupId );
sb.append( " -DartifactId=" );
sb.append( artifactId );
- sb.append( " \\\n" );
- sb.append( indentation );
- sb.append( " " );
- sb.append( "-Dversion=" );
+ sb.append( " -Dversion=" );
sb.append( version );
//insert classifier only if it was used in the artifact
@@ -311,9 +306,6 @@
sb.append( " -Dpackaging=" );
sb.append( type );
sb.append( " -Dfile=/path/to/file" );
- sb.append( " \\\n" );
- sb.append( indentation );
- sb.append( " " );
sb.append( " -Durl=[url] -DrepositoryId=[id]" );
sb.append( LS );
}
Added:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java?rev=609086&view=auto
==============================================================================
---
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
(added)
+++
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
Fri Jan 4 19:32:21 2008
@@ -0,0 +1,69 @@
+package org.apache.maven.artifact.resolver;
+
+/*
+ * 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.util.Arrays;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * Test the artifact resolution exception message
+ *
+ * @author Mauro Talevi
+ */
+public class ArtifactResolutionExceptionTest
+ extends TestCase
+{
+ private static final String LS = System.getProperty( "line.separator" );
+
+ public void testMissingArtifactMessageFormat()
+ {
+ String message = "Missing artifact";
+ String indentation = " ";
+ String groupId = "aGroupId";
+ String artifactId = "anArtifactId";
+ String version = "aVersion";
+ String type = "jar";
+ String classifier = "aClassifier";
+ String downloadUrl = "http://somewhere.com/download";;
+ List path = Arrays.asList(new String[]{"dependency1", "dependency2"});
+ 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 -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"+
+ " -Dversion=aVersion -Dclassifier=aClassifier
-Dpackaging=jar -Dfile=/path/to/file"+
+ " -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);
+ assertEquals(expected, actual);
+ }
+}
