You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/02/02 21:25:04 UTC
svn commit: r374485 -
/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
Author: evenisse
Date: Thu Feb 2 12:25:01 2006
New Revision: 374485
URL: http://svn.apache.org/viewcvs?rev=374485&view=rev
Log:
[SCM-131] Fix validation of developerConnection
Submitted by: Dennis Lundberg
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java?rev=374485&r1=374484&r2=374485&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java (original)
+++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java Thu Feb 2 12:25:01 2006
@@ -33,13 +33,15 @@
extends AbstractScmMojo
{
/**
- * @parameter expression=${project.scm.connection}
+ * @parameter expression="${scmConnection}"
+ * default-value="${project.scm.connection}"
* @readonly
*/
private String scmConnection;
/**
- * @parameter expression=${project.scm.developerConnection}
+ * @parameter expression="${scmDeveloperConnection}"
+ * default-value="${project.scm.developerConnection}"
* @readonly
*/
private String scmDeveloperConnection;
@@ -64,7 +66,7 @@
}
// Check scm developerConnection
- if ( scmConnection != null )
+ if ( scmDeveloperConnection != null )
{
validateConnection( scmDeveloperConnection, "project.scm.developerConnection" );
}
@@ -78,7 +80,7 @@
if ( !messages.isEmpty() )
{
- getLog().error( "Error scm url connection (" + type + ") validation failed :" );
+ getLog().error( "Validation of scm url connection (" + type + ") failed :" );
Iterator iter = messages.iterator();
@@ -86,6 +88,8 @@
{
getLog().error( iter.next().toString() );
}
+
+ getLog().error( "The invalid scm url connection: '" + connectionString + "'." );
throw new MojoExecutionException( "Command failed." );
}