You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2010/07/30 10:14:30 UTC
svn commit: r980673 [1/5] - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev: ./
src/main/java/org/apache/maven/scm/provider/accurev/
src/main/java/org/apache/maven/scm/provider/accurev/cli/
src/main/java/org/apache/maven/scm/provider...
Author: olamy
Date: Fri Jul 30 08:14:27 2010
New Revision: 980673
URL: http://svn.apache.org/viewvc?rev=980673&view=rev
Log:
[SCM-561] Final cleanup accurev provider for 1.4
Submitted by Grant Gardner
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumer.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumer.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/util/
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/util/QuotedPropertyParser.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/site/apt/todos.apt (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeFileMatcher.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/CollectionSizeMatcher.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevCapabilityTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/TransactionTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/VersionMatcher.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumerTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumerTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumerTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/XppStreamConsumerTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/login/
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommandTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/util/
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/util/QuotedPropertyParserTest.java (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/accurev.txt (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.txt (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.xml (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/info.notloggedin.txt (with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/showstreams.xml (with props)
Removed:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AddElementsAction.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/PutMapEntryAction.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/XppStreamConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevExtractSourceCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/login/AccuRevLoginCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/site/apt/index.apt
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/site/apt/tcktests.apt
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/site/site.xml
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccurevScmProviderTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AnnotateConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccurevUpdateCommandTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml Fri Jul 30 08:14:27 2010
@@ -32,16 +32,12 @@
<name>Maven SCM AccuRev Provider</name>
<description>SCM Provider implementation for AccuRev (http://www.accurev.com/).</description>
<dependencies>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- </dependency>
<!-- Test -->
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -49,9 +45,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>2.5.1</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java Fri Jul 30 08:14:27 2010
@@ -20,12 +20,13 @@ package org.apache.maven.scm.provider.ac
*/
import java.io.File;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.apache.maven.scm.command.blame.BlameLine;
+import org.apache.maven.scm.util.ThreadSafeDateFormat;
/**
* Represents the AccuRev CLI interface
@@ -35,15 +36,19 @@ import org.apache.maven.scm.command.blam
public interface AccuRev
{
+ public static final String DEFAULT_ACCUREV_EXECUTABLE = "accurev";
+
+ public static final int DEFAULT_PORT = 5050;
+
public static final String ACCUREV_TIME_FORMAT_STRING = "yyyy/MM/dd HH:mm:ss";
- public static final SimpleDateFormat ACCUREV_TIME_SPEC = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss" );
+ public static final DateFormat ACCUREV_TIME_SPEC = new ThreadSafeDateFormat( ACCUREV_TIME_FORMAT_STRING );
public static final String DEFAULT_REMOVE_MESSAGE = "removed (maven-scm)";
- String DEFAULT_ADD_MESSAGE = "initial version (maven-scm)";
+ public static final String DEFAULT_ADD_MESSAGE = "initial version (maven-scm)";
- String DEFAULT_PROMOTE_MESSAGE = "promote (maven-scm)";
+ public static final String DEFAULT_PROMOTE_MESSAGE = "promote (maven-scm)";
/**
* Reset command process, clear command output accumulators
@@ -56,11 +61,10 @@ public interface AccuRev
* @param basedir
* @param versionSpec
* @param elements (must be depot relative. if null "/./" root is used)
- * @param poppedFiles
* @return
* @throws AccuRevException
*/
- boolean pop( File basedir, String versionSpec, Collection<File> elements, List<File> poppedFiles )
+ List<File> pop( File basedir, String versionSpec, Collection<File> elements )
throws AccuRevException;
/**
@@ -68,11 +72,10 @@ public interface AccuRev
*
* @param basedir
* @param elements
- * @param poppedFiles
* @return
* @throws AccuRevException
*/
- boolean pop( File basedir, Collection<File> elements, List<File> poppedFiles )
+ List<File> pop( File basedir, Collection<File> elements )
throws AccuRevException;
/**
@@ -92,11 +95,10 @@ public interface AccuRev
*
* @param basedir
* @param transactionId
- * @param updatedFiles
* @return
* @throws AccuRevException
*/
- boolean update( File basedir, String transactionId, List<File> updatedFiles )
+ List<File> update( File basedir, String transactionId )
throws AccuRevException;
/**
@@ -146,9 +148,8 @@ public interface AccuRev
* @param basedir base directory of the workspace
* @param files to add (relative to basedir, or absolute)
* @param message the commit message
- * @param addedFiles , list to which accurev will confirm the added files
*/
- boolean add( File basedir, List<File> files, String message, List<File> addedFiles )
+ List<File> add( File basedir, List<File> files, String message )
throws AccuRevException;
/**
@@ -157,11 +158,10 @@ public interface AccuRev
* @param basedir
* @param files
* @param message
- * @param defunctedFiles
* @return
* @throws AccuRevException
*/
- boolean defunct( File basedir, List<File> files, String message, List<File> defunctedFiles )
+ List<File> defunct( File basedir, List<File> files, String message )
throws AccuRevException;
/**
@@ -169,14 +169,13 @@ public interface AccuRev
*
* @param basedir - location of the workspace to act on
* @param message
- * @param promotedFiles list to which the promoted elements should be added
* @return
* @throws AccuRevException
*/
- boolean promoteAll( File basedir, String message, List<File> promotedFiles )
+ List<File> promoteAll( File basedir, String message )
throws AccuRevException;
- boolean promote( File basedir, List<File> files, String message, List<File> promotedFiles )
+ List<File> promote( File basedir, List<File> files, String message )
throws AccuRevException;
/**
@@ -194,7 +193,7 @@ public interface AccuRev
boolean mksnap( String snapShotName, String basisStream )
throws AccuRevException;
- boolean statTag( String streamName, List<File> taggedFiles )
+ List<File> statTag( String streamName )
throws AccuRevException;
/**
@@ -202,24 +201,20 @@ public interface AccuRev
*
* @param basedir
* @param elements
- * @param memberElements
- * @param nonMemberElements
* @return
* @throws AccuRevException
*/
- boolean statBackingStream( File basedir, Collection<File> elements, Collection<File> memberElements,
- Collection<File> nonMemberElements )
+ CategorisedElements statBackingStream( File basedir, Collection<File> elements )
throws AccuRevException;
/**
* @param basedir
* @param elements list of elements to stat, relative to basedir
* @param statType
- * @param matchingElements list of files relative to basedir that match the statType
* @return
* @throws AccuRevException
*/
- boolean stat( File basedir, Collection<File> elements, AccuRevStat statType, List<File> matchingElements )
+ List<File> stat( File basedir, Collection<File> elements, AccuRevStat statType )
throws AccuRevException;
/**
@@ -231,21 +226,32 @@ public interface AccuRev
String stat( File element )
throws AccuRevException;
- boolean history( String baseStream, String fromTimeSpec, String toTimeSpec, int count,
- List<Transaction> transactions )
+ List<Transaction> history( String baseStream, String fromTimeSpec, String toTimeSpec, int count,
+ boolean depotHistory, boolean transactionsOnly )
throws AccuRevException;
/**
- * AccuRev annotate an element
+ * AccuRev differences of a stream between to timespecs
*
+ * @param baseStream
+ * @param fromTimeSpec
+ * @param toTimeSpec
+ * @return
+ * @throws AccuRevException
+ */
+ List<FileDifference> diff( String baseStream, String fromTimeSpec, String toTimeSpec )
+ throws AccuRevException;
+
+ /**
+ * AccuRev annotate an element
* @param file
- * @param lines - array which will be filled with annotated lines for the associated file
+ *
* @return
* @throws AccuRevException
*/
- boolean annotate( File baseDir, File file, List<BlameLine> lines )
+ List<BlameLine> annotate( File baseDir, File file )
throws AccuRevException;
-
+
/**
* Logins in as the given user, retains authtoken for use with subsequent commands.
*
@@ -257,12 +263,18 @@ public interface AccuRev
boolean login( String user, String password )
throws AccuRevException;
- boolean showWorkSpaces( Map<String, WorkSpace> workSpaces )
+ Map<String, WorkSpace> showWorkSpaces( )
throws AccuRevException;
- boolean showRefTrees( Map<String, WorkSpace> workSpaces )
+ Map<String, WorkSpace> showRefTrees( )
+ throws AccuRevException;
+
+ Stream showStream( String stream )
throws AccuRevException;
String getExecutable();
+ String getClientVersion()
+ throws AccuRevException;
+
}
\ No newline at end of file
Added: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java?rev=980673&view=auto
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java (added)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java Fri Jul 30 08:14:27 2010
@@ -0,0 +1,48 @@
+package org.apache.maven.scm.provider.accurev;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+public enum AccuRevCapability
+{
+ DIFF_BETWEEN_STREAMS( "4.7.2", null );
+
+ private String fromVersion;
+
+ private String toVersion;
+
+ private AccuRevCapability( String fromVersion, String toVersion )
+ {
+ this.fromVersion = fromVersion;
+ this.toVersion = toVersion;
+ }
+
+ /**
+ * @todo simple string compare because the version numbers have never used more than one digit.
+ * @param version
+ * @return if the capability is available for this version
+ */
+ public boolean isSupported( String version )
+ {
+ return ( fromVersion == null || fromVersion.compareTo( version ) <= 0 )
+ && ( toVersion == null || toVersion.compareTo( version ) >= 0 );
+
+ }
+
+}
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java Fri Jul 30 08:14:27 2010
@@ -118,4 +118,9 @@ public class AccuRevInfo
return ( getTop() != null ) && getBasedir().equals( new File( getTop() ) );
}
+ public boolean isLoggedIn()
+ {
+ return !( this.user == null || "(not logged in)".equals( this.user ) );
+ }
+
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java Fri Jul 30 08:14:27 2010
@@ -23,7 +23,10 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.CommandParameter;
@@ -58,6 +61,7 @@ import org.apache.maven.scm.provider.acc
import org.apache.maven.scm.provider.accurev.command.tag.AccuRevTagCommand;
import org.apache.maven.scm.provider.accurev.command.update.AccuRevUpdateCommand;
import org.apache.maven.scm.provider.accurev.command.update.AccuRevUpdateScmResult;
+import org.apache.maven.scm.provider.accurev.util.QuotedPropertyParser;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.scm.repository.UnknownRepositoryStructure;
import org.codehaus.plexus.util.StringUtils;
@@ -71,15 +75,21 @@ public class AccuRevScmProvider
extends AbstractScmProvider
{
+ public static final String ACCUREV_EXECUTABLE_PROPERTY = "accurevExe";
+
+ public static final String TAG_FORMAT_PROPERTY = "tagFormat";
+
+ public static final String SYSTEM_PROPERTY_PREFIX = "maven.scm.accurev.";
+
public String getScmType()
{
+
return "accurev";
}
/**
- * The basic url parsing approach is to be as loose as possible. If you specify as per the docs
- * you'll get what you expect. If you do something else the result is undefined. Don't use "/"
- * "\" or "@" as the delimiter,
+ * The basic url parsing approach is to be as loose as possible. If you specify as per the docs you'll get what you
+ * expect. If you do something else the result is undefined. Don't use "/" "\" or "@" as the delimiter,
*/
public ScmProviderRepository makeProviderScmRepository( String scmSpecificUrl, char delimiter )
throws ScmRepositoryException
@@ -89,14 +99,19 @@ public class AccuRevScmProvider
String[] tokens = StringUtils.split( scmSpecificUrl, Character.toString( delimiter ) );
- //[[user][/pass]@host[:port]][:stream][:\project\dir]
+ // [[user][/pass]@host[:port]][:stream][:\project\dir]
String basisStream = null;
String projectPath = null;
- int port = AccuRevScmProviderRepository.DEFAULT_PORT;
+ int port = AccuRev.DEFAULT_PORT;
String host = null;
String user = null;
String password = null;
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put( TAG_FORMAT_PROPERTY, AccuRevScmProviderRepository.DEFAULT_TAG_FORMAT );
+ properties.put( ACCUREV_EXECUTABLE_PROPERTY, AccuRev.DEFAULT_ACCUREV_EXECUTABLE );
+
+ fillSystemProperties( properties );
int i = 0;
while ( i < tokens.length )
@@ -106,7 +121,13 @@ public class AccuRevScmProvider
int slash = tokens[i].indexOf( '/' );
slash = slash < 0 ? tokens[i].indexOf( '\\' ) : slash;
- if ( slash == 0 )
+ int qMark = tokens[i].indexOf( '?' );
+
+ if ( qMark == 0 )
+ {
+ QuotedPropertyParser.parse( tokens[i].substring( 1 ), properties );
+ }
+ else if ( slash == 0 )
{
// this is the project path
projectPath = tokens[i].substring( 1 );
@@ -155,6 +176,7 @@ public class AccuRevScmProvider
}
AccuRevScmProviderRepository repo = new AccuRevScmProviderRepository();
+ repo.setLogger( getLogger() );
if ( !StringUtils.isEmpty( user ) )
{
repo.setUser( user );
@@ -176,14 +198,33 @@ public class AccuRevScmProvider
repo.setHost( host );
}
repo.setPort( port );
+ repo.setTagFormat( properties.get( TAG_FORMAT_PROPERTY ) );
+
AccuRevCommandLine accuRev = new AccuRevCommandLine( host, port );
accuRev.setLogger( getLogger() );
+ accuRev.setExecutable( properties.get( ACCUREV_EXECUTABLE_PROPERTY ) );
repo.setAccuRev( accuRev );
return repo;
}
+ private void fillSystemProperties( Map<String, String> properties )
+ {
+
+ Set<String> propertyKeys = properties.keySet();
+ for ( String key : propertyKeys )
+ {
+ String systemPropertyKey = SYSTEM_PROPERTY_PREFIX + key;
+ String systemProperty = System.getProperty( systemPropertyKey );
+ if ( systemProperty != null )
+ {
+ properties.put( key, systemProperty );
+ }
+ }
+
+ }
+
@Override
protected LoginScmResult login( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
@@ -198,6 +239,7 @@ public class AccuRevScmProvider
return command.login( repository, fileSet, parameters );
}
+ @Override
protected CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -212,13 +254,13 @@ public class AccuRevScmProvider
ExportScmResult result = export( repository, fileSet, parameters );
if ( result.isSuccess() )
{
- return new CheckOutScmResult( result.getCommandLine(), result.getExportedFiles(), accuRevRepo
- .getExportRelativePath() );
+ return new CheckOutScmResult( result.getCommandLine(), result.getExportedFiles(),
+ accuRevRepo.getExportRelativePath() );
}
else
{
- return new CheckOutScmResult( result.getCommandLine(), result.getProviderMessage(), result
- .getCommandOutput(), false );
+ return new CheckOutScmResult( result.getCommandLine(), result.getProviderMessage(),
+ result.getCommandOutput(), false );
}
}
@@ -233,14 +275,17 @@ public class AccuRevScmProvider
CommandParameters parameters )
throws ScmException
{
+
AccuRevCheckInCommand command = new AccuRevCheckInCommand( getLogger() );
return command.checkIn( repository, fileSet, parameters );
}
+ @Override
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
+
// TODO: accurev info with current dir = "path", find workspace. Find use-case for this.
return super.makeProviderScmRepository( path );
}
@@ -249,6 +294,7 @@ public class AccuRevScmProvider
protected AddScmResult add( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
+
AccuRevAddCommand command = new AccuRevAddCommand( getLogger() );
return command.add( repository, fileSet, parameters );
}
@@ -267,6 +313,7 @@ public class AccuRevScmProvider
protected StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
+
AccuRevStatusCommand command = new AccuRevStatusCommand( getLogger() );
return command.status( repository, fileSet, parameters );
@@ -276,26 +323,25 @@ public class AccuRevScmProvider
protected UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
- AccuRevUpdateCommand command = new AccuRevUpdateCommand( getLogger() );
- Date now = new Date(); // better to store this before we run the update...
+ AccuRevScmProviderRepository accurevRepo = (AccuRevScmProviderRepository) repository;
+
+ AccuRevUpdateCommand command = new AccuRevUpdateCommand( getLogger() );
UpdateScmResult result = command.update( repository, fileSet, parameters );
if ( result.isSuccess() && parameters.getBoolean( CommandParameter.RUN_CHANGELOG_WITH_UPDATE ) )
{
AccuRevUpdateScmResult accuRevResult = (AccuRevUpdateScmResult) result;
- AccuRevVersion startVersion = accuRevResult.getFromVersion();
- AccuRevVersion endVersion = accuRevResult.getToVersion();
- if ( endVersion.isNow() )
- {
- endVersion = new AccuRevVersion( endVersion.getBasisStream(), now );
- }
+ ScmRevision fromRevision = new ScmRevision( accuRevResult.getFromRevision() );
+ ScmRevision toRevision = new ScmRevision( accuRevResult.getToRevision() );
- parameters.setScmVersion( CommandParameter.START_SCM_VERSION, new ScmRevision( startVersion.toString() ) );
- parameters.setScmVersion( CommandParameter.END_SCM_VERSION, new ScmRevision( endVersion.toString() ) );
+ parameters.setScmVersion( CommandParameter.START_SCM_VERSION, fromRevision );
+ parameters.setScmVersion( CommandParameter.END_SCM_VERSION, toRevision );
+ AccuRevVersion startVersion = accurevRepo.getAccuRevVersion( fromRevision );
+ AccuRevVersion endVersion = accurevRepo.getAccuRevVersion( toRevision );
if ( startVersion.getBasisStream().equals( endVersion.getBasisStream() ) )
{
ChangeLogScmResult changeLogResult = changelog( repository, fileSet, parameters );
@@ -304,14 +350,18 @@ public class AccuRevScmProvider
{
result.setChanges( changeLogResult.getChangeLog().getChangeSets() );
}
+ else
+ {
+ getLogger().warn( "Changelog from " + fromRevision + " to " + toRevision + " failed" );
+ }
}
else
{
String comment = "Cross stream update result from " + startVersion + " to " + endVersion;
String author = "";
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
List<ScmFile> files = result.getUpdatedFiles();
- ChangeSet dummyChangeSet = new ChangeSet( now, comment, author, files );
+ ChangeSet dummyChangeSet = new ChangeSet( new Date(), comment, author, files );
// different streams invalidates the change log, insert a dummy change instead.
List<ChangeSet> changeSets = Collections.singletonList( dummyChangeSet );
result.setChanges( changeSets );
@@ -325,6 +375,7 @@ public class AccuRevScmProvider
protected ExportScmResult export( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
+
AccuRevExportCommand command = new AccuRevExportCommand( getLogger() );
return command.export( repository, fileSet, parameters );
}
@@ -334,6 +385,7 @@ public class AccuRevScmProvider
CommandParameters parameters )
throws ScmException
{
+
AccuRevChangeLogCommand command = new AccuRevChangeLogCommand( getLogger() );
return command.changelog( repository, fileSet, parameters );
}
@@ -342,6 +394,7 @@ public class AccuRevScmProvider
protected RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
+
AccuRevRemoveCommand command = new AccuRevRemoveCommand( getLogger() );
return command.remove( repository, fileSet, parameters );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java Fri Jul 30 08:14:27 2010
@@ -20,14 +20,32 @@ package org.apache.maven.scm.provider.ac
*/
import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
import org.codehaus.plexus.util.StringUtils;
public class AccuRevScmProviderRepository
extends ScmProviderRepositoryWithHost
{
+ public static final String DEFAULT_TAG_FORMAT = "%s";
+
+ private AccuRev accurev;
+
+ private String streamName;
+
+ private String projectPath;
+
+ private String tagFormat = DEFAULT_TAG_FORMAT;
+
+ private ScmLogger logger;
+
public AccuRevScmProviderRepository()
{
super();
@@ -38,16 +56,19 @@ public class AccuRevScmProviderRepositor
setShouldUseExportForNonPersistentCheckout( true );
}
- /**
- * System property for prefixing tags
- */
- public static final String TAG_PREFIX = "accuRevTagPrefix";
-
- private String streamName;
-
- private String projectPath;
+ public String getTagFormat()
+ {
+ return tagFormat;
+ }
- private AccuRev accurev;
+ public void setTagFormat( String tagFormat )
+ {
+ if ( tagFormat == null || !tagFormat.contains( "%s" ) )
+ {
+ throw new IllegalArgumentException( "tagFormat must contain '%s' to be replaced" );
+ }
+ this.tagFormat = tagFormat;
+ }
public String getStreamName()
{
@@ -96,9 +117,33 @@ public class AccuRevScmProviderRepositor
}
- public String getExtendedTagName( String tagName )
+ String tagToStream( String tagName )
{
- return System.getProperty( TAG_PREFIX, "" ) + tagName;
+ return String.format( getTagFormat(), tagName );
+ }
+
+ String streamToTag( String streamName )
+ {
+ tagFormat = getTagFormat();
+ // TODO - strictly we should quote either side of the %s
+ String tagPatternString = tagToStream( "(.*)" );
+ Pattern tagPattern = Pattern.compile( tagPatternString );
+
+ Matcher tagMatcher = tagPattern.matcher( streamName );
+ if ( tagMatcher.matches() )
+ {
+ return tagMatcher.group( 1 );
+ }
+ else
+ {
+ return streamName;
+ }
+
+ }
+
+ public void setLogger( ScmLogger logger )
+ {
+ this.logger = logger;
}
// TODO raise JIRA to pull up these methods to ScmProviderRepository
@@ -107,17 +152,14 @@ public class AccuRevScmProviderRepositor
private boolean shouldUseExportForNonPersistentCheckout = true;
- public static final int DEFAULT_PORT = 5050;
-
/**
- * The relative path of the directory of the checked out project in comparison to the checkout
- * directory, or an empty String in case the checkout directory equals the project directory.
+ * The relative path of the directory of the checked out project in comparison to the checkout directory, or an
+ * empty String in case the checkout directory equals the project directory.
* <p/>
- * With most SCMs, this is just an empty String, meaning that the checkout directory equals the
- * project directory. But there are cases (e.g. ClearCase) where within the checkout directory,
- * the directory structure of the SCM system is repeated. E.g. if you check out the project
- * "my/project" to "/some/dir", the project sources are actually checked out to
- * "some/dir/my/project". In this example, relativePathProjectDirectory would contain
+ * With most SCMs, this is just an empty String, meaning that the checkout directory equals the project directory.
+ * But there are cases (e.g. ClearCase) where within the checkout directory, the directory structure of the SCM
+ * system is repeated. E.g. if you check out the project "my/project" to "/some/dir", the project sources are
+ * actually checked out to "some/dir/my/project". In this example, relativePathProjectDirectory would contain
* "my/project".
*/
public String getCheckoutRelativePath()
@@ -145,13 +187,12 @@ public class AccuRevScmProviderRepositor
}
/**
- * When checkout is not expected to be refreshed or committed, should export be used instead?
- * Perforce, Clearcase and AccuRev store their meta-data about file status within the server
- * rather than files in the source tree. This makes checkouts within checkouts (eg
- * release:perform) difficult. Typically there is a way to do a lightweight export instead which
- * can be implemented as the "export" command. This is a hint to downstream applications that
- * "export" is available and should be used in preference to "checkout" in cases where "update"
- * and "commit" are not intended to be used. (ie release:perform)
+ * When checkout is not expected to be refreshed or committed, should export be used instead? Perforce, Clearcase
+ * and AccuRev store their meta-data about file status within the server rather than files in the source tree. This
+ * makes checkouts within checkouts (eg release:perform) difficult. Typically there is a way to do a lightweight
+ * export instead which can be implemented as the "export" command. This is a hint to downstream applications that
+ * "export" is available and should be used in preference to "checkout" in cases where "update" and "commit" are not
+ * intended to be used. (ie release:perform)
*
* @return false by default
*/
@@ -165,30 +206,16 @@ public class AccuRevScmProviderRepositor
this.shouldUseExportForNonPersistentCheckout = shouldUseExportForNonPersistentCheckout;
}
- public String toString()
+ public String getDepotRelativeProjectPath()
{
- StringBuffer buff = new StringBuffer( "AccuRevScmProviderRepository" );
- buff.append( " user=" );
- buff.append( getUser() );
- buff.append( " pass=" );
- buff.append( getPassword() == null ? "null" : StringUtils.repeat( "*", getPassword().length() ) );
- buff.append( " host=" );
- buff.append( getHost() );
- buff.append( " port=" );
- buff.append( getPort() );
- buff.append( " stream=" );
- buff.append( getStreamName() );
- buff.append( " projectPath=" );
- buff.append( getProjectPath() );
-
- return buff.toString();
+ return "/./" + ( projectPath == null ? "" : projectPath );
}
public AccuRevVersion getAccuRevVersion( ScmVersion scmVersion )
{
String tran = null;
- String basisStream;
+ String basisStream = null;
if ( scmVersion == null )
{
@@ -196,7 +223,7 @@ public class AccuRevScmProviderRepositor
}
else
{
- String name = scmVersion.getName();
+ String name = StringUtils.clean( scmVersion.getName() );
String[] versionComponents = name.split( "[/\\\\]", 2 );
basisStream = versionComponents[0];
@@ -207,8 +234,8 @@ public class AccuRevScmProviderRepositor
}
else
{
- // Need to add the tag prefix
- basisStream = getExtendedTagName( basisStream );
+ // name is a tag name - convert to a stream.
+ basisStream = tagToStream( basisStream );
}
if ( versionComponents.length == 2 && versionComponents[1].length() > 0 )
@@ -220,9 +247,118 @@ public class AccuRevScmProviderRepositor
return new AccuRevVersion( basisStream, tran );
}
- public String getDepotRelativeProjectPath()
+ public String getSnapshotName( String tagName )
{
- return "/./" + ( projectPath == null ? "" : projectPath );
+ return tagToStream( tagName );
+ }
+
+ public String getRevision( String streamName, Date date )
+ {
+ return getRevision( streamName, AccuRev.ACCUREV_TIME_SPEC.format( date == null ? new Date() : date ) );
+ }
+
+ public String getRevision( String stream, long fromTranId )
+ {
+ return getRevision( stream, Long.toString( fromTranId ) );
+ }
+
+ public String getRevision( String streamName, String transaction )
+ {
+ return streamToTag( streamName ) + "/" + transaction;
+ }
+
+ public String getWorkSpaceRevision( String workspace )
+ throws AccuRevException
+ {
+ return getRevision( workspace, Long.toString( getCurrentTransactionId( workspace ) ) );
+ }
+
+ public Transaction getDepotTransaction( String stream, String tranSpec )
+ throws AccuRevException
+ {
+
+ if ( tranSpec == null )
+ {
+ tranSpec = "now";
+ }
+
+ List<Transaction> transactions = getAccuRev().history( stream, tranSpec, null, 1, true, true );
+
+ if ( transactions == null || transactions.isEmpty() )
+ {
+ logger.warn( "Unable to find transaction for tranSpec=" + tranSpec );
+ return null;
+ }
+ else
+ {
+ return transactions.get( 0 );
+ }
+
+ }
+
+ public String getDepotTransactionId( String stream, String tranSpec )
+ throws AccuRevException
+ {
+ Transaction t = getDepotTransaction( stream, tranSpec );
+
+ return t == null ? tranSpec : Long.toString( t.getTranId() );
+ }
+
+ private long getCurrentTransactionId( String workSpaceName )
+ throws AccuRevException
+ {
+ // AccuRev does not have a way to get at this workspace info by name.
+ // So we have to do it the hard way...
+
+ AccuRev accuRev = getAccuRev();
+
+ Map<String, WorkSpace> workSpaces = accuRev.showWorkSpaces();
+
+ WorkSpace workspace = workSpaces.get( workSpaceName );
+
+ if ( workspace == null )
+ {
+ // Must be a reftree
+ workSpaces = accuRev.showRefTrees();
+ workspace = workSpaces.get( workSpaceName );
+ }
+
+ if ( workspace == null )
+ {
+ throw new AccuRevException( "Can't find workspace " + workSpaceName );
+ }
+ return workspace.getTransactionId();
+ }
+
+ public String toString()
+ {
+ StringBuffer buff = new StringBuffer( "AccuRevScmProviderRepository" );
+ buff.append( " user=" );
+ buff.append( getUser() );
+ buff.append( " pass=" );
+ buff.append( getPassword() == null ? "null" : StringUtils.repeat( "*", getPassword().length() ) );
+ buff.append( " host=" );
+ buff.append( getHost() );
+ buff.append( " port=" );
+ buff.append( getPort() );
+ buff.append( " stream=" );
+ buff.append( getStreamName() );
+ buff.append( " projectPath=" );
+ buff.append( getProjectPath() );
+
+ return buff.toString();
+ }
+
+ public static String formatTimeSpec( Date when )
+ {
+
+ if ( when == null )
+ {
+ return "now";
+ }
+
+ return AccuRev.ACCUREV_TIME_SPEC.format( when );
+
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java Fri Jul 30 08:14:27 2010
@@ -26,6 +26,15 @@ public class AccuRevVersion
private String basisStream;
+ private String timeSpec;
+
+ public AccuRevVersion( String basisStream, String tran )
+ {
+
+ this.basisStream = basisStream;
+ this.timeSpec = tran;
+ }
+
public String getBasisStream()
{
return basisStream;
@@ -36,14 +45,6 @@ public class AccuRevVersion
return timeSpec;
}
- private String timeSpec;
-
- public AccuRevVersion( String basisStream, String tran )
- {
- this.basisStream = basisStream;
- this.timeSpec = tran;
- }
-
public AccuRevVersion( String basis, Date startDate )
{
this( basis, AccuRev.ACCUREV_TIME_SPEC.format( startDate ) );
@@ -54,13 +55,14 @@ public class AccuRevVersion
this( basis, Long.toString( transactionId ) );
}
- public String toString()
+ public boolean isNow()
{
- return basisStream + "/" + timeSpec;
+ return timeSpec == null || "highest".equalsIgnoreCase( timeSpec ) || "now".equalsIgnoreCase( timeSpec );
}
- public boolean isNow()
+ @Override
+ public String toString()
{
- return timeSpec == null || "highest".equalsIgnoreCase( timeSpec ) || "now".equalsIgnoreCase( timeSpec );
+ return String.format( "AccuRevVersion: stream = %s, transaction= %s", basisStream, timeSpec );
}
}
Added: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java?rev=980673&view=auto
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java (added)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java Fri Jul 30 08:14:27 2010
@@ -0,0 +1,42 @@
+package org.apache.maven.scm.provider.accurev;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CategorisedElements
+{
+ private List<File> memberElements = new ArrayList<File>();
+
+ private List<File> nonMemberElements = new ArrayList<File>();
+
+ public List<File> getMemberElements()
+ {
+ return memberElements;
+ }
+
+ public List<File> getNonMemberElements()
+ {
+ return nonMemberElements;
+ }
+}
\ No newline at end of file
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java?rev=980673&view=auto
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java (added)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java Fri Jul 30 08:14:27 2010
@@ -0,0 +1,161 @@
+package org.apache.maven.scm.provider.accurev;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 java.io.File;
+
+public class FileDifference
+{
+
+ private String oldVersionSpec = null;
+
+ private File oldFile = null;
+
+ private String newVersionSpec = null;
+
+ private File newFile = null;
+
+ private long elementId = -1;
+
+ public FileDifference( long elementId, String newPath, String newVersion, String oldPath, String oldVersion )
+ {
+ setElementId( elementId );
+ setNewVersion( newPath, newVersion );
+ setOldVersion( oldPath, oldVersion );
+ }
+
+ public FileDifference()
+ {
+
+ }
+
+ public String getOldVersionSpec()
+ {
+ return oldVersionSpec;
+ }
+
+ public File getOldFile()
+ {
+ return oldFile;
+ }
+
+ public String getNewVersionSpec()
+ {
+ return newVersionSpec;
+ }
+
+ public File getNewFile()
+ {
+ return newFile;
+ }
+
+ public long getElementId()
+ {
+ return elementId;
+ }
+
+ public void setElementId( long elementId )
+ {
+ this.elementId = elementId;
+ }
+
+ public void setNewVersion( String path, String version )
+ {
+
+ this.newFile =
+ ( oldFile != null && oldFile.getPath().equals( path ) ) ? oldFile : path == null ? null : new File( path );
+ this.newVersionSpec = version;
+
+ }
+
+ public void setOldVersion( String path, String version )
+ {
+
+ this.oldFile =
+ ( newFile != null && newFile.getPath().equals( path ) ) ? newFile : path == null ? null : new File( path );
+ this.oldVersionSpec = version;
+
+ }
+
+ @Override
+ public String toString()
+ {
+ return "FileDifference [elementId=" + elementId + ", newFile=" + newFile + ", newVersionSpec=" + newVersionSpec
+ + ", oldFile=" + oldFile + ", oldVersionSpec=" + oldVersionSpec + "]";
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (int) ( elementId ^ ( elementId >>> 32 ) );
+ result = prime * result + ( ( newFile == null ) ? 0 : newFile.hashCode() );
+ result = prime * result + ( ( newVersionSpec == null ) ? 0 : newVersionSpec.hashCode() );
+ result = prime * result + ( ( oldFile == null ) ? 0 : oldFile.hashCode() );
+ result = prime * result + ( ( oldVersionSpec == null ) ? 0 : oldVersionSpec.hashCode() );
+ return result;
+ }
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ return true;
+ if ( obj == null )
+ return false;
+ if ( getClass() != obj.getClass() )
+ return false;
+ FileDifference other = (FileDifference) obj;
+ if ( elementId != other.elementId )
+ return false;
+ if ( newFile == null )
+ {
+ if ( other.newFile != null )
+ return false;
+ }
+ else if ( !newFile.equals( other.newFile ) )
+ return false;
+ if ( newVersionSpec == null )
+ {
+ if ( other.newVersionSpec != null )
+ return false;
+ }
+ else if ( !newVersionSpec.equals( other.newVersionSpec ) )
+ return false;
+ if ( oldFile == null )
+ {
+ if ( other.oldFile != null )
+ return false;
+ }
+ else if ( !oldFile.equals( other.oldFile ) )
+ return false;
+ if ( oldVersionSpec == null )
+ {
+ if ( other.oldVersionSpec != null )
+ return false;
+ }
+ else if ( !oldVersionSpec.equals( other.oldVersionSpec ) )
+ return false;
+ return true;
+ }
+
+}
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java?rev=980673&view=auto
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java (added)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java Fri Jul 30 08:14:27 2010
@@ -0,0 +1,159 @@
+package org.apache.maven.scm.provider.accurev;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 java.util.Date;
+
+public class Stream
+{
+
+ private String name;
+
+ private long id;
+
+ private String basis;
+
+ private long basisId;
+
+ private String depot;
+
+ private Date startDate;
+
+ private String streamType;
+
+ public Stream( String name, long id, String basis, long basisId, String depot, Date startDate, String streamType )
+ {
+ this.name = name;
+ this.id = id;
+ this.basis = basis;
+ this.basisId = basisId;
+ this.depot = depot;
+ this.startDate = startDate;
+ this.streamType = streamType;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ( ( basis == null ) ? 0 : basis.hashCode() );
+ result = prime * result + (int) ( basisId ^ ( basisId >>> 32 ) );
+ result = prime * result + ( ( depot == null ) ? 0 : depot.hashCode() );
+ result = prime * result + (int) ( id ^ ( id >>> 32 ) );
+ result = prime * result + ( ( name == null ) ? 0 : name.hashCode() );
+ result = prime * result + ( ( startDate == null ) ? 0 : startDate.hashCode() );
+ result = prime * result + ( ( streamType == null ) ? 0 : streamType.hashCode() );
+ return result;
+ }
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ return true;
+ if ( obj == null )
+ return false;
+ if ( getClass() != obj.getClass() )
+ return false;
+ Stream other = (Stream) obj;
+ if ( basis == null )
+ {
+ if ( other.basis != null )
+ return false;
+ }
+ else if ( !basis.equals( other.basis ) )
+ return false;
+ if ( basisId != other.basisId )
+ return false;
+ if ( depot == null )
+ {
+ if ( other.depot != null )
+ return false;
+ }
+ else if ( !depot.equals( other.depot ) )
+ return false;
+ if ( id != other.id )
+ return false;
+ if ( name == null )
+ {
+ if ( other.name != null )
+ return false;
+ }
+ else if ( !name.equals( other.name ) )
+ return false;
+ if ( startDate == null )
+ {
+ if ( other.startDate != null )
+ return false;
+ }
+ else if ( !startDate.equals( other.startDate ) )
+ return false;
+ if ( streamType == null )
+ {
+ if ( other.streamType != null )
+ return false;
+ }
+ else if ( !streamType.equals( other.streamType ) )
+ return false;
+ return true;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public long getId()
+ {
+ return id;
+ }
+
+ public String getBasis()
+ {
+ return basis;
+ }
+
+ public long getBasisId()
+ {
+ return basisId;
+ }
+
+ public String getDepot()
+ {
+ return depot;
+ }
+
+ public Date getStartDate()
+ {
+ return startDate;
+ }
+
+ public String getStreamType()
+ {
+ return streamType;
+ }
+
+ public Boolean isWorkspace()
+ {
+ return "workspace".equals( streamType );
+ }
+
+}
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java?rev=980673&r1=980672&r2=980673&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java Fri Jul 30 08:14:27 2010
@@ -98,6 +98,13 @@ public class Transaction
return elementName;
}
+ @Override
+ public String toString()
+ {
+ return String.format( "Version: %s (%d) %s (%s) anc=%s", elementName, elementId, virtualSpec, realSpec,
+ ancestorSpec );
+ }
+
}
private Collection<Version> versions = new HashSet<Version>();
@@ -177,4 +184,9 @@ public class Transaction
}
+ public String toString()
+ {
+ return String.format( "Transaction: %d, %s at %tc by %s -'%s'", this.getId(), this.getTranType(),
+ this.getWhen(), this.getAuthor(), this.getComment() );
+ }
}