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/03/28 14:22:08 UTC
svn commit: r389486 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn:
AbstractSvnScmProvider.java repository/SvnScmProviderRepository.java
Author: evenisse
Date: Tue Mar 28 04:22:04 2006
New Revision: 389486
URL: http://svn.apache.org/viewcvs?rev=389486&view=rev
Log:
o Clean code
o Fix possible NPE
o Fix user/password initialization
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java?rev=389486&r1=389485&r2=389486&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java Tue Mar 28 04:22:04 2006
@@ -167,12 +167,6 @@
String url = scmSpecificUrl;
- String user = null;
-
- String password = null;
-
- String protocol = null;
-
// ----------------------------------------------------------------------
// Do some sanity checking of the SVN url
// ----------------------------------------------------------------------
@@ -229,7 +223,7 @@
return result;
}
- result.repository = new SvnScmProviderRepository( url, user, password );
+ result.repository = new SvnScmProviderRepository( url );
return result;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java?rev=389486&r1=389485&r2=389486&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java Tue Mar 28 04:22:04 2006
@@ -33,13 +33,18 @@
*/
private String tagBase;
+ public SvnScmProviderRepository( String url )
+ {
+ parseUrl( url );
+ }
+
public SvnScmProviderRepository( String url, String user, String password )
{
+ this( url );
+
setUser( user );
setPassword( password );
-
- parseUrl( url );
}
public String getUrl()
@@ -93,6 +98,11 @@
else if ( url.startsWith( "svn" ) )
{
protocol = "svn://";
+ }
+
+ if ( protocol == null )
+ {
+ return;
}
String urlPath = url.substring( protocol.length() );