Return-Path: Delivered-To: apmail-maven-scm-cvs-archive@www.apache.org Received: (qmail 38642 invoked from network); 30 Sep 2005 19:54:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Sep 2005 19:54:27 -0000 Received: (qmail 67476 invoked by uid 500); 30 Sep 2005 19:54:27 -0000 Delivered-To: apmail-maven-scm-cvs-archive@maven.apache.org Received: (qmail 67454 invoked by uid 500); 30 Sep 2005 19:54:26 -0000 Mailing-List: contact scm-cvs-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: scm-cvs@maven.apache.org List-Id: Delivered-To: mailing list scm-cvs@maven.apache.org Received: (qmail 67443 invoked by uid 99); 30 Sep 2005 19:54:26 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 30 Sep 2005 12:54:26 -0700 Received: (qmail 38452 invoked by uid 65534); 30 Sep 2005 19:54:06 -0000 Message-ID: <20050930195406.38449.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 30 Sep 2005 19:54:05 -0000 To: scm-cvs@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Sep 30 12:53:57 2005 New Revision: 292842 URL: http://svn.apache.org/viewcvs?rev=292842&view=rev 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-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java?rev=292842&r1=292841&r2=292842&view=diff ============================================================================== --- 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 ) { //:@ 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-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java?rev=292842&r1=292841&r2=292842&view=diff ============================================================================== --- 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( ":pserver:anoncvs@cvs.apache.org:2401/home/cvspublic", repo.getCvsRoot() ); } + public void testParseRemotePserverConnection2() + throws Exception + { + String url = "pserver:anoncvs:@cvs.apache.org:/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( ":pserver:anoncvs@cvs.apache.org:2401/home/cvspublic", repo.getCvsRoot() ); + } + public void testParseRemotePserverConnectionWithPort() throws Exception { - String url = "pserver:anoncvs@cvs.apache.org:2401:/home/cvspublic:maven"; + String url = "pserver:anoncvs:@cvs.apache.org: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 + "'." ); }