mail archive scm-cvs.maven.apache.org
(List home) (Recent threads) (29 other Apache Maven lists)
Subscription Options
- RSS or Atom: Read-only subscription using a browser or aggregator. This is the recommended way if you don't need to send messages to the list. You can learn more about feed syndication and clients here.
- Conventional: All messages are delivered to your mail address, and you can reply. To subscribe, send an email to the list's subscribe (we seem to have lost it) address with "subscribe" in the subject line.
- This list contains about 334 messages, beginning Mar 2004
- This list doesn't seem to be active
Report the Spam
This button sends a spam report to the moderator. Please use it sparingly. For other removal requests, read this.
Are you sure? yes no
svn commit: r290941 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src: main/java/org/apache/maven/scm/provider/cvslib/ main/java/org/apache/maven/scm/provider/cvslib/command/login/ main/java/org/apache/maven/scm/provider/cvslib/repos...
Ad
Author: evenisse Date: Thu Sep 22 06:28:20 2005 New Revision: 290941 URL: http://svn.apache.org/viewcvs?rev=290941&... Log: Fix cvs url parsing with port. Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk... ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java Thu Sep 22 06:28:20 2005 @@ -353,16 +353,22 @@ module = tokens[4]; }- String userHostPort = host; + String userHost = host; + if ( user != null ) { - userHostPort = user + "@" + host; + userHost = user + "@" + host; } + + // cvsroot format is :pserver:[user@]host:[port]path + cvsroot = ":" + transport + ":" + userHost + ":"; + if ( port != -1 ) { - userHostPort += ":" + port; + cvsroot += port; } - cvsroot = ":" + transport + ":" + userHostPort + ":" + path; + + cvsroot += path; } else { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk... ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsLoginCommand.java Thu Sep 22 06:28:20 2005 @@ -49,7 +49,7 @@ CvsPass passGenerator = new CvsPass( getLogger() );- passGenerator.setCvsroot( repo.getCvsRootForCvsPass() ); + passGenerator.setCvsroot( repo.getCvsRoot() ); passGenerator.setPassword( repo.getPassword() ); try Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk... ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java Thu Sep 22 06:28:20 2005 @@ -73,11 +73,6 @@ return cvsroot; }- public String getCvsRootForCvsPass() - { - return ":" + transport + ":" + getUser() + "@" + host + ":" + port + path; - } - /** * @return The subtype (like pserver). */ Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk... ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java Thu Sep 22 06:28:20 2005 @@ -74,9 +74,7 @@ assertEquals( "/home/cvspublic", repo.getPath() );- assertEquals( "::2401:/home/cvspublic", repo.getCvsRoot() ); - - assertEquals( "::2401/home/cvspublic", repo.getCvsRootForCvsPass() ); + assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); } public void testParseRemotePserverConnectionWithPort() @@ -96,9 +94,7 @@ assertEquals( 2401, repo.getPort() );- assertEquals( "::2401:/home/cvspublic", repo.getCvsRoot() ); - - assertEquals( "::2401/home/cvspublic", repo.getCvsRootForCvsPass() ); + assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); } public void testParseRemotePserverConnectionWithPassword() @@ -118,9 +114,7 @@ assertEquals( "/home/cvspublic", repo.getPath() );- assertEquals( "::2401:/home/cvspublic", repo.getCvsRoot() ); - - assertEquals( "::2401/home/cvspublic", repo.getCvsRootForCvsPass() ); + assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); } public void testParseRemotePserverConnectionWithPortAndPassword() @@ -142,9 +136,7 @@ assertEquals( 2401, repo.getPort() );- assertEquals( "::2401:/home/cvspublic", repo.getCvsRoot() ); - - assertEquals( "::2401/home/cvspublic", repo.getCvsRootForCvsPass() ); + assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); } public void testParseRemotePserverConnectionWithBarsAsDelimiter() @@ -162,9 +154,7 @@ assertEquals( "/home/cvspublic", repo.getPath() );- assertEquals( "::2401:/home/cvspublic", repo.getCvsRoot() ); - - assertEquals( "::2401/home/cvspublic", repo.getCvsRootForCvsPass() ); + assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); } public void testIllegalRepository()