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: r290698 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib: ./ command/login/ repository/
Ad
Author: evenisse Date: Wed Sep 21 06:53:23 2005 New Revision: 290698 URL: http://svn.apache.org/viewcvs?rev=290698&... Log: Fix cvs authentication with pserver: o Fix cvsroot comparaison with entries in .cvspass o Add default cvs port in cvsroot for pserver 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/command/login/CvsPass.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.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 Wed Sep 21 06:53:23 2005 @@ -246,6 +246,9 @@ if ( transport.equalsIgnoreCase( TRANSPORT_PSERVER ) ) { + // set default port, it's necessary for checking entries in .cvspass + port = 2401; + if ( tokens.length == 4 ) { String userhost = tokens[1]; 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 Wed Sep 21 06:53:23 2005 @@ -49,7 +49,7 @@ CvsPass passGenerator = new CvsPass( getLogger() );- passGenerator.setCvsroot( repo.getCvsRoot() ); + passGenerator.setCvsroot( repo.getCvsRootForCvsPass() ); 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/command/login/CvsPass.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/CvsPass.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java Wed Sep 21 06:53:23 2005 @@ -109,14 +109,13 @@ while ( ( line = reader.readLine() ) != null ) { - if ( !line.startsWith( cvsRoot ) ) + if ( !line.startsWith( cvsRoot ) && !line.startsWith( "/1 " + cvsRoot ) ) { -// buf.append( line ).append( System.getProperty("line.separator") ); buf.append( line ).append( "\n" ); } else { - logger.debug( "cvsroot " + cvsRoot + " already exist in " + passFile.getAbsolutePath() ); + logger.debug( "cvsroot " + cvsRoot + " already exist in " + passFile.getAbsolutePath() + ". SKIPPED." ); return; } 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 Wed Sep 21 06:53:23 2005 @@ -73,6 +73,11 @@ return cvsroot; }+ public String getCvsRootForCvsPass() + { + return ":" + transport + ":" + getUser() + "@" + host + ":" + port + path; + } + /** * @return The subtype (like pserver). */