From scm-commitskimberlythompson@example.net Mon May 01 23:54:29 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 11662 invoked from network); 1 May 2006 23:54:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 May 2006 23:54:27 -0000 Received: (qmail 43477 invoked by uid 500); 1 May 2006 23:54:27 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 43452 invoked by uid 500); 1 May 2006 23:54:27 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 43441 invoked by uid 99); 1 May 2006 23:54:26 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 May 2006 16:54:26 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 01 May 2006 16:54:26 -0700 Received: (qmail 11592 invoked by uid 65534); 1 May 2006 23:54:05 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r398743 - in /maven/scm/trunk/sandbox: maven-scm-provider-cvsjava/pom.xml maven-scm-provider-svnjava/pom.xml Date: Mon, 01 May 2006 23:54:05 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Mon May 1 16:54:02 2006 New Revision: 398743 URL: http://svn.apache.org/viewcvs?rev=398743&view=rev Log: Upgrade versions to latest release Modified: maven/scm/trunk/sandbox/maven-scm-provider-cvsjava/pom.xml maven/scm/trunk/sandbox/maven-scm-provider-svnjava/pom.xml Modified: maven/scm/trunk/sandbox/maven-scm-provider-cvsjava/pom.xml URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-cvsjava/pom.xml?rev=398743&r1=398742&r2=398743&view=diff ============================================================================== --- maven/scm/trunk/sandbox/maven-scm-provider-cvsjava/pom.xml (original) +++ maven/scm/trunk/sandbox/maven-scm-provider-cvsjava/pom.xml Mon May 1 16:54:02 2006 @@ -2,7 +2,7 @@ <parent> <artifactId>maven-scm-providers-cvs</artifactId> <groupId>org.apache.maven.scm</groupId> - <version>1.0-beta-3-SNAPSHOT</version> + <version>1.0-beta-3</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>maven-scm-provider-cvsJava</artifactId> @@ -12,7 +12,7 @@ <dependency> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-cvs-commons</artifactId> - <version>1.0-beta-3-SNAPSHOT</version> + <version>1.0-beta-3</version> </dependency> <dependency> <groupId>org.netbeans.lib</groupId> @@ -22,7 +22,7 @@ <dependency> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-cvstest</artifactId> - <version>1.0-beta-3-SNAPSHOT</version> + <version>1.0-beta-3</version> <scope>test</scope> </dependency> </dependencies> Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/pom.xml URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/pom.xml?rev=398743&r1=398742&r2=398743&view=diff ============================================================================== --- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/pom.xml (original) +++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/pom.xml Mon May 1 16:54:02 2006 @@ -2,7 +2,7 @@ <parent> <artifactId>maven-scm-providers-svn</artifactId> <groupId>org.apache.maven.scm</groupId> - <version>1.0-beta-3-SNAPSHOT</version> + <version>1.0-beta-3</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>maven-scm-provider-svnjava</artifactId> @@ -27,12 +27,12 @@ <dependency> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-svn-commons</artifactId> - <version>1.0-beta-3-SNAPSHOT</version> + <version>1.0-beta-3</version> </dependency> <dependency> <groupId>org.tmate</groupId> <artifactId>javasvn</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </dependency> <!-- dependency> <groupId>commons-httpclient</groupId> @@ -42,7 +42,7 @@ <dependency> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-svntest</artifactId> - <version>1.0-beta-3-SNAPSHOT</version> + <version>1.0-beta-3</version> <scope>test</scope> </dependency> </dependencies> From scm-commitskimberlythompson@example.net Mon May 01 23:54:50 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 11750 invoked from network); 1 May 2006 23:54:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 May 2006 23:54:50 -0000 Received: (qmail 43623 invoked by uid 500); 1 May 2006 23:54:50 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 43613 invoked by uid 500); 1 May 2006 23:54:50 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 43602 invoked by uid 99); 1 May 2006 23:54:49 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 May 2006 16:54:49 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 01 May 2006 16:54:49 -0700 Received: (qmail 11680 invoked by uid 65534); 1 May 2006 23:54:29 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r398744 - in /maven/scm/trunk: pom.xml sandbox/pom.xml Date: Mon, 01 May 2006 23:54:28 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Mon May 1 16:54:25 2006 New Revision: 398744 URL: http://svn.apache.org/viewcvs?rev=398744&view=rev Log: Added sandbox pom for convenience Added: maven/scm/trunk/sandbox/pom.xml (with props) Modified: maven/scm/trunk/pom.xml Modified: maven/scm/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/scm/trunk/pom.xml?rev=398744&r1=398743&r2=398744&view=diff ============================================================================== --- maven/scm/trunk/pom.xml (original) +++ maven/scm/trunk/pom.xml Mon May 1 16:54:25 2006 @@ -70,6 +70,7 @@ <module>maven-scm-plugin</module> <module>maven-scm-providers</module> <module>maven-scm-test</module> + <!-- <module>sandbox</module> --> </modules> <dependencies> <dependency> Added: maven/scm/trunk/sandbox/pom.xml URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/pom.xml?rev=398744&view=auto ============================================================================== --- maven/scm/trunk/sandbox/pom.xml (added) +++ maven/scm/trunk/sandbox/pom.xml Mon May 1 16:54:25 2006 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>maven-scm</artifactId> + <groupId>org.apache.maven.scm</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>maven-scm-sandbox</artifactId> + <packaging>pom</packaging> + <name>Maven SCM Sandbox</name> + <version>1.0-SNAPSHOT</version> + <modules> + <module>maven-scm-provider-svnjava</module> + <module>maven-scm-provider-cvsjava</module> + </modules> +</project> \ No newline at end of file Propchange: maven/scm/trunk/sandbox/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/scm/trunk/sandbox/pom.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" From scm-commitskimberlythompson@example.net Wed May 03 13:08:41 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 53472 invoked from network); 3 May 2006 13:08:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 May 2006 13:08:39 -0000 Received: (qmail 83694 invoked by uid 500); 3 May 2006 13:08:30 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 83669 invoked by uid 500); 3 May 2006 13:08:29 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Delivered-To: moderator for kimberlythompson@example.net Received: (qmail 28106 invoked by uid 99); 3 May 2006 11:33:53 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r399266 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src: main/java/org/apache/maven/scm/provider/bazaar/ main/java/org/apache/maven/scm/provider/bazaar/command/add/ main/java/org/apache/maven/scm/provider/bazaar/comm... Date: Wed, 03 May 2006 11:33:17 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smorgrav Date: Wed May 3 04:33:13 2006 New Revision: 399266 URL: http://svn.apache.org/viewcvs?rev=399266&view=rev Log: Fix bug in validScmUrl() and extend repository to handle sftp and https urls Changes to the bazaar provider: * BazaarScmProvider - fix bug in validateScmUrl - formatting * BazaarScmProviderRepository and Test: - extend ScmProviderRepositoryWithHost - parse file, [a|s]ftp and http[s] protocols - enable external authentication information (from super class) - add validation and diagnostic method - add unit tests for the parser * BazaarConfig - fix bogus version parser - javadoc and formatting * BazaarTestUtils: - add file protocol to the test url (explicit protocol now required) - formatting * BazaarUtils - formatting * Bazaar[Update|Status|CheckIn|Diff|Add]Command - formatting * BazaarRemoveCommand and Consumer - add consumer implementation Added: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/repository/ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepositoryTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java Wed May 3 04:33:13 2006 @@ -24,6 +24,8 @@ import org.codehaus.plexus.util.cli.Commandline; import java.io.File; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Check bazaar installation. @@ -91,7 +93,7 @@ int exitCode; try { - Commandline cmdLine = buildPythonCmd( workingDir, new String[]{"-c", cmd} ); + Commandline cmdLine = buildPythonCmd( workingDir, new String[] { "-c", cmd } ); exitCode = BazaarUtils.executeCmd( consumer, cmdLine ); } catch ( ScmException e ) @@ -103,7 +105,6 @@ return exitCode == 0 && consumer.getConsumedAndClear().equals( "" ); } - /** * @return True if one can run basic bazaar commands */ @@ -123,7 +124,7 @@ public static VersionConsumer getBazaarVersion( File workingDir ) throws ScmException { - String[] versionCmd = new String[]{BazaarCommand.VERSION}; + String[] versionCmd = new String[] { BazaarCommand.VERSION }; VersionConsumer consumer = new VersionConsumer( BAZAAR_VERSION_TAG ); Commandline cmd = BazaarUtils.buildCmd( workingDir, versionCmd ); @@ -137,7 +138,7 @@ public static VersionConsumer getPythonVersion( File workingDir ) throws ScmException { - String[] versionCmd = new String[]{PYTHON_VERSION}; + String[] versionCmd = new String[] { PYTHON_VERSION }; VersionConsumer consumer = new VersionConsumer( PYTHON_VERSION_TAG ); Commandline cmd = buildPythonCmd( workingDir, versionCmd ); @@ -169,12 +170,15 @@ } /** - * Get version of the bazaar executable <p/> Resolve revision to the last - * integer found in the command output. + * Get version of the executable. + * Version is resolved to the last match of a defined regexp in the command output. */ private static class VersionConsumer extends BazaarConsumer { + + private static Pattern VERSION_PATTERN = Pattern.compile("[\\d]+.?[\\d]*"); + private final String version_tag; private String versionStr = "NA"; @@ -202,7 +206,19 @@ boolean isVersionOk( float min ) { - return true; //min <= version; + + Matcher matcher = VERSION_PATTERN.matcher(versionStr); + if (matcher.find()) { + String subStr = versionStr.substring(matcher.start(), matcher.end()); + try { + version = Float.valueOf(subStr).floatValue(); + } catch (NumberFormatException e) { + //Print diagnostics and continue (this is not a major error) + getLogger().error("Regexp for version did not result in a number: " + subStr, e); + } + } + + return min <= version; } } @@ -242,11 +258,12 @@ public String toString( File workingDir ) { boolean bzrOk = bazaarVersion.isVersionOk( BAZAAR_REQ ); - boolean pyOk = bazaarVersion.isVersionOk( PYTHON_REQ ); - return "\n Your Bazaar installation seems to be " + getInstalledStr() + "\n Python version: " + - pythonVersion.getVersion() + ( pyOk ? " (OK)" : " (TOO OLD!)" ) + "\n Bazaar version: " + - bazaarVersion.getVersion() + ( bzrOk ? " (OK)" : " (TOO OLD!)" ) + "\n Paramiko installed: " + paramiko + - " (For remote access eg. sftp) " + "\n cCrypt installed: " + cCrypt + " (For remote access eg. sftp) " + - "\n cElementTree installed: " + cElementTree + " (Not mandatory) " + "\n"; + boolean pyOk = pythonVersion.isVersionOk( PYTHON_REQ ); + return "\n Your Bazaar installation seems to be " + getInstalledStr() + "\n Python version: " + + pythonVersion.getVersion() + ( pyOk ? " (OK)" : " (May be INVALID)" ) + "\n Bazaar version: " + + bazaarVersion.getVersion() + ( bzrOk ? " (OK)" : " (May be INVALID)" ) + "\n Paramiko installed: " + + paramiko + " (For remote access eg. sftp) " + "\n cCrypt installed: " + cCrypt + + " (For remote access eg. sftp) " + "\n cElementTree installed: " + cElementTree + " (Not mandatory) " + + "\n"; } -} +} \ No newline at end of file Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java Wed May 3 04:33:13 2006 @@ -90,16 +90,20 @@ public List validateScmUrl( String scmSpecificUrl, char delimiter ) { + List errorMessages = new ArrayList(); - String[] checkCmd = new String[]{BazaarCommand.CHECK, scmSpecificUrl}; + String[] checkCmd = new String[] { BazaarCommand.CHECK, scmSpecificUrl }; ScmResult result; try { File tmpDir = new File( System.getProperty( "java.io.tmpdir" ) ); result = BazaarUtils.execute( tmpDir, checkCmd ); - errorMessages.add( result.getCommandOutput() ); - errorMessages.add( result.getProviderMessage() ); + if ( !result.isSuccess() ) + { + errorMessages.add( result.getCommandOutput() ); + errorMessages.add( result.getProviderMessage() ); + } } catch ( ScmException e ) { @@ -217,4 +221,4 @@ return (UpdateScmResult) command.execute( repository.getProviderRepository(), fileSet, parameters ); } -} +} \ No newline at end of file Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java Wed May 3 04:33:13 2006 @@ -89,9 +89,9 @@ if ( !success ) { BazaarConfig config = new BazaarConfig( workingDir ); - providerMsg = "\nEXECUTION FAILED" + "\n Execution of cmd : " + cmdAndArgs[0] + - " failed with exit code: " + exitCode + "." + "\n Working directory was: " + "\n " + - workingDir.getAbsolutePath() + config.toString( workingDir ) + "\n"; + providerMsg = "\nEXECUTION FAILED" + "\n Execution of cmd : " + cmdAndArgs[0] + + " failed with exit code: " + exitCode + "." + "\n Working directory was: " + "\n " + + workingDir.getAbsolutePath() + config.toString( workingDir ) + "\n"; logger.error( providerMsg ); } @@ -99,8 +99,9 @@ } catch ( ScmException se ) { - String msg = "EXECUTION FAILED" + - "\n Execution failed before invoking the Bazaar command. Last exception:" + "\n " + se.getMessage(); + String msg = "EXECUTION FAILED" + + "\n Execution failed before invoking the Bazaar command. Last exception:" + "\n " + + se.getMessage(); //Add nested cause if any if ( se.getCause() != null ) @@ -178,7 +179,7 @@ throws ScmException { - String[] revCmd = new String[]{BazaarCommand.REVNO_CMD}; + String[] revCmd = new String[] { BazaarCommand.REVNO_CMD }; BazaarRevNoConsumer consumer = new BazaarRevNoConsumer( logger ); BazaarUtils.execute( consumer, logger, workingDir, revCmd ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java Wed May 3 04:33:13 2006 @@ -37,10 +37,10 @@ implements BazaarCommand { protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message, - boolean binary ) + boolean binary ) throws ScmException { - String[] addCmd = new String[]{ADD_CMD, NO_RECURSE_OPTION}; + String[] addCmd = new String[] { ADD_CMD, NO_RECURSE_OPTION }; addCmd = BazaarUtils.expandCommandLine( addCmd, fileSet ); File workingDir = fileSet.getBasedir(); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java Wed May 3 04:33:13 2006 @@ -45,7 +45,7 @@ { protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message, - String tag ) + String tag ) throws ScmException { @@ -66,8 +66,8 @@ for ( Iterator it = statusFiles.iterator(); it.hasNext(); ) { ScmFile file = (ScmFile) it.next(); - if ( file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED || - file.getStatus() == ScmFileStatus.MODIFIED ) + if ( file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED + || file.getStatus() == ScmFileStatus.MODIFIED ) { commitedFiles.add( new ScmFile( file.getPath(), ScmFileStatus.CHECKED_IN ) ); } @@ -83,18 +83,18 @@ } // Commit to local branch - String[] commitCmd = new String[]{BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, message}; + String[] commitCmd = new String[] { BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, message }; commitCmd = BazaarUtils.expandCommandLine( commitCmd, fileSet ); - ScmResult result = - BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), commitCmd ); + ScmResult result = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), + commitCmd ); // Push to parent branch if any BazaarScmProviderRepository repository = (BazaarScmProviderRepository) repo; if ( !repository.getURI().equals( fileSet.getBasedir().getAbsolutePath() ) ) { - String[] push_cmd = new String[]{BazaarCommand.PUSH_CMD, repository.getURI()}; - result = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet - .getBasedir(), push_cmd ); + String[] push_cmd = new String[] { BazaarCommand.PUSH_CMD, repository.getURI() }; + result = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), + push_cmd ); } return new CheckInScmResult( commitedFiles, result ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java Wed May 3 04:33:13 2006 @@ -64,12 +64,12 @@ } // Do the actual checkout - String[] checkout_cmd = new String[]{BRANCH_CMD, url, checkoutDir.getAbsolutePath()}; + String[] checkout_cmd = new String[] { BRANCH_CMD, url, checkoutDir.getAbsolutePath() }; BazaarConsumer checkout_consumer = new BazaarConsumer( getLogger() ); BazaarUtils.execute( checkout_consumer, getLogger(), checkoutDir.getParentFile(), checkout_cmd ); // Do inventory to find list of checkedout files - String[] inventory_cmd = new String[]{INVENTORY_CMD}; + String[] inventory_cmd = new String[] { INVENTORY_CMD }; BazaarCheckOutConsumer consumer = new BazaarCheckOutConsumer( getLogger(), checkoutDir ); ScmResult result = BazaarUtils.execute( consumer, getLogger(), checkoutDir, inventory_cmd ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java Wed May 3 04:33:13 2006 @@ -35,7 +35,7 @@ { protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, String startRevision, - String endRevision ) + String endRevision ) throws ScmException { @@ -47,11 +47,11 @@ { revArg += ".." + endRevision; } - diffCmd = new String[]{DIFF_CMD, REVISION_OPTION, revArg}; + diffCmd = new String[] { DIFF_CMD, REVISION_OPTION, revArg }; } else { - diffCmd = new String[]{DIFF_CMD}; + diffCmd = new String[] { DIFF_CMD }; } diffCmd = BazaarUtils.expandCommandLine( diffCmd, fileSet ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java Wed May 3 04:33:13 2006 @@ -106,9 +106,9 @@ { // ignore (to avoid conflicts with add and remove tokens) } - else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) || - line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( RANGE_TOKEN ) || - line.startsWith( NO_NEWLINE_TOKEN ) ) + else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) + || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( RANGE_TOKEN ) + || line.startsWith( NO_NEWLINE_TOKEN ) ) { currentDifference.append( line ).append( "\n" ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java Wed May 3 04:33:13 2006 @@ -38,10 +38,11 @@ throws ScmException { - String[] command = new String[]{REMOVE_CMD}; + String[] command = new String[] { REMOVE_CMD }; BazaarUtils.expandCommandLine( command, fileSet ); - BazaarRemoveConsumer consumer = new BazaarRemoveConsumer( getLogger() ); + File workingDir = fileSet.getBasedir(); + BazaarRemoveConsumer consumer = new BazaarRemoveConsumer( getLogger(), workingDir ); ScmResult result = BazaarUtils.execute( consumer, getLogger(), workingDir, command ); return new RemoveScmResult( consumer.getRemovedFiles(), result ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveConsumer.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveConsumer.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveConsumer.java Wed May 3 04:33:13 2006 @@ -16,10 +16,12 @@ * limitations under the License. */ +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer; +import java.io.File; import java.util.ArrayList; import java.util.List; @@ -29,20 +31,37 @@ public class BazaarRemoveConsumer extends BazaarConsumer { + private final File workingDir; + private final List removedFiles = new ArrayList(); - public BazaarRemoveConsumer( ScmLogger logger ) + public BazaarRemoveConsumer( ScmLogger logger, File workingDir ) { super( logger ); + this.workingDir = workingDir; } public void doConsume( ScmFileStatus status, String trimmedLine ) { - //TODO + if ( status != null && status == ScmFileStatus.DELETED ) + { + //Only include real files (not directories) + File tmpFile = new File( workingDir, trimmedLine ); + if ( !tmpFile.exists() ) + { + getLogger().warn( "Not a file: " + tmpFile + ". Ignored" ); + } + else + { + ScmFile scmFile = new ScmFile( trimmedLine, ScmFileStatus.DELETED ); + getLogger().info( scmFile.toString() ); + removedFiles.add( scmFile ); + } + } } public List getRemovedFiles() { return removedFiles; } -} +} \ No newline at end of file Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java Wed May 3 04:33:13 2006 @@ -46,7 +46,7 @@ File workingDir = fileSet.getBasedir(); BazaarStatusConsumer consumer = new BazaarStatusConsumer( getLogger(), workingDir ); - String[] statusCmd = new String[]{STATUS_CMD}; + String[] statusCmd = new String[] { STATUS_CMD }; ScmResult result = BazaarUtils.execute( consumer, getLogger(), workingDir, statusCmd ); return new StatusScmResult( consumer.getStatus(), result ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java Wed May 3 04:33:13 2006 @@ -59,9 +59,9 @@ File workingDir = fileSet.getBasedir(); // Update branch - String[] update_cmd = new String[]{BazaarCommand.PULL_CMD}; - ScmResult updateResult = - BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), workingDir, update_cmd ); + String[] update_cmd = new String[] { BazaarCommand.PULL_CMD }; + ScmResult updateResult = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), workingDir, + update_cmd ); if ( !updateResult.isSuccess() ) { @@ -71,7 +71,7 @@ // Find changes from last revision int currentRevision = BazaarUtils.getCurrentRevisionNumber( getLogger(), workingDir ); int previousRevision = currentRevision - 1; - String[] diffCmd = new String[]{DIFF_CMD, REVISION_OPTION, "" + previousRevision}; + String[] diffCmd = new String[] { DIFF_CMD, REVISION_OPTION, "" + previousRevision }; BazaarDiffConsumer diffConsumer = new BazaarDiffConsumer( getLogger(), workingDir ); ScmResult diffResult = BazaarUtils.execute( diffConsumer, getLogger(), workingDir, diffCmd ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java Wed May 3 04:33:13 2006 @@ -16,7 +16,7 @@ * limitations under the License. */ -import org.apache.maven.scm.provider.ScmProviderRepository; +import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost; import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -25,41 +25,248 @@ * @author <a href="mailto:kimberlythompson@example.net">Torbjørn Eikli Smørgrav</a> */ public class BazaarScmProviderRepository - extends ScmProviderRepository + extends ScmProviderRepositoryWithHost { - private final String uri; + //Known and tested protocols + private static final String FILE = "file://"; + + private static final String SFTP = "sftp://"; + + private static final String FTP = "ftp://"; + + private static final String AFTP = "aftp://"; + + private static final String HTTP = "http://"; + + private static final String HTTPS = "https://"; + + private static final String UNKNOWN = ""; + + private final String path; + + private final String protocol; + + private final String orgUrl; public BazaarScmProviderRepository( String url ) { - this.uri = toURI( url ); + orgUrl = url; + protocol = getProtocol( url ); + path = parseUrl( url ); } public String getURI() { - return uri; + return protocol + (needsAuthentication() ? addUser() + addPassword() + addAt() : "") + addHost() + addPort() + addPath(); + } + + /** + * @return A message if the repository as an invalid URI, null if the URI seems fine. + */ + public String validateURI() + { + + String msg = null; + + if ( protocol == UNKNOWN ) + { + msg = "Unknown protocol (URL should start with something like 'sftp://' or 'file://'"; + } + else if ( needsAuthentication() ) + { + if ( getUser() == null ) + { + msg = "Username is missing for protocol " + protocol; + } + else if ( getPassword() == null ) + { + msg = "Password is missing for protocol " + protocol; + } + else if ( getHost() == null ) + { + msg = "Host (eg. www.myhost.com) is missing for protocol " + protocol; + } + } + + else if ( getPort() != 0 && getHost() == null ) + { + msg = "Got port information without any host for protocol " + protocol; + } + + if ( msg != null ) + { + msg = "Something could be wrong about the repository URL: " + orgUrl + "\nReason: " + msg + + "\nCheck http://maven.apache.org/scm for usage and hints."; + } + return msg; + } + + private String getProtocol( String url ) + { + String prot = UNKNOWN; + if ( url.startsWith( FILE ) ) + { + prot = FILE; + } + else if ( url.startsWith( FTP ) ) + { + prot = FTP; + } + else if ( url.startsWith( SFTP ) ) + { + prot = SFTP; + } + else if ( url.startsWith( AFTP ) ) + { + prot = AFTP; + } + else if ( url.startsWith( HTTP ) ) + { + prot = HTTP; + } + else if ( url.startsWith( HTTPS ) ) + { + prot = HTTPS; + } + + return prot; + } + + private String parseUrl( String url ) + { + if ( protocol == UNKNOWN ) + { + return url; + } + + //Strip protocol + url = url.substring( protocol.length() ); + + url = parseUsernameAndPassword( url ); + + url = parseHostAndPort( url ); + + url = parsePath( url ); + + return url; //is now only the path + } + + private String parseHostAndPort( String url ) + { + if ( protocol != FILE ) + { + String[] split = url.split( ":" ); + if ( split.length == 2 ) + { + setHost( split[0] ); + url = url.substring( split[0].length() + 1 ); + split = split[1].split( "/" ); + if ( split.length == 2 ) + { + url = url.substring( split[0].length() ); + try { + setPort( Integer.valueOf( split[0] ).intValue() ); + } catch (NumberFormatException e) { + //Ignore - error will manifest itself later. + } + } + } + else + { + split = url.split( "/" ); + if ( split.length > 1 ) + { + url = url.substring( split[0].length() ); + setHost( split[0] ); + } + } + } + return url; } - private String toURI( String orgURL ) + private String parseUsernameAndPassword( String url ) { - String newURI = orgURL; + if ( needsAuthentication() ) + { + String[] split = url.split( "@" ); + if ( split.length == 2 ) + { + url = split[1]; //Strip away 'username:password@' from url + split = split[0].split( ":" ); + if ( split.length == 2 ) + { //both username and password + setUser( split[0] ); + setPassword( split[1] ); + } + else + { //only username + setUser( split[0] ); + } + } + } + return url; + } - //Only file urls needs special handling - if ( orgURL.startsWith( "file" ) ) + private String parsePath( String url ) + { + if ( protocol == FILE ) { - newURI = orgURL.substring( "file://".length() ); - String fileSeparator = System.getProperty( "file.separator" ); - newURI = StringUtils.replace( newURI, "/", fileSeparator ); - File tmpFile = new File( newURI ); - String newURI2 = newURI.substring( fileSeparator.length() ); - File tmpFile2 = new File( newURI2 ); + //Use OS dependent path separator + url = StringUtils.replace( url, "/", File.separator ); + + //Test first path separator (*nix systems use them to denote root) + File tmpFile = new File( url ); //most likly a *nix system + String url2 = url.substring( File.pathSeparator.length() ); + File tmpFile2 = new File( url2 ); //most likly a windows system if ( !tmpFile.exists() && !tmpFile2.exists() ) { - // TODO make fail fast + // This is trouble - Trouble is reported in validateURI() } - newURI = tmpFile2.exists() ? newURI2 : newURI; + url = tmpFile2.exists() ? url2 : url; } - return newURI; + return url; + } + + private String addUser() + { + return ( getUser() == null ) ? "" : getUser(); + } + + private String addPassword() + { + return ( getPassword() == null ) ? "" : ":" + getPassword(); + } + + private String addAt() + { + return needsAuthentication() ? "@" : ""; + } + + private String addHost() + { + return ( getHost() == null ) ? "" : getHost(); + } + + private String addPort() + { + return ( getPort() == 0 ) ? "" : ":" + getPort(); + } + + private String addPath() + { + return path; + } + + private boolean needsAuthentication() + { + return protocol == SFTP || protocol == FTP || protocol == HTTPS || protocol == AFTP; + } + + public String toString() + { + return "Bazaar Repository Interpreted from: " + orgUrl + ":\nProtocol: " + protocol + "\nHost: " + getHost() + + "\nPort: " + getPort() + "\nUsername: " + getUser() + "\nPassword: " + getPassword() + "\nPath: " + path; } -} +} \ No newline at end of file Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java?rev=399266&r1=399265&r2=399266&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java Wed May 3 04:33:13 2006 @@ -34,8 +34,11 @@ public class BazaarTestUtils { - public static final String[] filesInTestBranch = - new String[]{"pom.xml", "readme.txt", "src/main/java/Application.java", "src/test/java/Test.java"}; + public static final String[] filesInTestBranch = new String[] { + "pom.xml", + "readme.txt", + "src/main/java/Application.java", + "src/test/java/Test.java" }; public static final String TCK_FILE_CONSTANT = "/"; @@ -48,7 +51,7 @@ public static String getScmUrl() throws Exception { - return "scm:bazaar:" + WORKING_DIR.getAbsolutePath(); + return "scm:bazaar:file://" + WORKING_DIR.getAbsolutePath(); } public static void initRepo() @@ -73,7 +76,7 @@ } // Init repository - String[] init_cmd = new String[]{BazaarCommand.INIT_CMD}; + String[] init_cmd = new String[] { BazaarCommand.INIT_CMD }; BazaarUtils.execute( WORKING_DIR, init_cmd ); // Create and add files to repository @@ -97,24 +100,24 @@ } //Add to repository - String[] add_cmd = new String[]{BazaarCommand.ADD_CMD}; + String[] add_cmd = new String[] { BazaarCommand.ADD_CMD }; ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), (File[]) files.toArray( new File[0] ) ); add_cmd = BazaarUtils.expandCommandLine( add_cmd, filesToAdd ); ScmResult result = BazaarUtils.execute( WORKING_DIR, add_cmd ); if ( !result.isSuccess() ) { - String message = - "Provider message: " + result.getProviderMessage() + "\n" + "Output: " + result.getCommandOutput(); + String message = "Provider message: " + result.getProviderMessage() + "\n" + "Output: " + + result.getCommandOutput(); throw new Exception( message ); } // Commit the initial repository - String[] commit_cmd = new String[]{BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, COMMIT_MESSAGE}; + String[] commit_cmd = new String[] { BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, COMMIT_MESSAGE }; result = BazaarUtils.execute( WORKING_DIR, commit_cmd ); if ( !result.isSuccess() ) { - String message = - "Provider message: " + result.getProviderMessage() + "\n" + "Output: " + result.getCommandOutput(); + String message = "Provider message: " + result.getProviderMessage() + "\n" + "Output: " + + result.getCommandOutput(); throw new Exception( message ); } } Added: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepositoryTest.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepositoryTest.java?rev=399266&view=auto ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepositoryTest.java (added) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepositoryTest.java Wed May 3 04:33:13 2006 @@ -0,0 +1,106 @@ +package org.apache.maven.scm.provider.bazaar.repository; + +/* + * Copyright 2001-2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import junit.framework.TestCase; + +public class BazaarScmProviderRepositoryTest + extends TestCase +{ + + public void testInvalidRepo() + { + //No protocol - makes it invalid + String url = "username:kimberlythompson@example.net/~/dev/maven"; + BazaarScmProviderRepository repo = new BazaarScmProviderRepository( url ); + assertNotNull( repo.validateURI() ); + } + + public void testFileRepo() + { + //1. Test *nix like paths + String url = "file:///home/username/dev/maven"; + BazaarScmProviderRepository repo = new BazaarScmProviderRepository( url ); + assertNull( repo.validateURI() ); + + //2. Test windows like paths (with slash) + url = "file://C:/Documents and Settings/username/dev/maven"; + repo = new BazaarScmProviderRepository( url ); + assertNull( repo.validateURI() ); + + //3. Test windows like paths (with backslash) + url = "file://C:\\Documents and Settings\\username\\dev\\maven"; + repo = new BazaarScmProviderRepository( url ); + assertNull( repo.validateURI() ); + + //4. Test invalid file url + url = "file:/C:\\Documents and Settings\\username\\dev\\maven"; + repo = new BazaarScmProviderRepository( url ); + assertNotNull( repo.validateURI() ); + } + + public void testSFTPRepo() + { + //1. Test with relativ path + String url = "sftp://username:kimberlythompson@example.net/~/dev/maven"; + BazaarScmProviderRepository repo = new BazaarScmProviderRepository( url ); + assertEquals( url, repo.getURI() ); + assertNull( repo.validateURI() ); + + //2. Test with absolute path + url = "sftp://username:kimberlythompson@example.net/home/username/dev/maven"; + repo = new BazaarScmProviderRepository( url ); + assertEquals( url, repo.getURI() ); + assertNull( repo.validateURI() ); + + //3. Test with incomplete URL but set password later + String incompleteUrl = "sftp://kimberlythompson@example.net/home/username/dev/maven"; + repo = new BazaarScmProviderRepository( incompleteUrl ); + assertEquals( incompleteUrl, repo.getURI() ); //This should still work... + assertNotNull( repo.validateURI() ); + + //Set password + repo.setPassword( "password" ); + assertEquals( url, repo.getURI() ); + assertNull( repo.validateURI() ); + } + + public void testHTTPRepo() + { + //1. Test with relativ path + String url = "http://www.myhost.com/~username/dev/maven"; + BazaarScmProviderRepository repo = new BazaarScmProviderRepository( url ); + assertEquals( url, repo.getURI() ); + assertNull( repo.validateURI() ); + + //2. Test with absolute path + url = "http://www.myhost.com/dev/maven"; + repo = new BazaarScmProviderRepository( url ); + assertEquals( url, repo.getURI() ); + assertNull( repo.validateURI() ); + + //3. Test with unessesary authentication information + repo.setPassword("Password"); + repo.setUser("User"); + repo.setPassphrase("Passphrase"); + assertEquals( "http://www.myhost.com/dev/maven", repo.getURI() ); + assertNull( repo.validateURI() ); + repo.setPort(81); + assertEquals( "http://www.myhost.com:81/dev/maven", repo.getURI() ); + assertNull( repo.validateURI() ); + } +} \ No newline at end of file From scm-commitskimberlythompson@example.net Thu May 04 08:19:09 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 14385 invoked from network); 4 May 2006 08:19:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 May 2006 08:19:08 -0000 Received: (qmail 77054 invoked by uid 500); 4 May 2006 08:19:08 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 77032 invoked by uid 500); 4 May 2006 08:19:07 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 77020 invoked by uid 99); 4 May 2006 08:19:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 01:19:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 01:19:06 -0700 Received: (qmail 14154 invoked by uid 65534); 4 May 2006 08:18:46 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399605 - /maven/scm/trunk/maven-scm-site/src/site/apt/bazaar.apt Date: Thu, 04 May 2006 08:18:43 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smorgrav Date: Thu May 4 01:18:40 2006 New Revision: 399605 URL: http://svn.apache.org/viewcvs?rev=399605&view=rev Log: Updated bazaar.apt with information about versions, protocol support and a descriptive paragraph about Bazaar taken from the Bazaar homepage. Modified: maven/scm/trunk/maven-scm-site/src/site/apt/bazaar.apt Modified: maven/scm/trunk/maven-scm-site/src/site/apt/bazaar.apt URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/apt/bazaar.apt?rev=399605&r1=399604&r2=399605&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-site/src/site/apt/bazaar.apt (original) +++ maven/scm/trunk/maven-scm-site/src/site/apt/bazaar.apt Thu May 4 01:18:40 2006 @@ -10,26 +10,33 @@ * General Info - Link : {{http://bazaar.canonical.com/}} + Link : {{http://bazaar-vcs.org/}} License : GNU General Public License - Notes: The implementation is simulating a centralized revision control system. - Checkin is thus implemented as commit and push. + "Bazaar-NG is a decentralized revision control system designed to be easy for developers + and end users alike. Decentralized revision control systems give people the ability to work + over the internet using the bazaar development model. When you use Bazaar-NG, you can commit + to your own branches of your favorite free software projects without needing special permission." + + The provider supports Bazaar from version 0.7, though important features like sftp transport where + not included before version 0.8. * SCM Url - Path or url to the branch directory. Only the http has been tested. + Path or url to the branch location. + Supported protocols: FTP, SFTP, AFTP, HTTP, HTTPS and FILE. ------- -scm:bazaar<delimiter>path_to_repository -scm:bazaar<delimiter>url_to_repository +scm:bazaar:url_to_repository ------- * Examples ------- -scm:bazaar:http://localhost/v3 (read only) -scm:bazaar|C:/dev/project/v3 -scm:bazaar:/home/smorgrav/dev/project/v3 +scm:bazaar:http://host/v3 (read only) +scm:bazaar:sftp://username:password@host/~/dev/project/v3 (relativ path) +scm:bazaar:sftp://host:port/home/smorgrav/dev/project/v3 (absolute path without explicit username) +scm:bazaar:file://C:/dev/project/v3 (windows drive) +scm:bazaar:file:///home/smorgrav/dev/project/v3 (linux drive) ------- From scm-commitskimberlythompson@example.net Thu May 04 12:48:56 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 62716 invoked from network); 4 May 2006 12:48:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 May 2006 12:48:56 -0000 Received: (qmail 69875 invoked by uid 500); 4 May 2006 12:48:56 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 69854 invoked by uid 500); 4 May 2006 12:48:55 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 69822 invoked by uid 99); 4 May 2006 12:48:55 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 05:48:55 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 05:48:54 -0700 Received: (qmail 61707 invoked by uid 65534); 4 May 2006 12:48:34 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399689 - in /maven/scm/trunk/maven-scm-site/src/site: apt/scms-overview.apt site.xml Date: Thu, 04 May 2006 12:48:33 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: smorgrav Date: Thu May 4 05:48:33 2006 New Revision: 399689 URL: http://svn.apache.org/viewcvs?rev=399689&view=rev Log: Add bazaar as a supported and fully implemented SCM to the site Modified: maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt maven/scm/trunk/maven-scm-site/src/site/site.xml Modified: maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt?rev=399689&r1=399688&r2=399689&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt (original) +++ maven/scm/trunk/maven-scm-site/src/site/apt/scms-overview.apt Thu May 4 05:48:33 2006 @@ -12,19 +12,19 @@ * Fully implemented SCM's - * {{{cvs.html}CVS}} + * {{{bazaar.html}Bazaar}} - * {{{subversion.html}Subversion}} + * {{{cvs.html}CVS}} * {{{perforce.html}Perforce}} * {{{starteam.html}StarTeam}} + * {{{subversion.html}Subversion}} + * Partially implemented SCM's * {{{clearcase.html}ClearCase}} - - * {{{bazaar.html}Bazaar}} * {{{local.html}File system}} Modified: maven/scm/trunk/maven-scm-site/src/site/site.xml URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/site.xml?rev=399689&r1=399688&r2=399689&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-site/src/site/site.xml (original) +++ maven/scm/trunk/maven-scm-site/src/site/site.xml Thu May 4 05:48:33 2006 @@ -29,6 +29,7 @@ <item name="Maven SCM Plugin" href="/plugins/index.html"/> <item name="SCM URL Format" href="/scm-url-format.html"/> <item name="Supported SCMs" href="/scms-overview.html" collapse="true"> + <item name="Bazaar" href="/bazaar.html"/> <item name="Clearcase" href="/clearcase.html"/> <item name="CVS" href="/cvs.html"/> <item name="Local" href="/local.html"/> From scm-commitskimberlythompson@example.net Thu May 04 20:28:22 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 72672 invoked from network); 4 May 2006 20:28:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 May 2006 20:28:22 -0000 Received: (qmail 72577 invoked by uid 500); 4 May 2006 20:28:21 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 72557 invoked by uid 500); 4 May 2006 20:28:21 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 72545 invoked by uid 99); 4 May 2006 20:28:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 13:28:20 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 13:28:20 -0700 Received: (qmail 72315 invoked by uid 65534); 4 May 2006 20:27:59 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399850 - /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java Date: Thu, 04 May 2006 20:27:58 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Thu May 4 13:27:55 2006 New Revision: 399850 URL: http://svn.apache.org/viewcvs?rev=399850&view=rev Log: Fix javadoc tags Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java?rev=399850&r1=399849&r2=399850&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java Thu May 4 13:27:55 2006 @@ -17,11 +17,14 @@ */ /** + * <p> * Typesafe enum for file status - * <p/> - * There are two types of status defined in this class: <br> - * 1) Status: Changes in the working tree, not yet committed to the repository eg. MODIFIED <br> - * 2) Transaction: The file is part of some transaction with the repository eg. CHECKED_IN <br> + * </p> + * <p> + * There are two types of status defined in this class: <br/> + * 1) Status: Changes in the working tree, not yet committed to the repository eg. MODIFIED <br/> + * 2) Transaction: The file is part of some transaction with the repository eg. CHECKED_IN + * </p> * * @author <a href="mailto:kimberlythompson@example.net">Trygve Laugst&oslash;l</a> * @version $Id$ From scm-commitskimberlythompson@example.net Thu May 04 20:38:32 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 79583 invoked from network); 4 May 2006 20:38:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 May 2006 20:38:32 -0000 Received: (qmail 99198 invoked by uid 500); 4 May 2006 20:38:32 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 99186 invoked by uid 500); 4 May 2006 20:38:32 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 99174 invoked by uid 99); 4 May 2006 20:38:32 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 13:38:32 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 13:38:31 -0700 Received: (qmail 79449 invoked by uid 65534); 4 May 2006 20:38:11 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399855 - /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java Date: Thu, 04 May 2006 20:38:10 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Thu May 4 13:38:08 2006 New Revision: 399855 URL: http://svn.apache.org/viewcvs?rev=399855&view=rev Log: Added setScmProvider, deprecating addScmProvider Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=399855&r1=399854&r2=399855&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java Thu May 4 13:38:08 2006 @@ -51,7 +51,22 @@ this.scmProviders = providers; } + /** + * @deprecated use {@link #setScmProvider(String, ScmProvider)} instead + */ protected void addScmProvider( String providerType, ScmProvider provider ) + { + setScmProvider( providerType, provider ); + } + + /** + * Set a provider to be used for a type of SCM. + * If there was already a designed provider for that type it will be replaced. + * + * @param providerType the type of SCM, eg. <code>svn</code>, <code>cvs</code> + * @param provider the provider that will be used for that SCM type + */ + public void setScmProvider( String providerType, ScmProvider provider ) { scmProviders.put( providerType, provider ); } From scm-commitskimberlythompson@example.net Thu May 04 21:24:29 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 6566 invoked from network); 4 May 2006 21:24:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 May 2006 21:24:13 -0000 Received: (qmail 86487 invoked by uid 500); 4 May 2006 21:23:57 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 86471 invoked by uid 500); 4 May 2006 21:23:56 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 86416 invoked by uid 99); 4 May 2006 21:23:55 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 14:23:55 -0700 X-ASF-Spam-Status: No, hits=-9.3 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,SUBJECT_NOVOWEL X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 14:23:55 -0700 Received: (qmail 6047 invoked by uid 65534); 4 May 2006 21:23:33 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399859 - /maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java Date: Thu, 04 May 2006 21:23:32 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Thu May 4 14:23:29 2006 New Revision: 399859 URL: http://svn.apache.org/viewcvs?rev=399859&view=rev Log: Remove sysout Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java Modified: maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java?rev=399859&r1=399858&r2=399859&view=diff ============================================================================== --- maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java (original) +++ maven/scm/trunk/sandbox/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java Thu May 4 14:23:29 2006 @@ -142,7 +142,7 @@ repository.getProviderRepository() instanceof SvnScmProviderRepository ); SvnScmProviderRepository providerRepository = (SvnScmProviderRepository) repository.getProviderRepository(); -System.out.println(expectedUrl + " - " + providerRepository.getUrl() ); + assertEquals( "url is incorrect", expectedUrl, providerRepository.getUrl() ); assertEquals( "User is incorrect", expectedUser, providerRepository.getUser() ); From scm-commitskimberlythompson@example.net Thu May 04 23:09:23 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 57030 invoked from network); 4 May 2006 23:09:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 May 2006 23:09:22 -0000 Received: (qmail 47227 invoked by uid 500); 4 May 2006 23:09:22 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 47215 invoked by uid 500); 4 May 2006 23:09:22 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 47204 invoked by uid 99); 4 May 2006 23:09:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 16:09:21 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 16:09:21 -0700 Received: (qmail 56876 invoked by uid 65534); 4 May 2006 23:09:01 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399882 - /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java Date: Thu, 04 May 2006 23:09:00 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Thu May 4 16:09:00 2006 New Revision: 399882 URL: http://svn.apache.org/viewcvs?rev=399882&view=rev Log: [SCM-193] don't check dates if date in changeset is null. This case appears in local provider for deleted files. Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?rev=399882&r1=399881&r2=399882&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java Thu May 4 16:09:00 2006 @@ -84,7 +84,7 @@ { ChangeSet change = (ChangeSet) i.next(); - if ( startDate != null ) + if ( startDate != null && change.getDate() != null ) { if ( startDate.after( change.getDate() ) ) { From scm-commitskimberlythompson@example.net Fri May 05 03:20:19 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 46377 invoked from network); 5 May 2006 03:20:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 May 2006 03:20:19 -0000 Received: (qmail 77611 invoked by uid 500); 5 May 2006 03:20:19 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 77593 invoked by uid 500); 5 May 2006 03:20:19 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 77580 invoked by uid 99); 5 May 2006 03:20:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 20:20:18 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 20:20:18 -0700 Received: (qmail 46286 invoked by uid 65534); 5 May 2006 03:19:57 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399922 - in /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm: command/listfiles/AbstractListFilesCommand.java provider/AbstractScmProvider.java provider/ScmProvider.java provider/ScmProviderRepository.java Date: Fri, 05 May 2006 03:19:56 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Thu May 4 20:19:54 2006 New Revision: 399922 URL: http://svn.apache.org/viewcvs?rev=399922&view=rev Log: [SCM-183] Add list method to ScmProvider Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java?rev=399922&r1=399921&r2=399922&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java Thu May 4 20:19:54 2006 @@ -21,11 +21,13 @@ import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmResult; import org.apache.maven.scm.command.AbstractCommand; +import org.apache.maven.scm.command.list.AbstractListCommand; import org.apache.maven.scm.repository.ScmRepository; import java.io.File; /** + * @deprecated use {@link AbstractListCommand} instead * @author <a href="mailto:kimberlythompson@example.net">Emmanuel Venisse</a> * @author <a href="mailto:kimberlythompson@example.net">Trygve Laugst&oslash;l</a> * @version $Id$ Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=399922&r1=399921&r2=399922&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java Thu May 4 20:19:54 2006 @@ -27,6 +27,7 @@ import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.command.diff.DiffScmResult; import org.apache.maven.scm.command.edit.EditScmResult; +import org.apache.maven.scm.command.list.ListScmResult; import org.apache.maven.scm.command.login.LoginScmResult; import org.apache.maven.scm.command.remove.RemoveScmResult; import org.apache.maven.scm.command.status.StatusScmResult; @@ -38,6 +39,7 @@ import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.ScmRepositoryException; import org.apache.maven.scm.repository.UnknownRepositoryStructure; +import org.codehaus.plexus.util.StringUtils; import java.io.File; import java.util.ArrayList; @@ -426,6 +428,45 @@ this.getLogger().warn( "Provider " + repository.getProvider() + " does not support unedit operation." ); return new UnEditScmResult( "", null, null, true ); + } + + /** + * List each element (files and directories) of <B>fileSet</B> as they exist in the repository. + * + * @param repository the source control system + * @param fileSet the files to list + * @param parameters + * @return The list of files in the repository + * @throws NoSuchCommandScmException unless overriden by subclass + * @throws ScmException + */ + protected ListScmResult list( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters ) + throws ScmException + { + throw new NoSuchCommandScmException( "list" ); + } + + /** + * Calls {@link #list(ScmRepository, ScmFileSet, CommandParameters)} setting the {@link CommandParameters} with + * the necessary values from <code>recursive</code> and <code>tag</code>. + * + * @see #list(ScmRepository, ScmFileSet, CommandParameters) + */ + public ListScmResult list( ScmRepository repository, ScmFileSet fileSet, boolean recursive, String tag ) + throws ScmException + { + login( repository, fileSet ); + + CommandParameters parameters = new CommandParameters(); + + parameters.setString( CommandParameter.RECURSIVE, Boolean.toString( recursive ) ); + + if ( StringUtils.isNotEmpty( tag ) ) + { + parameters.setString( CommandParameter.TAG, tag ); + } + + return list( repository, fileSet, parameters ); } // ---------------------------------------------------------------------- Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java?rev=399922&r1=399921&r2=399922&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java Thu May 4 20:19:54 2006 @@ -24,6 +24,7 @@ import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.command.diff.DiffScmResult; import org.apache.maven.scm.command.edit.EditScmResult; +import org.apache.maven.scm.command.list.ListScmResult; import org.apache.maven.scm.command.remove.RemoveScmResult; import org.apache.maven.scm.command.status.StatusScmResult; import org.apache.maven.scm.command.tag.TagScmResult; @@ -290,5 +291,17 @@ * @throws ScmException */ UnEditScmResult unedit( ScmRepository repository, ScmFileSet fileSet ) + throws ScmException; + + /** + * List each element (files and directories) of <B>fileSet</B> as they exist in the repository. + * + * @param repository the source control system + * @param fileSet the files to list + * @param recursive descend recursively + * @param tag use the version defined by the tag + * @return the list of files in the repository + */ + ListScmResult list(ScmRepository repository, ScmFileSet fileSet, boolean recursive, String tag) throws ScmException; } Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java?rev=399922&r1=399921&r2=399922&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java Thu May 4 20:19:54 2006 @@ -92,4 +92,28 @@ { this.persistCheckout = persistCheckout; } + + /** + * Get a {@link ScmProviderRepository} that represents the parent folder in the repository. + * Useful when the repository does not exist yet and we need to create it from the parent. + * + * @throws UnsupportedOperationException unless overridden by subclass + * @return the parent repository + */ + public ScmProviderRepository getParent() + { + throw new UnsupportedOperationException(); + } + + /** + * Get the relative path between the repository provided as argument and the current repository. + * + * @param ancestor another repository that should be ancestor of this one + * @throws UnsupportedOperationException unless overridden by subclass + * @return the relative path or <code>null</code> if it can't be resolved + */ + public String getRelativePath( ScmProviderRepository ancestor ) + { + throw new UnsupportedOperationException(); + } } From scm-commitskimberlythompson@example.net Fri May 05 03:20:51 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 46862 invoked from network); 5 May 2006 03:20:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 May 2006 03:20:51 -0000 Received: (qmail 78291 invoked by uid 500); 5 May 2006 03:20:51 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 78275 invoked by uid 500); 5 May 2006 03:20:51 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 78264 invoked by uid 99); 5 May 2006 03:20:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 20:20:51 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 20:20:50 -0700 Received: (qmail 46608 invoked by uid 65534); 5 May 2006 03:20:29 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399924 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/ Date: Fri, 05 May 2006 03:20:29 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Thu May 4 20:20:29 2006 New Revision: 399924 URL: http://svn.apache.org/viewcvs?rev=399924&view=rev Log: [SCM-183] Add list method to ScmProvider Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/ From scm-commitskimberlythompson@example.net Fri May 05 03:20:54 2006 Return-Path: <scm-commitskimberlythompson@example.net> Delivered-To: kimberlythompson@example.net Received: (qmail 46903 invoked from network); 5 May 2006 03:20:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 5 May 2006 03:20:54 -0000 Received: (qmail 78391 invoked by uid 500); 5 May 2006 03:20:54 -0000 Delivered-To: kimberlythompson@example.net Received: (qmail 78353 invoked by uid 500); 5 May 2006 03:20:54 -0000 Mailing-List: contact kimberlythompson@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kimberlythompson@example.net> List-Unsubscribe: <mailto:kimberlythompson@example.net> List-Post: <mailto:kimberlythompson@example.net> List-Id: <scm-commits.maven.apache.org> Reply-To: kimberlythompson@example.net Delivered-To: mailing list kimberlythompson@example.net Received: (qmail 78339 invoked by uid 99); 5 May 2006 03:20:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 20:20:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 20:20:53 -0700 Received: (qmail 46810 invoked by uid 65534); 5 May 2006 03:20:33 -0000 Message-ID: <kimberlythompson@example.net> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399925 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/SvnListCommandTckTest.java Date: Fri, 05 May 2006 03:20:32 -0000 To: kimberlythompson@example.net From: kimberlythompson@example.net X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Thu May 4 20:20:31 2006 New Revision: 399925 URL: http://svn.apache.org/viewcvs?rev=399925&view=rev Log: [SCM-183] Add list method to ScmProvider Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/SvnListCommandTckTest.java (with props) Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/SvnListCommandTckTest.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/SvnListCommandTckTest.java?rev=399925&view=auto ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/SvnListCommandTckTest.java (added) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/list/SvnListCommandTckTest.java Thu May 4 20:20:31 2006 @@ -0,0 +1,44 @@ +package org.apache.maven.scm.provider.svn.command.list; + +/*
{'source': 'Apache Software Foundation Public Mail Archives'}