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: r292842 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src: main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
Ad
Author: evenisse Date: Fri Sep 30 12:53:57 2005 New Revision: 292842 URL: http://svn.apache.org/viewcvs?rev=292842&... Log: Allow empty password in scm cvs url with pserver protocol. It's for anonymous connection 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/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 Fri Sep 30 12:53:57 2005 @@ -319,7 +319,7 @@ port = new Integer( tokens[2] ).intValue(); } - else if ( tokens[2].indexOf( "@" ) > 0 ) + else if ( tokens[2].indexOf( "@" ) >= 0 ) { //<username>:<password>@<hostname> user = tokens[1]; 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 Fri Sep 30 12:53:57 2005 @@ -77,10 +77,28 @@ assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); }+ public void testParseRemotePserverConnection2() + throws Exception + { + String url = "pserver::/home/cvspublic:maven"; + + CvsScmProviderRepository repo = testUrl( url ); + + assertEquals( "pserver", repo.getTransport() ); + + assertEquals( "anoncvs", repo.getUser() ); + + assertEquals( "cvs.apache.org", repo.getHost() ); + + assertEquals( "/home/cvspublic", repo.getPath() ); + + assertEquals( "::2401/home/cvspublic", repo.getCvsRoot() ); + } + public void testParseRemotePserverConnectionWithPort() throws Exception { - String url = "pserver::2401:/home/cvspublic:maven"; + String url = "pserver::2401:/home/cvspublic:maven"; CvsScmProviderRepository repo = testUrl( url );@@ -88,6 +106,8 @@ assertEquals( "anoncvs", repo.getUser() );+ assertEquals( "", repo.getPassword() ); + assertEquals( "cvs.apache.org", repo.getHost() ); assertEquals( "/home/cvspublic", repo.getPath() ); @@ -183,9 +203,11 @@ // // ----------------------------------------------------------------------- private CvsScmProviderRepository testUrl( String url, char delimiter ) + private CvsScmProviderRepository testUrl( String url, char delimiter, int nbErrorMessages ) throws Exception { + assertEquals( nbErrorMessages, scmManager.validateScmRepository( "scm:cvs" + delimiter + url ).size() ); + ScmRepository repository = scmManager.makeScmRepository( "scm:cvs" + delimiter + url ); assertNotNull( "ScmManager.makeScmRepository() returned null", repository ); @@ -201,7 +223,13 @@ private CvsScmProviderRepository testUrl( String url ) throws Exception { - return testUrl( url, ':' ); + return testUrl( url, ':', 0 ); + } + + private CvsScmProviderRepository testUrl( String url, char delimiter ) + throws Exception + { + return testUrl( url, delimiter, 0 ); } private void testIllegalUrl( String url ) @@ -209,7 +237,7 @@ { try { - testUrl( "scm:cvs:" + url ); + testUrl( "scm:cvs:" + url, ':', 1 ); fail( "Expected a ScmRepositoryException while testing the url '" + url + "'." ); }