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/08 08:29:44 UTC
svn commit: r375881 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src:
main/java/org/apache/maven/scm/provider/svn/repository/
test/java/org/apache/maven/scm/provider/svn/repository/
Author: evenisse
Date: Tue Feb 7 23:29:43 2006
New Revision: 375881
URL: http://svn.apache.org/viewcvs?rev=375881&view=rev
Log:
[SCM-159] Fix NumberFormatException for svn port
Submitted by: Julian Wood
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/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-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java?rev=375881&r1=375880&r2=375881&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java Tue Feb 7 23:29:43 2006
@@ -123,7 +123,7 @@
if ( indexColon > 0 )
{
setHost( hostPort.substring( 0, indexColon ) );
- setPort( Integer.parseInt( hostPort.substring( indexColon ) ) );
+ setPort( Integer.parseInt( hostPort.substring( indexColon + 1 ) ) );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/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-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java?rev=375881&r1=375880&r2=375881&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java Tue Feb 7 23:29:43 2006
@@ -93,6 +93,15 @@
testUrl( "scm:svn:svn+ssh://username@subversion.tigris.org", "svn+ssh://username@subversion.tigris.org", null );
}
+ 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);
+ testUrl("scm:svn:https://username@subversion.tigris.org:8080/pmgt/trunk", "https://subversion.tigris.org:8080/pmgt/trunk", "username", 8080);
+ testUrl("scm:svn:svn://username@subversion.tigris.org:8800/pmgt/trunk", "svn://subversion.tigris.org:8800/pmgt/trunk", "username", 8800);
+ testUrl("scm:svn:svn+ssh://username@subversion.tigris.org:8080/pmgt/trunk", "svn+ssh://username@subversion.tigris.org:8080/pmgt/trunk", null, 8080);
+ }
+
// ----------------------------------------------------------------------
// Testing illegal URLs
// ----------------------------------------------------------------------
@@ -136,6 +145,17 @@
assertEquals( "url is incorrect", expectedUrl, providerRepository.getUrl() );
assertEquals( "User is incorrect", expectedUser, providerRepository.getUser() );
+ }
+
+ private void testUrl(String scmUrl, String expectedUrl, String expectedUser, int expectedPort)
+ throws Exception
+ {
+ testUrl(scmUrl, expectedUrl, expectedUser);
+
+ ScmRepository repository = scmManager.makeScmRepository(scmUrl);
+
+ assertEquals( "Port is incorrect",
+ expectedPort, ((SvnScmProviderRepository) repository.getProviderRepository()).getPort());
}
private void testIllegalUrl( String url )