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 ca...@apache.org on 2006/03/03 18:39:57 UTC
svn commit: r382896 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/repository/
maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/
maven-scm-...
Author: carlos
Date: Fri Mar 3 09:39:55 2006
New Revision: 382896
URL: http://svn.apache.org/viewcvs?rev=382896&view=rev
Log:
Added toString method
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.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
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java?rev=382896&r1=382895&r2=382896&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java Fri Mar 3 09:39:55 2006
@@ -53,5 +53,11 @@
{
return providerRepository;
}
+
+ public String toString()
+ {
+ return provider.toString() + ":" + providerRepository.toString();
+ }
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java?rev=382896&r1=382895&r2=382896&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java Fri Mar 3 09:39:55 2006
@@ -72,6 +72,11 @@
{
String root = getCvsRootForCvsPass();
+ return removeDefaultPortFromCvsRoot( root );
+ }
+
+ private String removeDefaultPortFromCvsRoot( String root )
+ {
if ( root != null && root.indexOf( ":2401" ) > 0 )
{
root = root.substring( 0, root.indexOf( ":2401" ) ) + ":" + root.substring( root.indexOf( ":2401" ) + 5 );
@@ -87,7 +92,7 @@
{
if ( getUser() != null )
{
- return getCvsRootWithCorrectUser();
+ return getCvsRootWithCorrectUser( getUser() );
}
else
{
@@ -128,20 +133,66 @@
private String getCvsRootWithCorrectUser()
{
+ return getCvsRootWithCorrectUser( null );
+ }
+
+ /**
+ *
+ * @param userString ":" + user name
+ * @return
+ */
+ private String getCvsRootWithCorrectUser( String user )
+ {
//:transport:rest_of_cvsroot
int indexOfUsername = getTransport().length() + 2;
int indexOfAt = cvsroot.indexOf( "@" );
+
+ String userString = user == null ? "" : ":" + user;
if ( indexOfAt > 0 )
{
- cvsroot = ":" + getTransport() + ":" + getUser() + cvsroot.substring( indexOfAt );
+ cvsroot = ":" + getTransport() + userString + cvsroot.substring( indexOfAt );
}
else
{
- cvsroot = ":" + getTransport() + ":" + getUser() + "@" + cvsroot.substring( indexOfUsername );
+ cvsroot = ":" + getTransport() + userString + "@" + cvsroot.substring( indexOfUsername );
}
return cvsroot;
}
+
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer();
+
+ if ( getUser() == null )
+ {
+ if ( AbstractCvsScmProvider.TRANSPORT_LOCAL.equals( getTransport() ) )
+ {
+ sb.append( ":" );
+ sb.append( getTransport() );
+ sb.append( ":" );
+ sb.append( getCvsRoot() );
+ }
+ else
+ {
+ sb.append( removeDefaultPortFromCvsRoot( getCvsRootWithCorrectUser() ) );
+ }
+ }
+ else
+ {
+ sb.append( getCvsRoot() );
+ }
+ sb.append( ":" );
+ sb.append( getModule() );
+
+ /* remove first colon */
+ if ( sb.charAt( 0 ) == ':' )
+ {
+ sb.deleteCharAt( 0 );
+ }
+ return sb.toString();
+ }
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java?rev=382896&r1=382895&r2=382896&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java Fri Mar 3 09:39:55 2006
@@ -63,7 +63,7 @@
{
String url = "pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url );
assertEquals( "pserver", repo.getTransport() );
@@ -83,7 +83,7 @@
{
String url = "pserver:cvs.apache.org:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url.replaceFirst( ":cvs", "@cvs" ) );
repo.setUser( "myusername" );
@@ -105,7 +105,7 @@
{
String url = "pserver:cvs.apache.org:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url.replaceFirst( ":cvs", "@cvs" ) );
try
{
@@ -123,7 +123,7 @@
{
String url = "pserver:anoncvs:@cvs.apache.org:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url.replaceFirst( ":@", "@" ) );
assertEquals( "pserver", repo.getTransport() );
@@ -143,7 +143,7 @@
{
String url = "pserver:anoncvs:@cvs.apache.org:2401:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url.replaceFirst( ":2401", "" ).replaceFirst( ":@", "@" ) );
assertEquals( "pserver", repo.getTransport() );
@@ -167,7 +167,7 @@
{
String url = "pserver:anoncvs:mypassword@cvs.apache.org:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url.replaceFirst( ":mypassword", "" ) );
assertEquals( "pserver", repo.getTransport() );
@@ -189,7 +189,7 @@
{
String url = "pserver:anoncvs:mypassword@cvs.apache.org:2401:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url );
+ CvsScmProviderRepository repo = testUrl( url, url.replaceFirst( ":mypassword", "" ).replaceFirst( ":2401", "" ) );
assertEquals( "pserver", repo.getTransport() );
@@ -213,7 +213,9 @@
{
String url = "pserver|anoncvs@cvs.apache.org|/home/cvspublic|maven";
- CvsScmProviderRepository repo = testUrl( url, '|' );
+ String urlResult = "pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven";
+
+ CvsScmProviderRepository repo = testUrl( url, urlResult, '|' );
assertEquals( "pserver", repo.getTransport() );
@@ -237,7 +239,9 @@
public void testParseLocalConnection()
throws Exception
{
- CvsScmProviderRepository repo = testUrl( "local:/home/cvspublic:maven" );
+ String url = "local:/home/cvspublic:maven";
+
+ CvsScmProviderRepository repo = testUrl( url, url );
assertEquals( "local", repo.getTransport() );
@@ -254,7 +258,10 @@
//
// ----------------------------------------------------------------------
- private CvsScmProviderRepository testUrl( String url, char delimiter, int nbErrorMessages )
+ /**
+ * @param expectedUrl url that should be printed in the toString method
+ */
+ private CvsScmProviderRepository testUrl( String url, String expectedUrl, char delimiter, int nbErrorMessages )
throws Exception
{
assertEquals( nbErrorMessages, scmManager.validateScmRepository( "scm:cvs" + delimiter + url ).size() );
@@ -267,20 +274,22 @@
assertTrue( "The SCM Repository isn't a " + CvsScmProviderRepository.class.getName() + ".", repository
.getProviderRepository() instanceof CvsScmProviderRepository );
+
+ assertEquals( "cvs:" + expectedUrl, repository.toString() );
return (CvsScmProviderRepository) repository.getProviderRepository();
}
- private CvsScmProviderRepository testUrl( String url )
+ private CvsScmProviderRepository testUrl( String url, String urlResult )
throws Exception
{
- return testUrl( url, ':', 0 );
+ return testUrl( url, urlResult, ':', 0 );
}
- private CvsScmProviderRepository testUrl( String url, char delimiter )
+ private CvsScmProviderRepository testUrl( String url, String urlResult, char delimiter )
throws Exception
{
- return testUrl( url, delimiter, 0 );
+ return testUrl( url, urlResult, delimiter, 0 );
}
private void testIllegalUrl( String url )
@@ -288,7 +297,7 @@
{
try
{
- testUrl( "scm:cvs:" + url, ':', 1 );
+ testUrl( "scm:cvs:" + url, null, ':', 1 );
fail( "Expected a ScmRepositoryException while testing the url '" + url + "'." );
}
@@ -297,4 +306,5 @@
// expected
}
}
+
}
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=382896&r1=382895&r2=382896&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 Fri Mar 3 09:39:55 2006
@@ -136,4 +136,10 @@
}
}
}
+
+ public String toString()
+ {
+ return getUrl();
+ }
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java?rev=382896&r1=382895&r2=382896&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java Fri Mar 3 09:39:55 2006
@@ -154,6 +154,8 @@
assertEquals( "url is incorrect", expectedUrl, providerRepository.getUrl() );
+ assertEquals( "url string is incorrect", "svn:" + expectedUrl, repository.toString() );
+
assertEquals( "User is incorrect", expectedUser, providerRepository.getUser() );
assertEquals( "Host is incorrect", expectedHost,