Author: evenisse
Date: Thu Mar 16 09:37:28 2006
New Revision: 386398
URL: http://svn.apache.org/viewcvs?rev=386398&view=rev
Log:
[SCM-173] Allow the use to choose which scm url to use for connection
Submitted by Edwin Punzalan
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=386398&r1=386397&r2=386398&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Thu Mar 16 09:37:28 2006
@@ -48,6 +48,16 @@
private String connectionUrl;
/**
+ * @parameter expression="${connectionUrl}"
default-value="${project.scm.developerConnection}"
+ */
+ private String developerConnectionUrl;
+
+ /**
+ * @parameter expression="${connectionType}" default-value="connection"
+ */
+ private String connectionType;
+
+ /**
* The working directory
*
* @parameter expression="${workingDirectory}"
@@ -127,11 +137,16 @@
public String getConnectionUrl()
{
- if ( connectionUrl == null )
+ if ( StringUtils.isNotEmpty( connectionUrl ) && "connection".equals(
connectionType.toLowerCase() ) )
+ {
+ return connectionUrl;
+ }
+ else if ( StringUtils.isNotEmpty( developerConnectionUrl ) &&
"developerconnection".equals( connectionType.toLowerCase() ) )
{
- throw new NullPointerException( "You need to define a
connectionUrl parameter." );
+ return developerConnectionUrl;
}
- return connectionUrl;
+
+ throw new NullPointerException( "You need to define a connectionUrl
parameter" );
}
public File getWorkingDirectory()
