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/03 16:32:34 UTC
svn commit: r382867 - 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/repository/
test/java/org/apache/maven/scm/provider/svn/repository/
Author: evenisse
Date: Fri Mar 3 07:32:33 2006
New Revision: 382867
URL: http://svn.apache.org/viewcvs?rev=382867&view=rev
Log:
Fix host parsing
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
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-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=382867&r1=382866&r2=382867&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 07:32:33 2006
@@ -115,16 +115,24 @@
if ( !"file://".equals( protocol ) )
{
int indexSlash = urlPath.indexOf( "/" );
+
+ String hostPort = urlPath;
+
if ( indexSlash > 0 )
{
- String hostPort = urlPath.substring( 0, indexSlash );
- int indexColon = hostPort.indexOf( ":" );
+ hostPort = urlPath.substring( 0, indexSlash );
+ }
+
+ int indexColon = hostPort.indexOf( ":" );
- if ( indexColon > 0 )
- {
- setHost( hostPort.substring( 0, indexColon ) );
- setPort( Integer.parseInt( hostPort.substring( indexColon + 1 ) ) );
- }
+ if ( indexColon > 0 )
+ {
+ setHost( hostPort.substring( 0, indexColon ) );
+ setPort( Integer.parseInt( hostPort.substring( indexColon + 1 ) ) );
+ }
+ else
+ {
+ setHost( hostPort );
}
}
}
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=382867&r1=382866&r2=382867&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 07:32:33 2006
@@ -48,62 +48,68 @@
public void testLegalFileURL()
throws Exception
{
- testUrl( "scm:svn:file:///tmp/repo", "file:///tmp/repo", null );
+ testUrl( "scm:svn:file:///tmp/repo", "file:///tmp/repo", null, null );
}
public void testLegalLocalhostFileURL()
throws Exception
{
- testUrl( "scm:svn:file://localhost/tmp/repo", "file://localhost/tmp/repo", null );
+ testUrl( "scm:svn:file://localhost/tmp/repo", "file://localhost/tmp/repo", null, null );
}
public void testLegalHttpURL()
throws Exception
{
- testUrl( "scm:svn:http://subversion.tigris.org", "http://subversion.tigris.org", null );
+ testUrl( "scm:svn:http://subversion.tigris.org", "http://subversion.tigris.org", null,
+ "subversion.tigris.org" );
}
public void testLegalHttpsURL()
throws Exception
{
- testUrl( "scm:svn:https://subversion.tigris.org", "https://subversion.tigris.org", null );
+ testUrl( "scm:svn:https://subversion.tigris.org", "https://subversion.tigris.org", null,
+ "subversion.tigris.org" );
}
public void testLegalSvnURL()
throws Exception
{
- testUrl( "scm:svn:svn://subversion.tigris.org", "svn://subversion.tigris.org", null );
+ testUrl( "scm:svn:svn://subversion.tigris.org", "svn://subversion.tigris.org", null, "subversion.tigris.org" );
}
public void testLegalSvnPlusUsernameURL()
throws Exception
{
- testUrl( "scm:svn:svn://username@subversion.tigris.org", "svn://subversion.tigris.org", "username" );
+ testUrl( "scm:svn:svn://username@subversion.tigris.org", "svn://subversion.tigris.org", "username",
+ "subversion.tigris.org" );
}
public void testLegalSvnPlusSshURL()
throws Exception
{
- testUrl( "scm:svn:svn+ssh://subversion.tigris.org", "svn+ssh://subversion.tigris.org", null );
+ testUrl( "scm:svn:svn+ssh://subversion.tigris.org", "svn+ssh://subversion.tigris.org", null,
+ "subversion.tigris.org" );
}
public void testLegalSvnPlusSshPlusUsernameURL()
throws Exception
{
- testUrl( "scm:svn:svn+ssh://username@subversion.tigris.org", "svn+ssh://username@subversion.tigris.org", null );
+ testUrl( "scm:svn:svn+ssh://username@subversion.tigris.org", "svn+ssh://username@subversion.tigris.org", null,
+ "username@subversion.tigris.org" );
}
public void testLegalSvnPortUrl()
throws Exception
{
testUrl( "scm:svn:http://username@subversion.tigris.org:8800/pmgt/trunk",
- "http://subversion.tigris.org:8800/pmgt/trunk", "username", 8800 );
+ "http://subversion.tigris.org:8800/pmgt/trunk", "username", "subversion.tigris.org", 8800 );
testUrl( "scm:svn:https://username@subversion.tigris.org:8080/pmgt/trunk",
- "https://subversion.tigris.org:8080/pmgt/trunk", "username", 8080 );
+ "https://subversion.tigris.org:8080/pmgt/trunk", "username", "subversion.tigris.org", 8080 );
testUrl( "scm:svn:svn://username@subversion.tigris.org:8800/pmgt/trunk",
- "svn://subversion.tigris.org:8800/pmgt/trunk", "username", 8800 );
+ "svn://subversion.tigris.org:8800/pmgt/trunk", "username", "subversion.tigris.org", 8800 );
testUrl( "scm:svn:svn+ssh://username@subversion.tigris.org:8080/pmgt/trunk",
- "svn+ssh://username@subversion.tigris.org:8080/pmgt/trunk", null, 8080 );
+ "svn+ssh://username@subversion.tigris.org:8080/pmgt/trunk", null, "username@subversion.tigris.org",
+ 8080 );
}
// ----------------------------------------------------------------------
@@ -132,7 +138,7 @@
//
// ----------------------------------------------------------------------
- private void testUrl( String scmUrl, String expectedUrl, String expectedUser )
+ private void testUrl( String scmUrl, String expectedUrl, String expectedUser, String expectedHost )
throws Exception
{
ScmRepository repository = scmManager.makeScmRepository( scmUrl );
@@ -149,12 +155,16 @@
assertEquals( "url is incorrect", expectedUrl, providerRepository.getUrl() );
assertEquals( "User is incorrect", expectedUser, providerRepository.getUser() );
+
+ assertEquals( "Host is incorrect", expectedHost,
+ ( (SvnScmProviderRepository) repository.getProviderRepository() ).getHost() );
}
- private void testUrl( String scmUrl, String expectedUrl, String expectedUser, int expectedPort )
+ private void testUrl( String scmUrl, String expectedUrl, String expectedUser, String expectedHost,
+ int expectedPort )
throws Exception
{
- testUrl( scmUrl, expectedUrl, expectedUser );
+ testUrl( scmUrl, expectedUrl, expectedUser, expectedHost );
ScmRepository repository = scmManager.makeScmRepository( scmUrl );