svn commit: r1094193 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src: main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ test/java/org/apache/maven/scm/pro
Author: olamy
Date: Sun Apr 17 20:28:59 2011
New Revision: 1094193
URL: http://svn.apache.org/viewvc?rev=1094193&view=rev
Log:
[SCM-619] Add revision number in changelog clearcase command.
Submitted by Jeremie Lagarde
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/resources/clearcase/changelog/clearcaselog.txt
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java?rev=1094193&r1=1094192&r2=1094193&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
Sun Apr 17 20:28:59 2011
@@ -126,6 +126,7 @@ public class ClearCaseChangeLogCommand
format.append( "DATE:%Nd\\n" );
format.append( "COMM:%-12.12o - %o - %c - Activity: %[activity]p\\n" );
format.append( "USER:%" + userFormat + "u\\n" );
+format.append( "REVI:%Ln\\n" );
command.createArg().setValue( "-fmt" );
command.createArg().setValue( format.toString() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java?rev=1094193&r1=1094192&r2=1094193&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
Sun Apr 17 20:28:59 2011
@@ -49,6 +49,8 @@ public class ClearCaseChangeLogConsumer
private static final String COMMENT_TAG = "COMM:";
+private static final String REVISION_TAG = "REVI:";
+
private List entries = new ArrayList();
// state machine constants for reading clearcase lshistory command output
@@ -69,6 +71,11 @@ public class ClearCaseChangeLogConsumer
private static final int GET_COMMENT = 3;
/**
+ * expecting revision
+ */
+private static final int GET_REVISION = 4;
+
+/**
* current status of the parser
*/
private int status = GET_FILE;
@@ -123,6 +130,9 @@ public class ClearCaseChangeLogConsumer
case GET_COMMENT:
processGetCommentAndUser( line );
break;
+case GET_REVISION:
+processGetRevision( line );
+break;
default:
if ( getLogger().isWarnEnabled() )
{
@@ -188,7 +198,7 @@ public class ClearCaseChangeLogConsumer
entries.add( getCurrentChange() );
-setStatus( GET_FILE );
+setStatus( GET_REVISION );
}
else
{
@@ -196,6 +206,21 @@ public class ClearCaseChangeLogConsumer
getCurrentChange().setComment( getCurrentChange().getComment() +
line + "\n" );
}
}
+
+/**
+ * Process the current input line in the Get Revision.
+ *
+ * @param line a line of text from the clearcase log output
+ */
+private void processGetRevision( String line )
+{
+if ( line.startsWith( REVISION_TAG ) )
+{
+getCurrentChange().setRevision( line.substring(
REVISION_TAG.length() ) );
+
+setStatus( GET_FILE );
+}
+}
/**
* Getter for property curren
svn commit: r1094192 - /maven/scm/trunk/.gitignore
Author: olamy Date: Sun Apr 17 20:28:31 2011 New Revision: 1094192 URL: http://svn.apache.org/viewvc?rev=1094192&view=rev Log: gitignore .idea Modified: maven/scm/trunk/.gitignore Modified: maven/scm/trunk/.gitignore URL: http://svn.apache.org/viewvc/maven/scm/trunk/.gitignore?rev=1094192&r1=1094191&r2=1094192&view=diff == --- maven/scm/trunk/.gitignore (original) +++ maven/scm/trunk/.gitignore Sun Apr 17 20:28:31 2011 @@ -7,3 +7,4 @@ target .project .settings build +.idea
svn commit: r1090546 - in /maven/scm/trunk: maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/ maven-scm-providers/maven-scm-provid
Author: olamy
Date: Sat Apr 9 08:29:33 2011
New Revision: 1090546
URL: http://svn.apache.org/viewvc?rev=1090546&view=rev
Log:
code formatting
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java?rev=1090546&r1=1090545&r2=1090546&view=diff
==
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
Sat Apr 9 08:29:33 2011
@@ -27,7 +27,6 @@ import org.apache.maven.scm.repository.S
import java.io.IOException;
-
/**
* Mark a set of files for deletion.
*
@@ -35,7 +34,9 @@ import java.io.IOException;
* @goal remove
* @aggregator
*/
-public class RemoveMojo extends AbstractScmMojo {
+public class RemoveMojo
+extends AbstractScmMojo
+{
/**
* The commit message.
@@ -47,16 +48,23 @@ public class RemoveMojo extends Abstract
/**
* {@inheritDoc}
*/
-public void execute() throws MojoExecutionException {
+public void execute()
+throws MojoExecutionException
+{
super.execute();
-try {
+try
+{
ScmRepository repository = getScmRepository();
-RemoveScmResult result = getScmManager().remove(repository,
getFileSet(), message);
-checkResult(result);
-} catch (IOException e) {
-throw new MojoExecutionException("Cannot run remove command : ",
e);
-} catch (ScmException e) {
-throw new MojoExecutionException("Cannot run remove command : ",
e);
+RemoveScmResult result = getScmManager().remove( repository,
getFileSet(), message );
+checkResult( result );
+}
+catch ( IOException e )
+{
+throw new MojoExecutionException( "Cannot run remove command : " +
e.getMessage(), e );
+}
+catch ( ScmException e )
+{
+throw new MojoExecutionException( "Cannot run remove command : " +
e.getMessage(), e );
}
}
}
Modified:
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java?rev=1090546&r1=1090545&r2=1090546&view=diff
==
---
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
Sat Apr 9 08:29:33 2011
@@ -22,7 +22,6 @@ package org.apache.maven.scm.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -30,67 +29,82 @@ import java.io.File;
/**
* @author Paul Mackinlay
*/
-public class RemoveMojoTest extends AbstractMojoTestCase {
+public class RemoveMojoTest
+extends AbstractMojoTestCase
+{
+
+public void testShouldInvokeP4Delete()
+throws Exception
+{
-public void testShouldInvokeP4Delete() throws Exception {
-
-if ( !ScmTestCase.isSystemCmd("p4") )
+if ( !ScmTestCase.isSystemCmd( "p4" ) )
{
System.out.println( "'skip test as p4 is not available" );
return;
}
String testConfig =
"src/test/resources/mojos/remove/removeWithPerforce.xml";
-try {
-RemoveMojo removeMojo = (RemoveMojo) lookupMojo("remove",
getTestFile(testConfig));
+try
+{
+RemoveMojo removeMojo = (RemoveMojo) lookupMojo( "remove",
getTestFile( testConfig ) );
String connectionUrl = removeMojo.getConnectionUrl();
-connectionUrl = StringUtils.replace(connectionUrl, "${basedir}",
getBasedir());
-connectionUrl = StringUtils.replace(connectionUrl, "\\", "/");
-removeMojo.setWorkingDirectory(new File(getBasedir()));
-rem
svn commit: r1090545 - /maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
Author: olamy
Date: Sat Apr 9 08:29:04 2011
New Revision: 1090545
URL: http://svn.apache.org/viewvc?rev=1090545&view=rev
Log:
check p4 is available in cli before running test
Modified:
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
Modified:
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java?rev=1090545&r1=1090544&r2=1090545&view=diff
==
---
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
Sat Apr 9 08:29:04 2011
@@ -21,6 +21,8 @@ package org.apache.maven.scm.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.scm.ScmTestCase;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -31,6 +33,13 @@ import java.io.File;
public class RemoveMojoTest extends AbstractMojoTestCase {
public void testShouldInvokeP4Delete() throws Exception {
+
+if ( !ScmTestCase.isSystemCmd("p4") )
+{
+System.out.println( "'skip test as p4 is not available" );
+return;
+}
+
String testConfig =
"src/test/resources/mojos/remove/removeWithPerforce.xml";
try {
RemoveMojo removeMojo = (RemoveMojo) lookupMojo("remove",
getTestFile(testConfig));
@@ -54,6 +63,11 @@ public class RemoveMojoTest extends Abst
}
public void testShouldFailToInvokeP4Delete() throws Exception {
+if ( !ScmTestCase.isSystemCmd("p4") )
+{
+System.out.println( "'skip test as p4 is not available" );
+return;
+}
String testConfig =
"src/test/resources/mojos/remove/removeWithPerforceNoIncludes.xml";
try {
RemoveMojo removeMojo = (RemoveMojo) lookupMojo("remove",
getTestFile(testConfig));
svn commit: r1090544 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Author: olamy
Date: Sat Apr 9 08:28:49 2011
New Revision: 1090544
URL: http://svn.apache.org/viewvc?rev=1090544&view=rev
Log:
rethrow exception with chaining in case of CommandLineException in Perforce
remove command
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java?rev=1090544&r1=1090543&r2=1090544&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Sat Apr 9 08:28:49 2011
@@ -41,53 +41,45 @@ import java.util.List;
* @version $Id$
*/
public class PerforceRemoveCommand
-extends AbstractRemoveCommand
-implements PerforceCommand
-{
-/** {@inheritDoc} */
-protected ScmResult executeRemoveCommand( ScmProviderRepository repo,
ScmFileSet files, String message )
-throws ScmException
-{
-Commandline cl = createCommandLine( (PerforceScmProviderRepository)
repo, files.getBasedir(), files );
+extends AbstractRemoveCommand
+implements PerforceCommand {
+/**
+ * {@inheritDoc}
+ */
+protected ScmResult executeRemoveCommand(ScmProviderRepository repo,
ScmFileSet files, String message)
+throws ScmException {
+Commandline cl = createCommandLine((PerforceScmProviderRepository)
repo, files.getBasedir(), files);
PerforceRemoveConsumer consumer = new PerforceRemoveConsumer();
-try
-{
+try {
CommandLineUtils.StringStreamConsumer err = new
CommandLineUtils.StringStreamConsumer();
-int exitCode = CommandLineUtils.executeCommandLine( cl, consumer,
err );
+int exitCode = CommandLineUtils.executeCommandLine(cl, consumer,
err);
-if ( exitCode != 0 )
-{
-String cmdLine = CommandLineUtils.toString(
cl.getCommandline() );
+if (exitCode != 0) {
+String cmdLine =
CommandLineUtils.toString(cl.getCommandline());
-StringBuilder msg = new StringBuilder( "Exit code: " +
exitCode + " - " + err.getOutput() );
-msg.append( '\n' );
-msg.append( "Command line was:" + cmdLine );
+StringBuilder msg = new StringBuilder("Exit code: " + exitCode
+ " - " + err.getOutput());
+msg.append('\n');
+msg.append("Command line was:" + cmdLine);
-throw new CommandLineException( msg.toString() );
-}
-}
-catch ( CommandLineException e )
-{
-if ( getLogger().isErrorEnabled() )
-{
-getLogger().error( "CommandLineException " + e.getMessage(), e
);
+throw new CommandLineException(msg.toString());
}
+} catch (CommandLineException e) {
+throw new ScmException("CommandLineException " + e.getMessage(),
e);
+
}
-return new RemoveScmResult( cl.toString(), consumer.getRemovals() );
+return new RemoveScmResult(cl.toString(), consumer.getRemovals());
}
-public static Commandline createCommandLine( PerforceScmProviderRepository
repo, File workingDirectory,
- ScmFileSet files )
-{
-Commandline command = PerforceScmProvider.createP4Command( repo,
workingDirectory );
-command.createArg().setValue( "delete" );
+public static Commandline createCommandLine(PerforceScmProviderRepository
repo, File workingDirectory,
+ScmFileSet files) {
+Commandline command = PerforceScmProvider.createP4Command(repo,
workingDirectory);
+command.createArg().setValue("delete");
List fs = files.getFileList();
-for ( int i = 0; i < fs.size(); i++ )
-{
-File file = (File) fs.get( i );
-command.createArg().setValue( file.getName() );
+for (int i = 0; i < fs.size(); i++) {
+File file = (File) fs.get(i);
+command.createArg().setValue(file.getName());
}
return command;
}
svn commit: r1090543 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
Author: olamy Date: Sat Apr 9 08:28:29 2011 New Revision: 1090543 URL: http://svn.apache.org/viewvc?rev=1090543&view=rev Log: fix license header Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java?rev=1090543&r1=1090542&r2=1090543&view=diff == --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java Sat Apr 9 08:28:29 2011 @@ -1,12 +1,5 @@ package org.apache.maven.scm.plugin; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.scm.ScmException; -import org.apache.maven.scm.command.remove.RemoveScmResult; -import org.apache.maven.scm.repository.ScmRepository; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -26,6 +19,15 @@ import java.io.IOException; * under the License. */ +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.scm.ScmException; +import org.apache.maven.scm.command.remove.RemoveScmResult; +import org.apache.maven.scm.repository.ScmRepository; + +import java.io.IOException; + + + /** * Mark a set of files for deletion. *
svn commit: r1090542 - in /maven/scm/trunk/maven-scm-plugin/src: main/java/org/apache/maven/scm/plugin/ test/java/org/apache/maven/scm/plugin/ test/resources/mojos/remove/
Author: olamy
Date: Sat Apr 9 08:28:14 2011
New Revision: 1090542
URL: http://svn.apache.org/viewvc?rev=1090542&view=rev
Log:
[SCM-615] RemoveMojo to allow removing resources from version control.
Submitted by Paul Mackinlay.
Added:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
(with props)
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
(with props)
maven/scm/trunk/maven-scm-plugin/src/test/resources/mojos/remove/
maven/scm/trunk/maven-scm-plugin/src/test/resources/mojos/remove/removeWithPerforce.xml
(with props)
maven/scm/trunk/maven-scm-plugin/src/test/resources/mojos/remove/removeWithPerforceNoIncludes.xml
(with props)
Added:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java?rev=1090542&view=auto
==
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
(added)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
Sat Apr 9 08:28:14 2011
@@ -0,0 +1,60 @@
+package org.apache.maven.scm.plugin;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.command.remove.RemoveScmResult;
+import org.apache.maven.scm.repository.ScmRepository;
+
+import java.io.IOException;
+
+/*
+ * 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.
+ */
+
+/**
+ * Mark a set of files for deletion.
+ *
+ * @author Paul Mackinlay
+ * @goal remove
+ * @aggregator
+ */
+public class RemoveMojo extends AbstractScmMojo {
+
+/**
+ * The commit message.
+ *
+ * @parameter expression="${message}"
+ */
+private String message;
+
+/**
+ * {@inheritDoc}
+ */
+public void execute() throws MojoExecutionException {
+super.execute();
+try {
+ScmRepository repository = getScmRepository();
+RemoveScmResult result = getScmManager().remove(repository,
getFileSet(), message);
+checkResult(result);
+} catch (IOException e) {
+throw new MojoExecutionException("Cannot run remove command : ",
e);
+} catch (ScmException e) {
+throw new MojoExecutionException("Cannot run remove command : ",
e);
+}
+}
+}
Propchange:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
--
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
--
svn:keywords = Author Date Id Revision
Added:
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java?rev=1090542&view=auto
==
---
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
(added)
+++
maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/RemoveMojoTest.java
Sat Apr 9 08:28:14 2011
@@ -0,0 +1,84 @@
+package org.apache.maven.scm.plugin;
+
+/*
+ * 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 la
svn commit: r1086395 - in /maven/scm/trunk: ./ maven-scm-api/ maven-scm-client/ maven-scm-managers/ maven-scm-managers/maven-scm-manager-plexus/ maven-scm-plugin/ maven-scm-providers/ maven-scm-provid
Author: olamy Date: Mon Mar 28 20:40:26 2011 New Revision: 1086395 URL: http://svn.apache.org/viewvc?rev=1086395&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/scm/trunk/maven-scm-api/pom.xml maven/scm/trunk/maven-scm-client/pom.xml maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml maven/scm/trunk/maven-scm-managers/pom.xml maven/scm/trunk/maven-scm-plugin/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-standard/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/pom.xml maven/scm/trunk/maven-scm-providers/pom.xml maven/scm/trunk/maven-scm-test/pom.xml maven/scm/trunk/pom.xml Modified: maven/scm/trunk/maven-scm-api/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/pom.xml?rev=1086395&r1=1086394&r2=1086395&view=diff == --- maven/scm/trunk/maven-scm-api/pom.xml (original) +++ maven/scm/trunk/maven-scm-api/pom.xml Mon Mar 28 20:40:26 2011 @@ -25,7 +25,7 @@ org.apache.maven.scm maven-scm -1.5 +1.6-SNAPSHOT maven-scm-api Modified: maven/scm/trunk/maven-scm-client/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-client/pom.xml?rev=1086395&r1=1086394&r2=1086395&view=diff == --- maven/scm/trunk/maven-scm-client/pom.xml (original) +++ maven/scm/trunk/maven-scm-client/pom.xml Mon Mar 28 20:40:26 2011 @@ -25,7 +25,7 @@ org.apache.maven.scm maven-scm -1.5 +1.6-SNAPSHOT maven-scm-client Modified: maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml?rev=1086395&r1=1086394&r2=1086395&view=diff == --- maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml (original) +++ maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml Mon Mar 28 20:40:26 2011 @@ -25,7 +25,7 @@ org.apache.maven.scm maven-scm-managers -1.5 +1.6-SNAPSHOT maven-scm-manager-plexus Modified: maven/scm/trunk/maven-scm-managers/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-managers/pom.xml?rev=1086395&r1=1086394&r2=1086395&view=diff == --- maven/scm/trunk/maven-scm-managers/pom.xml (original) +++ maven/scm/trunk/maven-scm-managers/pom.xml Mon Mar 28 20:40:26 2011 @@ -23,7 +23,7 @@ maven-scm org.apache.maven.scm -1.5 +1.6-SNAPSHOT maven-scm-managers Modified: maven/scm/trunk/maven-scm-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1086395&r1=1086394&r2=1086395&view=diff ===
svn commit: r1086393 - /maven/scm/tags/maven-scm-1.5/
Author: olamy Date: Mon Mar 28 20:39:43 2011 New Revision: 1086393 URL: http://svn.apache.org/viewvc?rev=1086393&view=rev Log: [maven-release-plugin] copy for tag maven-scm-1.5 Added: maven/scm/tags/maven-scm-1.5/ - copied from r1086392, maven/scm/trunk/
svn commit: r1086392 - in /maven/scm/trunk: ./ maven-scm-api/ maven-scm-client/ maven-scm-managers/ maven-scm-managers/maven-scm-manager-plexus/ maven-scm-plugin/ maven-scm-providers/ maven-scm-provid
Author: olamy Date: Mon Mar 28 20:39:29 2011 New Revision: 1086392 URL: http://svn.apache.org/viewvc?rev=1086392&view=rev Log: [maven-release-plugin] prepare release maven-scm-1.5 Modified: maven/scm/trunk/maven-scm-api/pom.xml maven/scm/trunk/maven-scm-client/pom.xml maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml maven/scm/trunk/maven-scm-managers/pom.xml maven/scm/trunk/maven-scm-plugin/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-standard/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/pom.xml maven/scm/trunk/maven-scm-providers/pom.xml maven/scm/trunk/maven-scm-test/pom.xml maven/scm/trunk/pom.xml Modified: maven/scm/trunk/maven-scm-api/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/pom.xml?rev=1086392&r1=1086391&r2=1086392&view=diff == --- maven/scm/trunk/maven-scm-api/pom.xml (original) +++ maven/scm/trunk/maven-scm-api/pom.xml Mon Mar 28 20:39:29 2011 @@ -25,7 +25,7 @@ org.apache.maven.scm maven-scm -1.5-SNAPSHOT +1.5 maven-scm-api Modified: maven/scm/trunk/maven-scm-client/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-client/pom.xml?rev=1086392&r1=1086391&r2=1086392&view=diff == --- maven/scm/trunk/maven-scm-client/pom.xml (original) +++ maven/scm/trunk/maven-scm-client/pom.xml Mon Mar 28 20:39:29 2011 @@ -25,7 +25,7 @@ org.apache.maven.scm maven-scm -1.5-SNAPSHOT +1.5 maven-scm-client Modified: maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml?rev=1086392&r1=1086391&r2=1086392&view=diff == --- maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml (original) +++ maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/pom.xml Mon Mar 28 20:39:29 2011 @@ -25,7 +25,7 @@ org.apache.maven.scm maven-scm-managers -1.5-SNAPSHOT +1.5 maven-scm-manager-plexus Modified: maven/scm/trunk/maven-scm-managers/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-managers/pom.xml?rev=1086392&r1=1086391&r2=1086392&view=diff == --- maven/scm/trunk/maven-scm-managers/pom.xml (original) +++ maven/scm/trunk/maven-scm-managers/pom.xml Mon Mar 28 20:39:29 2011 @@ -23,7 +23,7 @@ maven-scm org.apache.maven.scm -1.5-SNAPSHOT +1.5 maven-scm-managers Modified: maven/scm/trunk/maven-scm-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1086392&r1=1086391&r2=1086392&view=diff ===
svn commit: r1086383 - /maven/scm/trunk/maven-scm-plugin/pom.xml
Author: olamy Date: Mon Mar 28 20:19:37 2011 New Revision: 1086383 URL: http://svn.apache.org/viewvc?rev=1086383&view=rev Log: upgrade to surefire 2.8 Modified: maven/scm/trunk/maven-scm-plugin/pom.xml Modified: maven/scm/trunk/maven-scm-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1086383&r1=1086382&r2=1086383&view=diff == --- maven/scm/trunk/maven-scm-plugin/pom.xml (original) +++ maven/scm/trunk/maven-scm-plugin/pom.xml Mon Mar 28 20:19:37 2011 @@ -175,6 +175,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.8
svn commit: r1083100 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java
Author: olamy Date: Fri Mar 18 23:00:17 2011 New Revision: 1083100 URL: http://svn.apache.org/viewvc?rev=1083100&view=rev Log: fix junit Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java?rev=1083100&r1=1083099&r2=1083100&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumerTest.java Fri Mar 18 23:00:17 2011 @@ -59,11 +59,11 @@ public class ClearCaseBlameConsumerTest BlameLine line1 = (BlameLine) consumer.getLines().get( 0 ); Assert.assertEquals( "7", line1.getRevision() ); -Assert.assertEquals( "Jeremie Lagarde", line1.getAuthor() ); +Assert.assertEquals( "jeremie lagarde", line1.getAuthor() ); BlameLine line12 = (BlameLine) consumer.getLines().get( 11 ); Assert.assertEquals( "5", line12.getRevision() ); -Assert.assertEquals( "Evgeny Mandrikov", line12.getAuthor() ); +Assert.assertEquals( "evgeny mandrikov", line12.getAuthor() ); } } \ No newline at end of file
svn commit: r1081211 - /maven/scm/trunk/pom.xml
Author: olamy Date: Sun Mar 13 19:57:37 2011 New Revision: 1081211 URL: http://svn.apache.org/viewvc?rev=1081211&view=rev Log: upgrade surefire version Modified: maven/scm/trunk/pom.xml Modified: maven/scm/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1081211&r1=1081210&r2=1081211&view=diff == --- maven/scm/trunk/pom.xml (original) +++ maven/scm/trunk/pom.xml Sun Mar 13 19:57:37 2011 @@ -298,12 +298,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.7.2 + 2.8 org.apache.maven.plugins maven-surefire-report-plugin - 2.7.2 + 2.8
svn commit: r1075587 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Author: olamy Date: Mon Feb 28 23:18:26 2011 New Revision: 1075587 URL: http://svn.apache.org/viewvc?rev=1075587&view=rev Log: an other fix test failure with symlink arghh :-) no should run on https://hudson.apache.org/hudson/view/M-R/view/Maven/job/MavenScm/ Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=1075587&r1=1075586&r2=1075587&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Mon Feb 28 23:18:26 2011 @@ -132,8 +132,8 @@ public class VssEditCommandTest cl = (Commandline) commands.get( 1 ); ssPath = VssCommandLineUtils.getSsDir().replace( '/', File.separatorChar ); // vss is windauze so don't care about the case -assertEquals( StringUtils.lowerCase( normSep( target.getPath() + "/test-classes/META-INF" ) ), StringUtils -.lowerCase( cl.getWorkingDirectory().getPath() ) ); +assertEquals( StringUtils.lowerCase( normSep( target.getCanonicalPath() + "/test-classes/META-INF" ) ), StringUtils +.lowerCase( cl.getWorkingDirectory().getCanonicalPath() ) ); assertCommandLine( ssPath + "ss Checkout $D:/myProject/test-classes/META-INF/LICENSE -Yusername,password -I-", ((File) fileSet.getFileList().get( 1 )).getParentFile().getCanonicalFile() , cl );
svn commit: r1075586 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Author: olamy Date: Mon Feb 28 23:18:08 2011 New Revision: 1075586 URL: http://svn.apache.org/viewvc?rev=1075586&view=rev Log: an other fix test failure with symlink arghh :-) Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=1075586&r1=1075585&r2=1075586&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Mon Feb 28 23:18:08 2011 @@ -121,9 +121,9 @@ public class VssEditCommandTest cl = (Commandline) commands.get( 0 ); ssPath = VssCommandLineUtils.getSsDir().replace( '/', File.separatorChar ); // vss is windauze so don't care about the case -assertEquals( StringUtils.lowerCase( normSep( target.getPath() +assertEquals( StringUtils.lowerCase( normSep( target.getCanonicalPath() + "/test-classes/org/apache/maven/scm/provider/vss/commands/edit" ) ), StringUtils.lowerCase( cl -.getWorkingDirectory().getPath() ) ); +.getWorkingDirectory().getCanonicalPath() ) ); assertCommandLine( ssPath + "ss Checkout $D:/myProject/test-classes/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.class -Yusername,password -I-",
svn commit: r1075585 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Author: olamy Date: Mon Feb 28 23:17:50 2011 New Revision: 1075585 URL: http://svn.apache.org/viewvc?rev=1075585&view=rev Log: an other fix test failure with symlink Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=1075585&r1=1075584&r2=1075585&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Mon Feb 28 23:17:50 2011 @@ -127,7 +127,7 @@ public class VssEditCommandTest assertCommandLine( ssPath + "ss Checkout $D:/myProject/test-classes/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.class -Yusername,password -I-", - ((File) fileSet.getFileList().get( 0 )).getParentFile(), cl ); + ((File) fileSet.getFileList().get( 0 )).getParentFile().getCanonicalFile(), cl ); cl = (Commandline) commands.get( 1 ); ssPath = VssCommandLineUtils.getSsDir().replace( '/', File.separatorChar );
svn commit: r1075584 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Author: olamy Date: Mon Feb 28 23:17:32 2011 New Revision: 1075584 URL: http://svn.apache.org/viewvc?rev=1075584&view=rev Log: fix test failure with symlink Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=1075584&r1=1075583&r2=1075584&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java Mon Feb 28 23:17:32 2011 @@ -76,7 +76,7 @@ public class VssEditCommandTest assertCommandLine( ssPath + "ss Checkout $D:/myProject/target/test-classes/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.class -Yusername,password -I-", - ((File) fileSet.getFileList().get( 0 )).getParentFile(), cl ); + ((File) fileSet.getFileList().get( 0 )).getParentFile().getCanonicalFile(), cl ); } public void testCommandLineRelativePath() @@ -97,7 +97,7 @@ public class VssEditCommandTest assertCommandLine( ssPath + "ss Checkout $D:/myProject/test-classes/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.class -Yusername,password -I-", - ((File) fileSet.getFileList().get( 0 )).getParentFile(), cl ); + ((File) fileSet.getFileList().get( 0 )).getParentFile().getCanonicalFile(), cl ); } public void testCommandLineMultipleFiles() @@ -135,7 +135,7 @@ public class VssEditCommandTest assertEquals( StringUtils.lowerCase( normSep( target.getPath() + "/test-classes/META-INF" ) ), StringUtils .lowerCase( cl.getWorkingDirectory().getPath() ) ); assertCommandLine( ssPath + "ss Checkout $D:/myProject/test-classes/META-INF/LICENSE -Yusername,password -I-", - ((File) fileSet.getFileList().get( 1 )).getParentFile() , cl ); + ((File) fileSet.getFileList().get( 1 )).getParentFile().getCanonicalFile() , cl ); }
svn commit: r1075583 - /maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Author: olamy
Date: Mon Feb 28 23:17:12 2011
New Revision: 1075583
URL: http://svn.apache.org/viewvc?rev=1075583&view=rev
Log:
revert previous try to fix symlink issue as it break so much test
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java?rev=1075583&r1=1075582&r2=1075583&view=diff
==
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Mon Feb 28 23:17:12 2011
@@ -328,13 +328,7 @@ public abstract class ScmTestCase
Commandline cl = new Commandline( expectedCommand );
if ( expectedWorkingDirectory != null )
{
-// take of symlink
-if (expectedWorkingDirectory.getCanonicalFile().equals(
expectedWorkingDirectory.getAbsoluteFile() ))
-{
-cl.setWorkingDirectory(
expectedWorkingDirectory.getAbsolutePath() );
-} else {
-cl.setWorkingDirectory(
expectedWorkingDirectory.getCanonicalPath() );
-}
+cl.setWorkingDirectory( expectedWorkingDirectory.getAbsolutePath()
);
}
assertEquals( cl.toString(), actualCommand.toString() );
}
svn commit: r1075582 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src: main/java/org/apache/maven/scm/provider/accurev/ main/java/org/apache/maven/scm/provider/accurev/cli/ mai
Author: olamy
Date: Mon Feb 28 23:16:57 2011
New Revision: 1075582
URL: http://svn.apache.org/viewvc?rev=1075582&view=rev
Log:
[SCM-611] AccuRev - call replica sync before export
Submitted by Grant Gardner
Modified:
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/cli/AccuRevCommandLine.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.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/test/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommandTest.java
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=1075582&r1=1075581&r2=1075582&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
Mon Feb 28 23:16:57 2011
@@ -282,4 +282,7 @@ public interface AccuRev
String getClientVersion()
throws AccuRevException;
+boolean syncReplica()
+throws AccuRevException;
+
}
\ No newline at end of file
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.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/cli/AccuRevCommandLine.java?rev=1075582&r1=1075581&r2=1075582&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
Mon Feb 28 23:16:57 2011
@@ -744,4 +744,10 @@ public class AccuRevCommandLine
}
+public boolean syncReplica()
+throws AccuRevException
+{
+return executeCommandLine( new String[] { "replica", "sync" } );
+}
+
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.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/cli/ErrorConsumer.java?rev=1075582&r1=1075581&r2=1075582&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java
Mon Feb 28 23:16:57 2011
@@ -29,6 +29,7 @@ final class ErrorConsumer
{
private static final Pattern[] SKIPPED_WARNINGS = {
+Pattern.compile( ".*replica sync on the master server.*"),
Pattern.compile( "No elements selected.*" ),
Pattern.compile( "You are not in a directory.*" ),
Pattern.compile( "Note.*" ),
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommand.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/command/export/AccuRevExportCommand.java?rev=1075582&r1=1075581&r2=1075582&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/export/AccuRevExportCommand.java
Mon Feb 28 23:16:57 2011
@@ -72,6 +72,9 @@ public c
svn commit: r1075581 - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ maven-scm-provider-clearcase/src/test/ja
Author: olamy
Date: Mon Feb 28 23:16:30 2011
New Revision: 1075581
URL: http://svn.apache.org/viewvc?rev=1075581&view=rev
Log:
oups fix compilation failure
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsEditCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsListCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsUnEditCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsUpdateCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java?rev=1075581&r1=1075580&r2=1075581&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommandTest.java
Mon Feb 28 23:16:30 2011
@@ -19,12 +19,12 @@ package org.apache.maven.scm.provider.cl
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-
/**
* @author mailto:wim.debla...@gmail.com";>Wim Deblauwe
*/
@@ -32,6 +32,7 @@ public class ClearCaseAddCommandTest
extends ScmTestCase
{
public void testAddCommand()
+throws Exception
svn commit: r1075580 - /maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Author: olamy
Date: Mon Feb 28 23:15:35 2011
New Revision: 1075580
URL: http://svn.apache.org/viewvc?rev=1075580&view=rev
Log:
take care of symlink in test
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java?rev=1075580&r1=1075579&r2=1075580&view=diff
==
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Mon Feb 28 23:15:35 2011
@@ -323,11 +323,18 @@ public abstract class ScmTestCase
}
public void assertCommandLine( String expectedCommand, File
expectedWorkingDirectory, Commandline actualCommand )
+throws IOException
{
Commandline cl = new Commandline( expectedCommand );
if ( expectedWorkingDirectory != null )
{
-cl.setWorkingDirectory( expectedWorkingDirectory.getAbsolutePath()
);
+// take of symlink
+if (expectedWorkingDirectory.getCanonicalFile().equals(
expectedWorkingDirectory.getAbsoluteFile() ))
+{
+cl.setWorkingDirectory(
expectedWorkingDirectory.getAbsolutePath() );
+} else {
+cl.setWorkingDirectory(
expectedWorkingDirectory.getCanonicalPath() );
+}
}
assertEquals( cl.toString(), actualCommand.toString() );
}
svn commit: r1075579 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
Author: olamy
Date: Mon Feb 28 23:15:19 2011
New Revision: 1075579
URL: http://svn.apache.org/viewvc?rev=1075579&view=rev
Log:
take care of symlink
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java?rev=1075579&r1=1075578&r2=1075579&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
Mon Feb 28 23:15:19 2011
@@ -362,7 +362,11 @@ public class StarteamScmProvider
throw new ScmException( fileOrDir.getPath() + " was not contained
in " + basedir.getPath() );
}
-return fileOrDir.getPath().substring( basedir.getPath().length() + 1,
fileOrDir.getPath().length() );
+if ( basedir.getCanonicalFile().equals(basedir.getAbsoluteFile()) )
+{
+return fileOrDir.getPath().substring( basedir.getPath().length() +
1, fileOrDir.getPath().length() );
+}
+return fileOrDir.getPath().substring(
basedir.getCanonicalPath().length() + 1, fileOrDir.getPath().length() );
}
private static File getAbsoluteFilePath( File fileOrDir )
svn commit: r1075578 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Author: olamy Date: Mon Feb 28 23:15:01 2011 New Revision: 1075578 URL: http://svn.apache.org/viewvc?rev=1075578&view=rev Log: more debug informations to fix symlink issue on ci server Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java?rev=1075578&r1=1075577&r2=1075578&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java Mon Feb 28 23:15:01 2011 @@ -44,10 +44,11 @@ public class StarteamScmProviderTest File testFile = new File( testDir, "testfile.txt" ); testFile.createNewFile(); - + String relativePath = StarteamScmProvider.getRelativePath( basedir, testFile ); relativePath = relativePath.replace( '\\', '/' ) ; -assertEquals( "not expected relativePath, found " + relativePath + " for file " + testFile.getParent(), +assertEquals( "not expected relativePath, found " + relativePath + " for file " + testFile.getPath() + + " and baseDir " + basedir.getPath(), "target/testdir/testfile.txt", relativePath ); }
svn commit: r1075577 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Author: olamy
Date: Mon Feb 28 23:14:44 2011
New Revision: 1075577
URL: http://svn.apache.org/viewvc?rev=1075577&view=rev
Log:
more debug informations to fix symlink issue on ci server
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java?rev=1075577&r1=1075576&r2=1075577&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Mon Feb 28 23:14:44 2011
@@ -47,7 +47,8 @@ public class StarteamScmProviderTest
String relativePath = StarteamScmProvider.getRelativePath( basedir,
testFile );
relativePath = relativePath.replace( '\\', '/' ) ;
-assertEquals("not expected relativePath, found " + relativePath ,
"target/testdir/testfile.txt", relativePath);
+assertEquals( "not expected relativePath, found " + relativePath + "
for file " + testFile.getParent(),
+ "target/testdir/testfile.txt", relativePath );
}
svn commit: r1075576 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Author: olamy
Date: Mon Feb 28 23:14:23 2011
New Revision: 1075576
URL: http://svn.apache.org/viewvc?rev=1075576&view=rev
Log:
more debug informations to fix symlink issue on ci server
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java?rev=1075576&r1=1075575&r2=1075576&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/StarteamScmProviderTest.java
Mon Feb 28 23:14:23 2011
@@ -46,8 +46,8 @@ public class StarteamScmProviderTest
testFile.createNewFile();
String relativePath = StarteamScmProvider.getRelativePath( basedir,
testFile );
-
-assertEquals( "target/testdir/testfile.txt", relativePath.replace(
'\\', '/' ) );
+relativePath = relativePath.replace( '\\', '/' ) ;
+assertEquals("not expected relativePath, found " + relativePath ,
"target/testdir/testfile.txt", relativePath);
}
svn commit: r1074949 - in /maven/scm/trunk: maven-scm-providers/maven-scm-provider-accurev/pom.xml maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cl
Author: olamy
Date: Sat Feb 26 22:53:15 2011
New Revision: 1074949
URL: http://svn.apache.org/viewvc?rev=1074949&view=rev
Log:
upgrade to last junit version.
try to take care of symlink in a junit.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
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/pom.xml
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=1074949&r1=1074948&r2=1074949&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 Sat
Feb 26 22:53:15 2011
@@ -41,7 +41,6 @@
junit
junit
- 4.5
test
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java?rev=1074949&r1=1074948&r2=1074949&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
Sat Feb 26 22:53:15 2011
@@ -290,7 +290,14 @@ public class AccuRevCommandLineTest
Commandline lastCL = accuRevCL.getCommandline();
assertThat( lastCL.getExecutable(), is( "accurev.exe" ) );
-assertThat( lastCL.getWorkingDirectory(), is( new File(
"/home/workspace" ).getCanonicalFile() ) );
+// take care of symlink
+if (lastCL.getWorkingDirectory().getCanonicalFile().equals(
lastCL.getWorkingDirectory().getAbsoluteFile() ))
+{
+assertThat( lastCL.getWorkingDirectory(), is( new File(
"/home/workspace" ).getCanonicalFile() ) );
+} else {
+assertThat( lastCL.getWorkingDirectory(), is( new File(
"/home/workspace" ).getAbsoluteFile() ));// .getCanonicalFile() ) );
+}
+
assertThat( lastCL.getArguments(), is( new String[] { "pop", "-R",
testFile.getPath() } ) );
}
Modified: maven/scm/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1074949&r1=1074948&r2=1074949&view=diff
==
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Sat Feb 26 22:53:15 2011
@@ -222,7 +222,7 @@
junit
junit
-3.8.2
+4.8.2
org.apache.maven.scm
svn commit: r1072689 - /maven/scm/trunk/maven-scm-plugin/pom.xml
Author: olamy Date: Sun Feb 20 19:13:16 2011 New Revision: 1072689 URL: http://svn.apache.org/viewvc?rev=1072689&view=rev Log: upgrade to last maven-plugins parent Modified: maven/scm/trunk/maven-scm-plugin/pom.xml Modified: maven/scm/trunk/maven-scm-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1072689&r1=1072688&r2=1072689&view=diff == --- maven/scm/trunk/maven-scm-plugin/pom.xml (original) +++ maven/scm/trunk/maven-scm-plugin/pom.xml Sun Feb 20 19:13:16 2011 @@ -25,7 +25,7 @@ org.apache.maven.plugins maven-plugins -18 +19 ../../plugins/maven-plugins/pom.xml
svn commit: r1072610 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
Author: olamy
Date: Sun Feb 20 15:11:18 2011
New Revision: 1072610
URL: http://svn.apache.org/viewvc?rev=1072610&view=rev
Log:
[SCM-609] Mercurial SCM provider reports revision number instead of revision
hash in changelog command
Submitted by Ringo De Smet
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java?rev=1072610&r1=1072609&r2=1072610&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
Sun Feb 20 15:11:18 2011
@@ -174,9 +174,8 @@ public class HgChangeLogConsumer
{
tmpLine = line.substring( REVNO_TAG.length() );
tmpLine = tmpLine.trim();
-currentRevision = tmpLine;
-String revision = currentRevision.substring( 0,
currentRevision.indexOf( ':' ) );
-currentChange.setRevision( revision );
+currentRevision = tmpLine.substring( tmpLine.indexOf( ':' ) + 1 );
+currentChange.setRevision( currentRevision );
}
else if ( line.startsWith( TAG_TAG ) )
svn commit: r1072609 - /maven/scm/trunk/pom.xml
Author: olamy Date: Sun Feb 20 15:10:58 2011 New Revision: 1072609 URL: http://svn.apache.org/viewvc?rev=1072609&view=rev Log: use released parent 19 Modified: maven/scm/trunk/pom.xml Modified: maven/scm/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1072609&r1=1072608&r2=1072609&view=diff == --- maven/scm/trunk/pom.xml (original) +++ maven/scm/trunk/pom.xml Sun Feb 20 15:10:58 2011 @@ -25,7 +25,7 @@ org.apache.maven maven-parent -19-SNAPSHOT +19 ../pom/maven/pom.xml
svn commit: r1068137 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsume
Author: olamy
Date: Mon Feb 7 21:11:04 2011
New Revision: 1068137
URL: http://svn.apache.org/viewvc?rev=1068137&view=rev
Log:
fix Tck test for svnexe checkout command
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java?rev=1068137&r1=1068136&r2=1068137&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
Mon Feb 7 21:11:04 2011
@@ -105,7 +105,7 @@ public class SvnCheckOutConsumer
for ( ScmFile file : files )
{
if (!( !file.getStatus().equals( ScmFileStatus.DELETED )
-&& !new File( file.getPath() ).isFile() ))
+&& !new File(getWorkingDirectory(), file.getPath() ).isFile()
))
{
onlyFiles.add( file );
}
svn commit: r1067549 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src: main/java/org/apache/maven/scm/provider/synergy/ main/java/org/apache/maven/scm/provider/synergy/command/
Author: olamy
Date: Sat Feb 5 23:13:10 2011
New Revision: 1067549
URL: http://svn.apache.org/viewvc?rev=1067549&view=rev
Log:
[SCM-553] release:prepare not working with synergy scm-provider
Submitted by Jan Malcomess
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyShowDefaultTaskConsumer.java
- copied, changed from r1067545,
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyTaskManager.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyShowDefaultTaskConsumerTest.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/resources/synergy/consumer/showDefaultTaskNotSet.txt
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/resources/synergy/consumer/showDefaultTaskSet.txt
(with props)
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingProjectConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java?rev=1067549&r1=1067548&r2=1067549&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/SynergyScmProvider.java
Sat Feb 5 23:13:10 2011
@@ -58,6 +58,10 @@ public class SynergyScmProvider
public ScmProviderRepository makeProviderScmRepository( String
scmSpecificUrl, char delimiter )
throws ScmRepositoryException
{
+ if (getLogger().isDebugEnabled())
+ {
+ getLogger().debug("Creating SynergyScmProviderRepository...");
+ }
return new SynergyScmProviderRepository( scmSpecificUrl );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java?rev=1067549&r1=1067548&r2=1067549&view=diff
==
---
maven/scm/trunk/maven-scm-pr
svn commit: r1067545 - in /maven/scm/trunk/maven-scm-providers: maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/ maven-scm-provide
Author: olamy
Date: Sat Feb 5 22:39:49 2011
New Revision: 1067545
URL: http://svn.apache.org/viewvc?rev=1067545&view=rev
Log:
[SCM-555] paths reported in svn-exe checkout do not match update command
(always reports absolute).
Submitted by Andrew Williams.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java?rev=1067545&r1=1067544&r2=1067545&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
Sat Feb 5 22:39:49 2011
@@ -45,7 +45,7 @@ public class GitInfoCommandTckTest
assertNotNull( repository );
InfoScmResult result = provider.info( repository, new ScmFileSet(
getRepositoryRoot() ), new CommandParameters() );
assertNotNull( result );
-assertEquals( "cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767",
result.getInfoItems().get( 0 ).getRevision() );
+assertEquals( "d42193018c2fc462a103ef6440cd162d73595c53",
result.getInfoItems().get( 0 ).getRevision() );
//
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java?rev=1067545&r1=1067544&r2=1067545&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
Sat Feb 5 22:39:49 2011
@@ -113,4 +113,9 @@ public abstract class AbstractFileChecki
return revision;
}
+public File getWorkingDirectory()
+{
+return workingDirectory;
+}
+
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java?rev=1067545&r1=1067544&r2=1067545&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java
Sat Feb 5 22:39:49 2011
@@ -74,7 +74,7 @@ public class SvnCheckOutCommand
Commandline cl = createCommandLine( repository, fileSet.getBasedir(),
version, url, recursive );
-SvnCheckOutConsumer consumer = new SvnCheckOutConsumer( getLogger(),
fileSet.getBasedir().getParentFile() );
+SvnCheckOutConsumer consumer = new SvnCheckOutConsumer( getLogger(),
fileSet.getBasedir() );
svn commit: r1067537 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Author: olamy
Date: Sat Feb 5 22:09:15 2011
New Revision: 1067537
URL: http://svn.apache.org/viewvc?rev=1067537&view=rev
Log:
fix codestyle
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java?rev=1067537&r1=1067536&r2=1067537&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Sat Feb 5 22:09:15 2011
@@ -52,11 +52,9 @@ public class HgBlameConsumer
String annotation;
if(trimmedLine.indexOf(": ") > -1)
{
- annotation = trimmedLine.substring(0, trimmedLine.indexOf(":
")).trim();
-}
-else
-{
- annotation = trimmedLine.substring(0,
trimmedLine.lastIndexOf(":")).trim();
+annotation = trimmedLine.substring(0, trimmedLine.indexOf(":
")).trim();
+} else {
+annotation = trimmedLine.substring(0,
trimmedLine.lastIndexOf(":")).trim();
}
String author = annotation.substring( 0, annotation.indexOf( ' ' ) );
svn commit: r1067536 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Author: olamy
Date: Sat Feb 5 22:08:56 2011
New Revision: 1067536
URL: http://svn.apache.org/viewvc?rev=1067536&view=rev
Log:
[SCM-603] Blame command for Mercurial (HG) is partial
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java?rev=1067536&r1=1067535&r2=1067536&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Sat Feb 5 22:08:56 2011
@@ -49,7 +49,15 @@ public class HgBlameConsumer
public void doConsume( ScmFileStatus status, String trimmedLine )
{
/* godin 0 Sun Jan 31 03:04:54 2010 +0300 */
-String annotation = trimmedLine.substring( 0, trimmedLine.indexOf( ":
" ) ).trim();
+String annotation;
+if(trimmedLine.indexOf(": ") > -1)
+{
+ annotation = trimmedLine.substring(0, trimmedLine.indexOf(":
")).trim();
+}
+else
+{
+ annotation = trimmedLine.substring(0,
trimmedLine.lastIndexOf(":")).trim();
+}
String author = annotation.substring( 0, annotation.indexOf( ' ' ) );
annotation = annotation.substring( annotation.indexOf( ' ' ) + 1
).trim();
svn commit: r1063887 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg: HgScmProvider.java command/info/HgInfoCommand.java command/info/HgI
Author: olamy Date: Wed Jan 26 21:58:58 2011 New Revision: 1063887 URL: http://svn.apache.org/viewvc?rev=1063887&view=rev Log: [SCM-601] Implements a mercurial (hg) info command Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoConsumer.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1063887&r1=1063886&r2=1063887&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java Wed Jan 26 21:58:58 2011 @@ -331,6 +331,7 @@ public class HgScmProvider } /** + * returns result of hg id -i * @since 1.5 * @see org.apache.maven.scm.provider.AbstractScmProvider#info(org.apache.maven.scm.provider.ScmProviderRepository, org.apache.maven.scm.ScmFileSet, org.apache.maven.scm.CommandParameters) */ Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java?rev=1063887&r1=1063886&r2=1063887&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java Wed Jan 26 21:58:58 2011 @@ -1,5 +1,24 @@ package org.apache.maven.scm.provider.hg.command.info; +/* + * 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 org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoConsumer.java?rev=1063887&r1=1063886&r2=1063887&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoConsumer.java Wed Jan 26 21:58:58 2011 @@ -1,5 +1,24 @@ package org.apache.maven.scm.provider.hg.command.info; +/* + * 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" BA
svn commit: r1063886 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/info/ maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/ mav
Author: olamy
Date: Wed Jan 26 21:58:39 2011
New Revision: 1063886
URL: http://svn.apache.org/viewvc?rev=1063886&view=rev
Log:
[SCM-601] Implements a mercurial (hg) info command
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoConsumer.java
(with props)
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java?rev=1063886&r1=1063885&r2=1063886&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
Wed Jan 26 21:58:39 2011
@@ -50,11 +50,11 @@ public class InfoScmResult
this.infoItems = files;
}
-public InfoScmResult( List files, ScmResult result )
+public InfoScmResult( List infoItems, ScmResult result )
{
super( result );
-this.infoItems = files;
+this.infoItems = infoItems;
}
public InfoScmResult( ScmResult result )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1063886&r1=1063885&r2=1063886&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Wed Jan 26 21:58:39 2011
@@ -33,6 +33,7 @@ import org.apache.maven.scm.command.chan
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.command.info.InfoScmResult;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.command.status.StatusScmResult;
@@ -47,6 +48,7 @@ import org.apache.maven.scm.provider.hg.
import org.apache.maven.scm.provider.hg.command.checkin.HgCheckInCommand;
import org.apache.maven.scm.provider.hg.command.checkout.HgCheckOutCommand;
import org.apache.maven.scm.provider.hg.command.diff.HgDiffCommand;
+import org.apache.maven.scm.provider.hg.command.info.HgInfoCommand;
import org.apache.maven.scm.provider.hg.command.inventory.HgListCommand;
import org.apache.maven.scm.provider.hg.command.remove.HgRemoveCommand;
import org.apache.maven.scm.provider.hg.command.status.HgStatusCommand;
@@ -327,4 +329,17 @@ public class HgScmProvider
return (ListScmResult) hgListCommand.executeCommand( repository,
fileSet, parameters );
}
+
+/**
+ * @since 1.5
+ * @see
org.apache.maven.scm.provider.AbstractScmProvider#info(org.apache.maven.scm.provider.ScmProviderRepository,
org.apache.maven.scm.ScmFileSet, org.apache.maven.scm.CommandParameters)
+ */
+@Override
+public InfoScmResult info( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
+throws ScmException
+{
+HgInfoCommand infoCommand = new HgInfoCommand();
+infoCommand.setLogger( getLogger() );
+return (InfoScmResult) infoCommand.execute( repository, fileSet,
parameters );
+}
}
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java?rev=1063886&view=auto
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/info/HgInfoCommand.java
(added)
+++
maven/scm/tru
svn commit: r1063885 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info: SvnInfoCommand.jav
Author: olamy
Date: Wed Jan 26 21:58:10 2011
New Revision: 1063885
URL: http://svn.apache.org/viewvc?rev=1063885&view=rev
Log:
use new InfoItem class
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java?rev=1063885&r1=1063884&r2=1063885&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
Wed Jan 26 21:58:10 2011
@@ -19,14 +19,17 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.AbstractCommand;
+import org.apache.maven.scm.command.info.InfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.svn.command.SvnCommand;
-import org.apache.maven.scm.provider.svn.command.info.SvnInfoScmResult;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.provider.svn.svnexe.command.SvnCommandLineUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -34,9 +37,6 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.Iterator;
-
/**
* @author mailto:ken...@apache.org";>Kenney Westerhof
* @version $Id$
@@ -54,7 +54,7 @@ public class SvnInfoCommand
return executeInfoCommand( (SvnScmProviderRepository) repository,
fileSet, parameters, false, null );
}
-public SvnInfoScmResult executeInfoCommand( SvnScmProviderRepository
repository, ScmFileSet fileSet,
+public InfoScmResult executeInfoCommand( SvnScmProviderRepository
repository, ScmFileSet fileSet,
CommandParameters parameters,
boolean recursive, String revision )
throws ScmException
{
@@ -83,10 +83,10 @@ public class SvnInfoCommand
if ( exitCode != 0 )
{
-return new SvnInfoScmResult( cl.toString(), "The svn command
failed.", stderr.getOutput(), false );
+return new InfoScmResult( cl.toString(), "The svn command
failed.", stderr.getOutput(), false );
}
-return new SvnInfoScmResult( cl.toString(), consumer.getInfoItems() );
+return new InfoScmResult( cl.toString(), consumer.getInfoItems() );
}
//set scope to protected to allow test to call it directly
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java?rev=1063885&r1=1063884&r2=1063885&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
Wed Jan 26 21:58:10 2011
@@ -19,12 +19,12 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
-import org.apache.maven.scm.provider.svn.command.info.SvnInfoItem;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.scm.command.info.InfoItem;
+import org.codehaus.plexus.util.cli.StreamConsum
svn commit: r1063884 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Author: olamy Date: Wed Jan 26 21:57:50 2011 New Revision: 1063884 URL: http://svn.apache.org/viewvc?rev=1063884&view=rev Log: remove unused import Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1063884&r1=1063883&r2=1063884&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java Wed Jan 26 21:57:50 2011 @@ -26,7 +26,6 @@ import java.util.List; import org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; -import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.add.AddScmResult; import org.apache.maven.scm.command.blame.BlameScmResult; import org.apache.maven.scm.command.branch.BranchScmResult; @@ -54,7 +53,6 @@ import org.apache.maven.scm.provider.hg. import org.apache.maven.scm.provider.hg.command.tag.HgTagCommand; import org.apache.maven.scm.provider.hg.command.update.HgUpdateCommand; import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository; -import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.ScmRepositoryException; import org.apache.maven.scm.repository.UnknownRepositoryStructure;
svn commit: r1063679 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git: ./ hooks/ info/ logs/ logs/refs/ logs/refs/heads/ obj
Author: olamy Date: Wed Jan 26 11:22:35 2011 New Revision: 1063679 URL: http://svn.apache.org/viewvc?rev=1063679&view=rev Log: prevent failure regarding missing git metadata. Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/COMMIT_EDITMSG maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/HEAD maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/config maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/description maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/applypatch-msg.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/commit-msg.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/post-commit.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/post-receive.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/post-update.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/pre-applypatch.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/pre-commit.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/pre-rebase.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/prepare-commit-msg.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/update.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/index (with props) maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/info/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/info/exclude maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/logs/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/logs/HEAD maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/logs/refs/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/logs/refs/heads/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/logs/refs/heads/master maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/1e/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/1e/193b8e82a3454ae2fb6856ffe0fc301a4fe10b (with props) maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/5a/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/5a/3fecc90185cee3b2e78c5b4091123ea4e370e0 (with props) maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/cd/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/cd/3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767 maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/info/ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/objects/pack/ maven/scm/trunk/maven-scm-providers/maven
svn commit: r1063677 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.
Author: olamy
Date: Wed Jan 26 11:12:08 2011
New Revision: 1063677
URL: http://svn.apache.org/viewvc?rev=1063677&view=rev
Log:
[SCM-600] move info command (from svn provider and git provider) to the scm api
level (ScmProvider interface)
move test to use interface rather than direct implementation.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java?rev=1063677&r1=1063676&r2=1063677&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
Wed Jan 26 11:12:08 2011
@@ -25,9 +25,9 @@ import org.apache.maven.scm.CommandParam
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.command.info.InfoScmResult;
+import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.gitexe.GitExeScmProvider;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -40,7 +40,7 @@ public class GitInfoCommandTckTest
public void testInfoCommand() throws Exception
{
GitScmTestUtils.initRepo( "src/test/resources/git/info",
getRepositoryRoot(), getWorkingCopy() );
-GitExeScmProvider provider = (GitExeScmProvider)
getScmManager().getProviderByUrl( getScmUrl() );
+ScmProvider provider = getScmManager().getProviderByUrl( getScmUrl() );
ScmProviderRepository repository = provider.makeProviderScmRepository(
getRepositoryRoot() );
assertNotNull( repository );
InfoScmResult result = provider.info( repository, new ScmFileSet(
getRepositoryRoot() ), new CommandParameters() );
svn commit: r1063676 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/provider/ maven-scm-test/src/main/java/org/apache/maven/scm/provider/
Author: olamy
Date: Wed Jan 26 11:09:17 2011
New Revision: 1063676
URL: http://svn.apache.org/viewvc?rev=1063676&view=rev
Log:
[SCM-600] move info command (from svn provider and git provider) to the scm api
level (ScmProvider interface)
Modified:
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-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=1063676&r1=1063675&r2=1063676&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
Wed Jan 26 11:09:17 2011
@@ -38,6 +38,7 @@ import org.apache.maven.scm.command.chec
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.command.edit.EditScmResult;
import org.apache.maven.scm.command.export.ExportScmResult;
+import org.apache.maven.scm.command.info.InfoScmResult;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.command.login.LoginScmResult;
import org.apache.maven.scm.command.mkdir.MkdirScmResult;
@@ -957,6 +958,12 @@ public abstract class AbstractScmProvide
{
throw new NoSuchCommandScmException( "blame" );
}
+
+public InfoScmResult info( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
+throws ScmException
+{
+return null;
+}
// --
//
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java?rev=1063676&r1=1063675&r2=1063676&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
Wed Jan 26 11:09:17 2011
@@ -19,6 +19,7 @@ package org.apache.maven.scm.provider;
* under the License.
*/
+import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmBranchParameters;
import org.apache.maven.scm.ScmException;
@@ -34,6 +35,7 @@ import org.apache.maven.scm.command.chec
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.command.edit.EditScmResult;
import org.apache.maven.scm.command.export.ExportScmResult;
+import org.apache.maven.scm.command.info.InfoScmResult;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.command.mkdir.MkdirScmResult;
import org.apache.maven.scm.command.remove.RemoveScmResult;
@@ -861,4 +863,15 @@ public interface ScmProvider
*/
MkdirScmResult mkdir( ScmRepository repository, ScmFileSet fileSet, String
message, boolean createInLocal )
throws ScmException;
+
+/**
+ * @param repository the source control system
+ * @param fileSetlocation of your local copy
+ * @param parameters some parameters (not use currently but for future use)
+ * @since 1.5
+ * @return if the scm implementation doesn't support "info" result will
null
+ * @throws ScmException
+ */
+InfoScmResult info( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
+throws ScmException;
}
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java?rev=1063676&r1=1063675&r2=1063676&view=diff
==
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
Wed Jan 26 11:09:17 2011
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
+import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmBranchParameters;
import org.apache.maven.scm.ScmExce
svn commit: r1063672 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/command/info/ test/java/org/apa
Author: olamy Date: Wed Jan 26 10:52:46 2011 New Revision: 1063672 URL: http://svn.apache.org/viewvc?rev=1063672&view=rev Log: oups missed to add license headers and @since. Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java?rev=1063672&r1=1063671&r2=1063672&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java Wed Jan 26 10:52:46 2011 @@ -1,5 +1,24 @@ package org.apache.maven.scm.provider.git.gitexe.command.info; +/* + * 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 org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; @@ -14,6 +33,7 @@ import org.codehaus.plexus.util.cli.Comm /** * @author Olivier Lamy + * @since 1.5 * */ public class GitInfoCommand Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java?rev=1063672&r1=1063671&r2=1063672&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java Wed Jan 26 10:52:46 2011 @@ -1,8 +1,24 @@ -/** - * - */ package org.apache.maven.scm.provider.git.gitexe.command.info; +/* + * 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.ArrayList; import java.util.List; @@ -14,7 +30,7 @@ import org.codehaus.plexus.util.StringUt /** * @author Olivier Lamy - * + * @since 1.5 */ public class GitInfoConsumer extends AbstractConsumer Modified: maven/scm/
svn commit: r1063671 - in /maven/scm/trunk: ./ maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/ maven-scm-providers/maven-scm
Author: olamy
Date: Wed Jan 26 10:50:40 2011
New Revision: 1063671
URL: http://svn.apache.org/viewvc?rev=1063671&view=rev
Log:
[SCM-599] Implements a git info command
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommand.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/foo.txt
(with props)
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
maven/scm/trunk/pom.xml
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java?rev=1063671&r1=1063670&r2=1063671&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
Wed Jan 26 10:50:40 2011
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -31,6 +35,7 @@ import org.apache.maven.scm.command.chec
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.command.export.ExportScmResult;
+import org.apache.maven.scm.command.info.InfoScmResult;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.command.status.StatusScmResult;
@@ -39,15 +44,10 @@ import org.apache.maven.scm.command.upda
import org.apache.maven.scm.provider.AbstractScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.command.GitCommand;
-import org.apache.maven.scm.provider.git.command.info.GitInfoScmResult;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.scm.repository.UnknownRepositoryStructure;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* SCM Provider for git
*
@@ -303,12 +303,12 @@ public abstract class AbstractGitScmProv
protected abstract GitCommand getInfoCommand();
-public GitInfoScmResult info( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
+public InfoScmResult info( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
GitCommand cmd = getInfoCommand();
-return (GitInfoScmResult) executeCommand( cmd, repository, fileSet,
parameters );
+return (InfoScmResult) executeCommand( cmd, repository, fileSet,
parameters );
}
/** {@inheritDoc} */
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider
svn commit: r1063530 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/info/ maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/
Author: olamy
Date: Tue Jan 25 23:53:11 2011
New Revision: 1063530
URL: http://svn.apache.org/viewvc?rev=1063530&view=rev
Log:
move some duplicate code in a common place
Added:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java
- copied, changed from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
- copied, changed from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
Copied:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java
(from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java)
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java?p2=maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java&p1=maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java&r1=1062063&r2=1063530&rev=1063530&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java
Tue Jan 25 23:53:11 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.scm.provider.git.command.info;
+package org.apache.maven.scm.command.info;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,11 @@ package org.apache.maven.scm.provider.gi
/**
* @author mailto:ken...@apache.org";>Kenney Westerhof
+ * @author Olivier Lamy
* @version $Id$
+ * @since 1.5
*/
-public class GitInfoItem
+public class InfoItem
{
private String path;
Copied:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
(from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java)
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java?p2=maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java&p1=maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java&r1=1062063&r2=1063530&rev=1063530&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
Tue Jan 25 23:53:11 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.scm.provider.svn.command.info;
+package org.apache.maven.scm.command.info;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,37 +26,43 @@ import java.util.List;
/**
* @author mailto:ken...@apache.org";>Kenney Westerhof
+ * @author Olivier Lamy
* @version $Id$
*/
-public class SvnInfoScmResult
+public class InfoScmResult
extends ScmResult
{
private static final long serialVersionUID = 955993340040530451L;
-private List infoItems;
+private List infoItems;
-public SvnInfoScmResult( String commandLine, St
svn commit: r1062063 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src: main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java test/resources/diff-vvt.xml
Author: olamy
Date: Fri Jan 21 22:45:36 2011
New Revision: 1062063
URL: http://svn.apache.org/viewvc?rev=1062063&view=rev
Log:
[SCM-597] NPE in AccuRev provider changelog
Submitted by Grant Gardner
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.xml
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.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/cli/DiffConsumer.java?rev=1062063&r1=1062062&r2=1062063&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
Fri Jan 21 22:45:36 2011
@@ -47,12 +47,12 @@ public class DiffConsumer
{
currentDifference = new FileDifference();
}
-else if ( "Stream2".equals( tagName ) )
+else if ( "Stream2".equals( tagName ) && attributes.get( "Name" ) !=
null)
{
currentDifference.setElementId( Long.parseLong( attributes.get(
"eid" ) ) );
currentDifference.setNewVersion( attributes.get( "Name" ),
attributes.get( "Version" ) );
}
-else if ( "Stream1".equals( tagName ) )
+else if ( "Stream1".equals( tagName ) && attributes.get( "Name" ) !=
null )
{
currentDifference.setElementId( Long.parseLong( attributes.get(
"eid" ) ) );
currentDifference.setOldVersion( attributes.get( "Name" ),
attributes.get( "Version" ) );
@@ -66,7 +66,9 @@ public class DiffConsumer
String tagName = getTagName( tagPath );
if ( "Element".equals( tagName ) )
{
-results.add( currentDifference );
+if (currentDifference.getNewFile() != null ||
currentDifference.getOldFile() != null) {
+results.add( currentDifference );
+}
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.xml?rev=1062063&r1=1062062&r2=1062063&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.xml
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/resources/diff-vvt.xml
Fri Jan 21 22:45:36 2011
@@ -43,6 +43,13 @@
IsDir="no"
elemType="text"/>
+
+
+
+
svn commit: r1061562 - /maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
Author: olamy Date: Thu Jan 20 23:11:33 2011 New Revision: 1061562 URL: http://svn.apache.org/viewvc?rev=1061562&view=rev Log: test to see if it fix test on hudson Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=1061562&r1=1061561&r2=1061562&view=diff == --- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Thu Jan 20 23:11:33 2011 @@ -126,12 +126,12 @@ public abstract class UpdateCommandTckTe ScmManager scmManager = getScmManager(); -Date lastUpdate = new Date( System.currentTimeMillis() - 10 ); - -Thread.sleep( 2000 ); +Date lastUpdate = new Date( System.currentTimeMillis() - 100 ); commit( getWorkingCopy(), repository ); +Thread.sleep( 5000 ); + // -- // Update the project // --
svn commit: r1061548 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg: HgScmProvider.java command/inventory/HgListCommand.java
Author: olamy
Date: Thu Jan 20 22:28:27 2011
New Revision: 1061548
URL: http://svn.apache.org/viewvc?rev=1061548&view=rev
Log:
[SCM-596] Implements List command for mercurial provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1061548&r1=1061547&r2=1061548&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Thu Jan 20 22:28:27 2011
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.command.blame.BlameScmResult;
import org.apache.maven.scm.command.branch.BranchScmResult;
@@ -33,6 +34,7 @@ import org.apache.maven.scm.command.chan
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.diff.DiffScmResult;
+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;
@@ -46,11 +48,13 @@ import org.apache.maven.scm.provider.hg.
import org.apache.maven.scm.provider.hg.command.checkin.HgCheckInCommand;
import org.apache.maven.scm.provider.hg.command.checkout.HgCheckOutCommand;
import org.apache.maven.scm.provider.hg.command.diff.HgDiffCommand;
+import org.apache.maven.scm.provider.hg.command.inventory.HgListCommand;
import org.apache.maven.scm.provider.hg.command.remove.HgRemoveCommand;
import org.apache.maven.scm.provider.hg.command.status.HgStatusCommand;
import org.apache.maven.scm.provider.hg.command.tag.HgTagCommand;
import org.apache.maven.scm.provider.hg.command.update.HgUpdateCommand;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.scm.repository.UnknownRepositoryStructure;
@@ -311,4 +315,18 @@ public class HgScmProvider
return (BranchScmResult) command.execute( repository, fileSet,
parameters );
}
+
+/**
+ * @since 1.5
+ * {@inheritDoc}
+ */
+@Override
+protected ListScmResult list( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
+throws ScmException
+{
+HgListCommand hgListCommand = new HgListCommand();
+hgListCommand.setLogger( getLogger() );
+return (ListScmResult) hgListCommand.executeCommand( repository,
fileSet, parameters );
+
+}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java?rev=1061548&r1=1061547&r2=1061548&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
Thu Jan 20 22:28:27 2011
@@ -48,18 +48,14 @@ public class HgListCommand
throws ScmException
{
-if ( fileSet.getFileList().size() != 0 )
-{
-throw new ScmException( "This provider doesn't support listing
subsets of a directory" );
-}
//
File workingDir = fileSet.getBasedir();
// build the command
-String[] listCmd = new String[] { HgCommandConstants.STATUS_CMD,
HgCommandConstants.ALL_OPTION };
+String[] listCmd = new String[] { HgCommandConstants.INVENTORY_CMD };
// keep the command about in string form for reporting
-
svn commit: r1061024 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src: main/java/org/apache/maven/scm/provider/hg/ main/java/org/apache/maven/scm/provider/hg/command/ main/java/org/
Author: olamy
Date: Wed Jan 19 21:54:37 2011
New Revision: 1061024
URL: http://svn.apache.org/viewvc?rev=1061024&view=rev
Log:
[SCM-587] Branch support for Mercurial (hg) SCM provider
Submitted by Henning Schmiedehausen
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/HgBranchCommand.java
(with props)
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1061024&r1=1061023&r2=1061024&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Wed Jan 19 21:54:37 2011
@@ -28,6 +28,7 @@ import org.apache.maven.scm.ScmException
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.command.blame.BlameScmResult;
+import org.apache.maven.scm.command.branch.BranchScmResult;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
@@ -40,6 +41,7 @@ import org.apache.maven.scm.provider.Abs
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.command.add.HgAddCommand;
import org.apache.maven.scm.provider.hg.command.blame.HgBlameCommand;
+import org.apache.maven.scm.provider.hg.command.branch.HgBranchCommand;
import org.apache.maven.scm.provider.hg.command.changelog.HgChangeLogCommand;
import org.apache.maven.scm.provider.hg.command.checkin.HgCheckInCommand;
import org.apache.maven.scm.provider.hg.command.checkout.HgCheckOutCommand;
@@ -298,4 +300,15 @@ public class HgScmProvider
return (BlameScmResult) command.execute( repository, fileSet,
parameters );
}
+
+/** {@inheritDoc} */
+public BranchScmResult branch( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
+throws ScmException
+{
+HgBranchCommand command = new HgBranchCommand();
+
+command.setLogger( getLogger() );
+
+return (BranchScmResult) command.execute( repository, fileSet,
parameters );
+}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java?rev=1061024&r1=1061023&r2=1061024&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
Wed Jan 19 21:54:37 2011
@@ -59,7 +59,12 @@ public class HgCommandConstants
/**
* Create a new copy of a branch. Alias get or clone
*/
-public static final String BRANCH_CMD = "clone";
+public static final String CLONE_CMD = "clone";
+
+/**
+ * Create a new branch in the repo.
+ */
+public static final String BRANCH_CMD = "branch";
/**
* Commit changes into a new revision
@@ -133,5 +138,7 @@ public class HgCommandConstants
public static final String ALL_OPTION = "-A";
+public static final String NEW_BRANCH_OPTION = "--new-branch";
+
}
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/HgBranchCommand.java
URL:
http://svn.apache.org/viewvc/mave
svn commit: r1061018 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.j
Author: olamy
Date: Wed Jan 19 21:47:06 2011
New Revision: 1061018
URL: http://svn.apache.org/viewvc?rev=1061018&view=rev
Log:
[SCM-574] GitCheckInCommand fails on empty changed files list
Submitted by Andrey Paramonov
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java?rev=1061018&r1=1061017&r2=1061018&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
Wed Jan 19 21:47:06 2011
@@ -113,6 +113,11 @@ public class GitCheckInCommand
"track)" );
}
}
+
+if ( statusConsumer.getChangedFiles().isEmpty() )
+{
+return new CheckInScmResult( null,
statusConsumer.getChangedFiles() );
+}
Commandline clCommit = createCommitCommandLine( repository,
fileSet, messageFile );
svn propchange: r1059276 - svn:log
Author: olamy Revision: 1059276 Modified property: svn:log Modified: svn:log at Sat Jan 15 09:25:33 2011 -- --- svn:log (original) +++ svn:log Sat Jan 15 09:25:33 2011 @@ -1 +1,2 @@ [SCM-588] Filehandle leak in AccuRev provider +Submitted by Grant Gardner
svn commit: r1059276 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli: AccuRevCommandLine.java XppStreamConsumer.java
Author: olamy
Date: Sat Jan 15 09:22:32 2011
New Revision: 1059276
URL: http://svn.apache.org/viewvc?rev=1059276&view=rev
Log:
[SCM-588] Filehandle leak in AccuRev provider
Modified:
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
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.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/cli/AccuRevCommandLine.java?rev=1059276&r1=1059275&r2=1059276&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
Sat Jan 15 09:22:32 2011
@@ -61,12 +61,12 @@ public class AccuRevCommandLine
private Commandline cl = new Commandline();
-private StreamConsumer systemErr;
-
private StringBuffer commandLines = new StringBuffer();
private StringBuffer errorOutput = new StringBuffer();
+private StreamConsumer systemErr;
+
private String[] hostArgs = EMPTY_STRING_ARRAY;
private String[] authArgs = EMPTY_STRING_ARRAY;
@@ -247,6 +247,7 @@ public class AccuRevCommandLine
cl = new Commandline();
commandLines = new StringBuffer();
errorOutput = new StringBuffer();
+systemErr = new ErrorConsumer( getLogger(), errorOutput );
cl.getShell().setQuotedArgumentsEnabled( true );
cl.setExecutable( executable );
@@ -377,9 +378,7 @@ public class AccuRevCommandLine
public void setLogger( ScmLogger logger )
{
-
this.logger = logger;
-this.systemErr = new ErrorConsumer( logger, errorOutput );
}
public ScmLogger getLogger()
@@ -572,11 +571,11 @@ public class AccuRevCommandLine
{
popArgs = new String[] { "pop", "-v", versionSpec, "-L",
basedir.getAbsolutePath(), "-R" };
}
-else //this will BARF for pre 4.9.0, but clients are expected to check
AccuRevCapability before calling.
+else
+// this will BARF for pre 4.9.0, but clients are expected to check
AccuRevCapability before calling.
{
popArgs = new String[] { "pop", "-v", versionSpec, "-L",
basedir.getAbsolutePath(), "-t", tranSpec, "-R" };
}
-
List poppedFiles = new ArrayList();
return executeCommandLine( basedir, popArgs, elements,
FileConsumer.POPULATE_PATTERN, poppedFiles ) ? poppedFiles
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/XppStreamConsumer.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/cli/XppStreamConsumer.java?rev=1059276&r1=1059275&r2=1059276&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/XppStreamConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/XppStreamConsumer.java
Sat Jan 15 09:22:32 2011
@@ -20,6 +20,7 @@ package org.apache.maven.scm.provider.ac
*/
import java.io.IOException;
+import java.io.Reader;
import java.io.Writer;
import java.nio.channels.Channels;
import java.nio.channels.Pipe;
@@ -63,6 +64,8 @@ public abstract class XppStreamConsumer
private int lineCount = 0;
+private Reader reader;
+
public XppStreamConsumer( ScmLogger logger )
{
@@ -73,9 +76,10 @@ public abstract class XppStreamConsumer
Pipe p = Pipe.open();
SinkChannel sink = p.sink();
SourceChannel source = p.source();
-
writer = Channels.newWriter( sink, Charset.defaultCharset().name()
);
-parser.setInput( Channels.newReader( source,
Charset.defaultCharset().name() ) );
+reader = Channels.newReader( source,
Charset.defaultCharset().name() );
+parser.setInput( reader );
+
}
catch ( Exception e )
{
@@ -121,6 +125,16 @@ public abstract class XppStreamConsumer
{
synchroniz
svn commit: r1058921 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java
Author: olamy Date: Fri Jan 14 10:04:00 2011 New Revision: 1058921 URL: http://svn.apache.org/viewvc?rev=1058921&view=rev Log: fix junit Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java?rev=1058921&r1=1058920&r2=1058921&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java Fri Jan 14 10:04:00 2011 @@ -64,7 +64,7 @@ public class StarteamStatusConsumerTest s = in.readLine(); } -assertEquals( "Wrong number of entries returned", 4, consumer.getChangedFiles() ); +assertEquals( "Wrong number of entries returned", 4, consumer.getChangedFiles().size() ); // TODO add more validation to the entries }
svn commit: r1058914 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
Author: olamy
Date: Fri Jan 14 09:40:27 2011
New Revision: 1058914
URL: http://svn.apache.org/viewvc?rev=1058914&view=rev
Log:
NPE free
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java?rev=1058914&r1=1058913&r2=1058914&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
Fri Jan 14 09:40:27 2011
@@ -63,6 +63,10 @@ public class StarteamCommandLineUtils
private static Commandline addCommandlineArguments( Commandline cl,
List args )
{
+if ( args == null )
+{
+ return cl;
+}
for ( String arg : args )
{
cl.createArg().setValue( arg );
svn commit: r1058791 - in /maven/scm/trunk/maven-scm-test/src: main/java/org/apache/maven/scm/ main/java/org/apache/maven/scm/manager/ main/java/org/apache/maven/scm/provider/ main/java/org/apache/mav
Author: olamy
Date: Thu Jan 13 23:18:20 2011
New Revision: 1058791
URL: http://svn.apache.org/viewvc?rev=1058791&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in scm test
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/list/ListCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/test/java/org/apache/maven/scm/manager/ScmManagerStubTest.java
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java?rev=1058791&r1=1058790&r2=1058791&view=diff
==
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTckTestCase.java
Thu Jan 13 23:18:20 2011
@@ -54,7 +54,7 @@ public abstract class ScmTckTestCase
{
private ScmRepository scmRepository;
-private List scmFileNames;
+private List scmFileNames;
/**
* @return A provider spesific and valid url for the repository
@@ -76,7 +76,7 @@ public abstract class ScmTckTestCase
*
* @return {@link List} of {@link String} objects
*/
-protected List getScmFileNames()
+protected List getScmFileNames()
{
return scmFileNames;
}
@@ -108,16 +108,16 @@ public abstract class ScmTckTestCase
checkOut( getWorkingCopy(), getScmRepository() );
-scmFileNames = new ArrayList( 4 );
+scmFileNames = new ArrayList( 4 );
scmFileNames.add( "/pom.xml" );
scmFileNames.add( "/readme.txt" );
scmFileNames.add( "/src/main/java/Application.java" );
scmFileNames.add( "/src/test/java/Test.java" );
-Iterator it = getScmFileNames().iterator();
+Iterator it = getScmFileNames().iterator();
while ( it.hasNext() )
{
-assertFile( getWorkingCopy(), (String) it.next() );
+assertFile( getWorkingCopy(), it.next() );
}
}
@@ -160,7 +160,7 @@ public abstract class ScmTckTestCase
assertTrue( "Check result was successful, output: " +
result.getCommandOutput(), result.isSuccess() );
-List addedFiles = result.getAddedFiles();
+List addedFiles = result.getAddedFiles();
if ( new File( workingDirectory, file.getPath() ).isFile() )
{
@@ -181,15 +181,15 @@ public abstract class ScmTckTestCase
* @param files List with {@code ScmFile}s
* @return Map key=pathName, value=ScmFile
*/
-protected Map/**/ mapFilesByPath( List/**/ files
)
+protected Map mapFilesByPath( List files )
{
if ( files == null )
{
return null;
}
-Map mappedFiles = new TreeMap();
-Iterator it = files.iterator();
+Map mappedFiles = new TreeMap();
+Iterator it = files.iterator();
while ( it.hasNext() )
{
ScmFile scmFile = (ScmFile) it.next();
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java?rev=1058791&r1=1058790&r2=1058791&view=diff
==
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Thu Jan 13 23:18:20 2011
@@ -230,7
svn commit: r1058790 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src: main/java/org/apache/maven/scm/provider/vss/commands/ main/java/org/apache/maven/scm/provider/vss/commands/ch
Author: olamy
Date: Thu Jan 13 23:17:47 2011
New Revision: 1058790
URL: http://svn.apache.org/viewvc?rev=1058790&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in vss provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java?rev=1058790&r1=1058789&r2=1058790&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
Thu Jan 13 23:17:47 2011
@@ -51,11 +51,11 @@ public class VssCommandLineUtils
public static void addFiles( Commandline cl, ScmFileSet fileSet )
{
-Iterator it = fileSet.getFileList().iterator();
+Iterator it = fileSet.getFileList().iterator();
while ( it.hasNext() )
{
-File file = (File) it.next();
+File file = it.next();
cl.createArg().setValue( file.getPath().replace( '\\', '/' ) );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java?rev=1058790&r1=1058789&r2=1058790&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInConsumer.java
Thu Jan 13 23:17:47 2011
@@ -97,7 +97,7 @@ public class VssCheckInConsumer
private String currentPath = "";
-private List updatedFiles = new ArrayList();
+private List updatedFiles = new ArrayList();
private VssScmProviderRepository repo;
@@ -210,7 +210,7 @@ public class VssCheckInConsumer
return argument;
}
-public List getUpdatedFiles()
+public List getUpdatedFiles()
{
return updatedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java?rev=1058790&r1=1058789&r2=1058790&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommandTest.java
Thu Jan 13 23:17:47 2011
@@ -19,6 +19,10 @@ package org.apache.maven.scm.provider.vs
* under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.manager.ScmManager;
@@ -28,10 +32,6 @@ import org.apache.maven.scm.repository.S
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
/**
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
* @version $Id$
@@ -56,8 +56,8 @@ public class VssEditCommandTest
.makeScmRepository( "scm:vss|username|password@C:/Program
File/Visual Source Safe|D:/myProject" );
ScmFileSet fileSet = new ScmFileSet( getTestFile( "target" ) );
VssEditCommand command = new VssEditCommand();
-List commands = command.buildCmdLine(
svn commit: r1058777 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src: main/java/org/apache/maven/scm/provider/tfs/command/ test/java/org/apache/maven/scm/provider/tfs/command/
Author: olamy
Date: Thu Jan 13 22:53:30 2011
New Revision: 1058777
URL: http://svn.apache.org/viewvc?rev=1058777&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in tfs provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java?rev=1058777&r1=1058776&r2=1058777&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCommand.java
Thu Jan 13 22:53:30 2011
@@ -63,7 +63,7 @@ public class TfsCommand
public void addArgument( ScmFileSet f )
{
info( "files: " + f.getBasedir().getAbsolutePath() );
-Iterator iter = f.getFileList().iterator();
+Iterator iter = f.getFileList().iterator();
while ( iter.hasNext() )
{
command.createArg().setValue( ( (File) iter.next() ).getPath() );
@@ -97,9 +97,9 @@ public class TfsCommand
if ( out instanceof FileListConsumer )
{
FileListConsumer f = (FileListConsumer) out;
-for ( Iterator i = f.getFiles().iterator(); i.hasNext(); )
+for ( Iterator i = f.getFiles().iterator(); i.hasNext(); )
{
-ScmFile file = (ScmFile) i.next();
+ScmFile file = i.next();
debug( file.getPath() );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java?rev=1058777&r1=1058776&r2=1058777&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
Thu Jan 13 22:53:30 2011
@@ -38,9 +38,9 @@ public class TfsCommandTest
protected String getFileList()
{
String path = "";
-for ( Iterator i = getScmFileSet().getFileList().iterator();
i.hasNext(); )
+for ( Iterator i = getScmFileSet().getFileList().iterator();
i.hasNext(); )
{
-File f = (File) i.next();
+File f = i.next();
path += f.getName() + " ";
}
return path.trim();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java?rev=1058777&r1=1058776&r2=1058777&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommandTest.java
Thu Jan 13 22:53:30 2011
@@ -99,7 +99,7 @@ public class TfsStatusCommandTest
consumer.consumeLine( " File type: windows-1252" );
consumer.consumeLine( "" );
-List changedFiles = consumer.getChangedFiles();
+List changedFiles = consumer.getChangedFiles();
assertNotNull( changedFiles );
assertEquals( 4, changedFiles.size() );
assertTrue( changedFiles.contains( new ScmFile(
"C:\\temp\\maven\\c4\\.classpath", ScmFileStatus.MODIFIED ) ) );
@@ -129,7 +129,7 @@ public class TfsStatusCommandTest
consumer.consumeLine( " Local item: [SUBHASH-PC]
C:\\temp\\maven\\c4\\.project" );
consume
svn commit: r1058776 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src: main/java/org/apache/maven/scm/provider/synergy/util/ test/java/org/apache/maven/scm/provider/synergy/con
Author: olamy
Date: Thu Jan 13 22:53:04 2011
New Revision: 1058776
URL: http://svn.apache.org/viewvc?rev=1058776&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in synergy provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java?rev=1058776&r1=1058775&r2=1058776&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
Thu Jan 13 22:53:04 2011
@@ -192,7 +192,7 @@ public class SynergyCCM
* @return the command line.
* @throws ScmException
*/
-public static Commandline create( List files, String message, String
ccmAddr )
+public static Commandline create( List files, String message, String
ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -211,9 +211,9 @@ public class SynergyCCM
}
-for ( Iterator i = files.iterator(); i.hasNext(); )
+for ( Iterator i = files.iterator(); i.hasNext(); )
{
-File f = (File) i.next();
+File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -311,7 +311,7 @@ public class SynergyCCM
* @return
* @throws ScmException
*/
-public static Commandline delete( List files, String ccmAddr, boolean
replace )
+public static Commandline delete( List files, String ccmAddr,
boolean replace )
throws ScmException
{
Commandline cl = new Commandline();
@@ -326,9 +326,9 @@ public class SynergyCCM
cl.createArg().setValue( "-replace" );
}
-for ( Iterator i = files.iterator(); i.hasNext(); )
+for ( Iterator i = files.iterator(); i.hasNext(); )
{
-File f = (File) i.next();
+File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -508,7 +508,7 @@ public class SynergyCCM
* @return the command line.
* @throws ScmException
*/
-public static Commandline checkoutFiles( List files, String ccmAddr )
+public static Commandline checkoutFiles( List files, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
@@ -518,9 +518,9 @@ public class SynergyCCM
cl.setExecutable( CCM );
cl.createArg().setValue( CO );
-for ( Iterator i = files.iterator(); i.hasNext(); )
+for ( Iterator i = files.iterator(); i.hasNext(); )
{
-File f = (File) i.next();
+File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -649,9 +649,9 @@ public class SynergyCCM
if ( files.size() > 0 )
{
-for ( Iterator i = files.iterator(); i.hasNext(); )
+for ( Iterator i = files.iterator(); i.hasNext(); )
{
-File f = (File) i.next();
+File f = i.next();
try
{
cl.createArg().setValue( f.getCanonicalPath() );
@@ -747,7 +747,8 @@ public class SynergyCCM
{
Properties envVars = CommandLineUtils.getSystemEnvVars();
-for ( Iterator i = envVars.keySet().iterator(); i.hasNext(); )
+for ( @SuppressWarnings( "rawtypes" )
+Iterator i = envVars.keySet().iterator(); i.hasNext(); )
{
String key = (String) i.next();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/
svn commit: r1058775 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn: maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/ maven-scm-provider-svn-commons/s
Author: olamy
Date: Thu Jan 13 22:52:38 2011
New Revision: 1058775
URL: http://svn.apache.org/viewvc?rev=1058775&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in svn provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/IllegalOutputException.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/command/blame/SvnBlameCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
Thu Jan 13 22:52:38 2011
@@ -66,7 +66,7 @@ public abstract class AbstractSvnScmProv
private static class ScmUrlParserResult
{
-private List messages = new ArrayList();
+private List messages = new ArrayList();
private ScmProviderRepository repository;
}
@@ -129,9 +129,9 @@ public abstract class AbstractSvnScmProv
throws ScmException;
/** {@inheritDoc} */
-public List validateScmUrl( String scmSpecificUrl, char delimiter )
+public List validateScmUrl( String scmSpecificUrl, char delimiter )
{
-List messages = new ArrayList();
+List messages = new ArrayList();
try
{
makeProviderScmRepository( scmSpecificUrl, delimiter );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java?rev=1058775&r1=1058774&r2=1058775&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
Thu Jan 13 22:52:38 2011
@@ -36,18 +36,21 @@ import java.util.List;
public class SvnChangeSet
extends ChangeSet
{
+
+private static final long serialVersionUID = -4454710577968060741L;
+
public SvnChangeSet()
{
super();
}
public SvnChangeSet( String strDate, String userDatePattern, String
comment, String author,
- List/**/files )
+ List files )
{
super( strDate, userDatePattern, comment, author, files );
}
-public Svn
svn commit: r1058774 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src: main/java/org/apache/maven/scm/provider/starteam/ main/java/org/apache/maven/scm/provider/starteam/comma
Author: olamy
Date: Thu Jan 13 22:51:51 2011
New Revision: 1058774
URL: http://svn.apache.org/viewvc?rev=1058774&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in starteam provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/edit/StarteamEditConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java?rev=1058774&r1=1058773&r2=1058774&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/StarteamScmProvider.java
Thu Jan 13 22:51:51 2011
@@ -19,6 +19,11 @@ package org.apache.maven.scm.provider.st
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -50,10 +55,6 @@ import org.apache.maven.scm.provider.sta
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
* @version $Id$
@@ -321,21 +322,27 @@ public class StarteamScmProvider
throws ScmException
{
ScmFileSet newFileSet = null;
+
try
{
File basedir = getAbsoluteFilePath( currentFileSet.getBasedir() );
-File[] files = currentFileSet.getFiles();
+List files = currentFileSet.getFileList();
-for ( int i = 0; i < files.length; ++i )
+List relPathFiles = new ArrayList(files.size());
+
+for ( File file : files )
{
-if ( files[i].isAbsolute() )
+if ( file.isAbsolute() )
{
-files[i] = new File( getRelativePath( basedir, files[i] )
);
+relPathFiles.add( new File( getRelativePath( basedir, file
) ));
+} else {
+relPathFiles.add( file );
}
+
}
-newFileSet = new ScmFileSet( basedir, Arrays.asList( files ) );
+newFileSet = new ScmFileSet( basedir, relPathFiles );
}
catch ( IOException e )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
URL:
h
svn commit: r1057940 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Author: olamy
Date: Tue Jan 11 23:45:48 2011
New Revision: 1057940
URL: http://svn.apache.org/viewvc?rev=1057940&view=rev
Log:
fix junit
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=1057940&r1=1057939&r2=1057940&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Tue Jan 11 23:45:48 2011
@@ -90,7 +90,7 @@ public class SvnTagCommand
throw new ScmException( "tag must be specified" );
}
-if ( fileSet.getFileList().isEmpty() )
+if ( !fileSet.getFileList().isEmpty() )
{
throw new ScmException( "This provider doesn't support tagging
subsets of a directory" );
}
svn commit: r1057938 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command: AbstractFileCheckingCon
Author: olamy
Date: Tue Jan 11 23:45:29 2011
New Revision: 1057938
URL: http://svn.apache.org/viewvc?rev=1057938&view=rev
Log:
fix junit
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java?rev=1057938&r1=1057937&r2=1057938&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
Tue Jan 11 23:45:29 2011
@@ -21,6 +21,7 @@ package org.apache.maven.scm.provider.sv
import java.io.File;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.maven.scm.ScmFile;
@@ -74,13 +75,13 @@ public abstract class AbstractFileChecki
if ( !filtered )
{
-for ( ScmFile file : files )
+for ( Iterator ite = files.iterator(); ite.hasNext(); )
{
-
+ScmFile file = ite.next();
if ( !file.getStatus().equals( ScmFileStatus.DELETED )
&& !new File( workingDirectory, file.getPath() ).isFile() )
{
-files.remove( file );
+ite.remove();
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java?rev=1057938&r1=1057937&r2=1057938&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
Tue Jan 11 23:45:29 2011
@@ -64,7 +64,7 @@ public class SvnBranchCommand
throw new ScmException( "branch name must be specified" );
}
-if ( fileSet.getFileList().isEmpty() )
+if ( !fileSet.getFileList().isEmpty() )
{
throw new ScmException( "This provider doesn't support branching
subsets of a directory" );
}
svn commit: r1057019 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src: main/java/org/apache/maven/scm/provider/perforce/ main/java/org/apache/maven/scm/provider/perforce/comma
Author: olamy
Date: Sun Jan 9 20:13:07 2011
New Revision: 1057019
URL: http://svn.apache.org/viewvc?rev=1057019&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in perforce provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceFilelogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceHaveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceDescribeConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?rev=1057019&r1=1057018&r2=1057019&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
Sun Jan 9 20:13:07 2011
@@ -20,8 +20,14 @@ package org.apache.maven.scm.provider.pe
*/
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
import org.apache.maven.scm.CommandParameters;
-import org.apache.maven.scm.NoSuchCommandScmException;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.add.AddScmResult;
@@ -60,13 +66,6 @@ import org.apache.maven.scm.repository.S
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
* @author mperham
@@ -509,6 +508,7 @@ public class PerforceScmProvider
command.setExecutable( "p4" );
Process proc = command.execute();
BufferedReader br = new BufferedReader( new
InputStreamReader( proc.getInputStream() ) );
+@SuppressWarnings( "unused" )
String line;
while ( ( line = br.readLine() ) != null )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java?rev=1057019&r1=1057018&r2=1057019&view=diff
=
svn commit: r1057018 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src: main/java/org/apache/maven/scm/provider/local/command/checkout/ main/java/org/apache/maven/scm/provider/loc
Author: olamy
Date: Sun Jan 9 20:12:29 2011
New Revision: 1057018
URL: http://svn.apache.org/viewvc?rev=1057018&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in local provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java?rev=1057018&r1=1057017&r2=1057018&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutScmResult.java
Sun Jan 9 20:12:29 2011
@@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.lo
* under the License.
*/
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.command.checkout.CheckOutScmResult;
+
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
* @version $Id$
@@ -30,7 +31,9 @@ import java.util.List;
public class LocalCheckOutScmResult
extends CheckOutScmResult
{
-public LocalCheckOutScmResult( String commandLine, List files )
+private static final long serialVersionUID = -2646018573623668026L;
+
+public LocalCheckOutScmResult( String commandLine, List files )
{
super( commandLine, files );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java?rev=1057018&r1=1057017&r2=1057018&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java
Sun Jan 9 20:12:29 2011
@@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.lo
* under the License.
*/
-import org.apache.maven.scm.command.list.ListScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.command.list.ListScmResult;
+
/**
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
* @version $Id$
@@ -30,7 +31,10 @@ import java.util.List;
public class LocalListScmResult
extends ListScmResult
{
-public LocalListScmResult( String commandLine, List files )
+
+private static final long serialVersionUID = 259954569217343901L;
+
+public LocalListScmResult( String commandLine, List files )
{
super( commandLine, files );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateScmResult.java?rev=1057018&r1=1057017&r2=1057018&view=diff
==
---
maven/scm/trunk/maven-scm-pro
svn commit: r1057017 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src: main/java/org/apache/maven/scm/provider/hg/ main/java/org/apache/maven/scm/provider/hg/command/ main/java/org/
Author: olamy
Date: Sun Jan 9 20:11:55 2011
New Revision: 1057017
URL: http://svn.apache.org/viewvc?rev=1057017&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in hg provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgChangeSet.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=1057017&r1=1057016&r2=1057017&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Sun Jan 9 20:11:55 2011
@@ -72,7 +72,7 @@ public class HgScmProvider
private static class HgUrlParserResult
{
-private List messages = new ArrayList();
+private List messages = new ArrayList();
private ScmProviderRepository repository;
}
@@ -132,9 +132,8 @@ public class HgScmProvider
{
try
{
-
+@SuppressWarnings( "unused" )
File file = new File( url );
-
}
catch ( Throwable e )
{
@@ -170,7 +169,7 @@ public class HgScmProvider
}
/** {...@inheritdoc} */
-public List validateScmUrl( String scmSpecificUrl, char delimiter )
+public List validateScmUrl( String scmSpecificUrl, char delimiter )
{
HgUrlParserResult result = parseScmUrl( scmSpecificUrl );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=1057017&r1=1057016&r2=1057017&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Sun Jan 9 20:11:55 2011
@@ -51,12 +51,12 @@ public class HgUtils
/**
* Map between command and its valid exit codes
*/
-private static final Map EXIT_CODE_MAP = new HashMap();
+private static final Map> EXIT_CODE_MAP = new
HashMap>();
/**
* Default exit codes for entries not in exitCodeMap
*/
-private static final List DEFAULT_EXIT_CODES = new ArrayList();
+private static final List DEFAULT_EXIT_CODES = new
ArrayList();
/** Setup exit codes*/
static
@@ -64,13 +64,13 @@ public class HgUtils
DEFAULT_EXIT_CODES.add( new Integer( 0 ) );
//Diff is different
-List diffExitCodes = new ArrayList();
-diffExitCodes.add( new Integer( 0 ) ); //No difference
-diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or
changes in diff-like
-diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes
+List diffExitCodes = new ArrayList( 3 );
+diffExitCodes.add( Integer.valueOf( 0 ) ); //No difference
+diffExitCodes.add( Integer.valueOf( 1 ) ); //Conflicts in merge-like
or changes in diff-like
+diffExitCodes.add( Integer.valueOf( 2 ) ); //Unrepresentable diff
changes
EXIT_CODE_MAP.put( HgCommandConstants.DIFF_CMD, diffExitCodes );
//Outgoing is different
-List outgoingExitCodes = new ArrayList( );
+List outgoingExitCodes = new Ar
svn commit: r1057016 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git: maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/ maven-scm-provider-git-commons/s
Author: olamy
Date: Sun Jan 9 20:11:26 2011
New Revision: 1057016
URL: http://svn.apache.org/viewvc?rev=1057016&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in git provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitConfigFileReader.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
Sun Jan 9 20:11:26 2011
@@ -68,7 +68,7 @@ public abstract class AbstractGitScmProv
*/
private static class ScmUrlParserResult
{
-private List messages = new ArrayList();
+private List messages = new ArrayList();
private ScmProviderRepository repository;
}
@@ -139,9 +139,9 @@ public abstract class AbstractGitScmProv
throws ScmException;
/** {...@inheritdoc} */
-public List validateScmUrl( String scmSpecificUrl, char delimiter )
+public List validateScmUrl( String scmSpecificUrl, char delimiter )
{
-List messages = new ArrayList();
+List messages = new ArrayList();
try
{
makeProviderScmRepository( scmSpecificUrl, delimiter );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/a
svn commit: r1057015 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs: maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/ maven-scm-provider-cv
Author: olamy
Date: Sun Jan 9 20:10:42 2011
New Revision: 1057015
URL: http://svn.apache.org/viewvc?rev=1057015&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in cvs providers
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/CvsExeScmProviderTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java?rev=1057015&r1=1057014&r2=1057015&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
Sun Jan 9 20:10:42 2011
@@ -40,6 +40,7 @@ public class CvsCommandUtils
{
private CvsCommandUtils()
{
+// noop
}
public static boolean isCvsNT()
@@ -130,7 +131,7 @@ public class CvsCommandUtils
if ( settings.getCvsVariables().size() > 0 )
{
-for ( Enumeration e = settings.getCvsVariables().propertyNames();
e.hasMoreElements(); )
+for ( Enumeration e =
settings.getCvsVariables().propertyNames(); e.hasMoreElements(); )
{
String key = (String) e.nextElement();
String value = settings.getCvsVariables().getProperty( key );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java?rev=1057015&r1=1057014&r2=1057015&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
Sun Jan 9 20:10:42 2011
@@ -75,12 +75,12 @@ public class CvsChangeLogConsumerTest
s = in.readLine();
}
-Collection entries = command.getModifications();
+Collection entries = command.getModifications();
assertEquals( "Wrong number of entries returned", 3, entries.size() );
ChangeSet entry = null;
-for ( Iterator i = entries.iterator(); i.hasNext(); )
+for ( Iterator i = entries.iterator(); i.hasNext(); )
{
-entry = (ChangeSet) i.next();
+entry = i.next();
assertTrue( "ChangeLogEntry erroneously picked up",
entry.toString().indexOf( "ChangeLogEntry.java" ) ==
-1 );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
URL:
http://svn.ap
svn commit: r1057014 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src: main/java/org/apache/maven/scm/provider/clearcase/command/tag/ main/java/org/apache/maven/scm/provider/
Author: olamy
Date: Sun Jan 9 20:09:47 2011
New Revision: 1057014
URL: http://svn.apache.org/viewvc?rev=1057014&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in clearcase provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
Sun Jan 9 20:09:47 2011
@@ -36,7 +36,7 @@ public class ClearCaseTagConsumer
{
private ScmLogger logger;
-private List taggedFiles = new ArrayList();
+private List taggedFiles = new ArrayList();
// --
//
@@ -78,7 +78,7 @@ public class ClearCaseTagConsumer
//
// --
-public List getTaggedFiles()
+public List getTaggedFiles()
{
return taggedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
Sun Jan 9 20:09:47 2011
@@ -201,7 +201,6 @@ public class ClearCaseScmProviderReposit
throws UnknownHostException, MalformedURLException
{
int tokenNumber = tokenizer.countTokens();
-String directory;
if ( tokenNumber <= 2 )
{
throw new MalformedURLException( "ClearCaseUCM need more
parameters. Expected url format : "
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumerTest.java?rev=1057014&r1=1057013&r2=1057014&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/jav
svn commit: r1056993 - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-starteam/ maven-scm-providers-cvs/maven-scm-provider-cvs-commons/ maven-scm-providers-git/maven-scm-provider-git-comm
Author: olamy Date: Sun Jan 9 18:09:59 2011 New Revision: 1056993 URL: http://svn.apache.org/viewvc?rev=1056993&view=rev Log: [SCM-591] Move to Java 1.5 : configure modello to generate 1.5 generics Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml?rev=1056993&r1=1056992&r2=1056993&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/pom.xml Sun Jan 9 18:09:59 2011 @@ -63,6 +63,7 @@ 1.0.0 + true src/main/mdo/starteam-settings.mdo Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml?rev=1056993&r1=1056992&r2=1056993&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml Sun Jan 9 18:09:59 2011 @@ -63,6 +63,7 @@ 1.0.0 + true src/main/mdo/cvs-settings.mdo Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml?rev=1056993&r1=1056992&r2=1056993&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml Sun Jan 9 18:09:59 2011 @@ -57,6 +57,7 @@ 1.0.0 + true src/main/mdo/git-settings.mdo Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml?rev=1056993&r1=1056992&r2=1056993&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml Sun Jan 9 18:09:59 2011 @@ -50,6 +50,7 @@ 1.1.0 + true src/main/mdo/svn-settings.mdo
svn commit: r1056992 - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/ maven-scm-provider-bazaar/src/main/java/org/apache/maven/s
Author: olamy
Date: Sun Jan 9 18:09:41 2011
New Revision: 1056992
URL: http://svn.apache.org/viewvc?rev=1056992&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in bazaar provider
Modified:
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/BazaarConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
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/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java?rev=1056992&r1=1056991&r2=1056992&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
Sun Jan 9 18:09:41 2011
@@ -97,10 +97,10 @@ public class BazaarScmProvider
}
/** {...@inheritdoc} */
-public List validateScmUrl( String scmSpecificUrl, char delimiter )
+public List validateScmUrl( String scmSpecificUrl, char delimiter )
{
-List errorMessages = new ArrayList();
+List errorMessages = new ArrayList();
String[] checkCmd = new String[]{BazaarConstants.CHECK,
scmSpecificUrl};
ScmResult result;
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/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java?rev=1056992&r1=1056991&r2=1056992&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
Sun Jan 9 18:09:41 2011
@@ -48,12 +48,12 @@ public class BazaarUtils
/**
* Map between command and its valid exit codes
*/
-private static final Map EXITCODEMAP = new HashMap();
+private static final Map> EXITCODEMAP = new
HashMap>();
/**
* Default exit codes for entries not in exitCodeMap
*/
-private static final List DEFAULTEEXITCODES = new ArrayList();
+private static final List DEFAULTEEXITCODES = new
ArrayList();
/** Setup exit codes*/
static
@@ -61,10 +61,10 @@ public class BazaarUtils
DEFAULTEEXITCODES.add( new Integer( 0 ) );
//Diff is different
-List diffExitCodes = new ArrayList();
-diffExitCodes.add( new Integer( 0 ) ); //No difference
-diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or
changes in diff-like
-diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes
+List diffExitCodes = new ArrayList();
+diffExitCodes.add( Integer.valueOf( 0 ) ); //No difference
+diffExitCodes.add( Integer.valueOf( 1 ) ); //Conflicts in merge-like
or changes in diff-like
+diffExitCodes.add( Integer.valueOf( 2 ) ); //Unrepresentable diff
changes
EXITCODEMAP.put( BazaarConstants.DIFF_CMD, diffExitCodes );
}
@@ -84,10 +84,10 @@ public class BazaarUtils
int exitCode = executeCmd( consumer, cmd );
//Return result
-List exitCodes = DEFAULTEEXITCODES;
+List exitCodes = DEFAULTEEXITCODES;
if ( EXITCODEMAP.containsKey( cmdAndArgs[0] ) )
{
-exitCodes = (List) EXITCODEMAP.get( cmdAndArgs[0] );
+exitCodes = EXITCODEMAP.get( cmdAndArgs[0] );
}
boolean success = exitCodes.contains( new Integer( exitCode ) );
svn commit: r1056991 - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/ maven-scm-provider-clearcase/src/main/java/
Author: olamy
Date: Sun Jan 9 18:09:10 2011
New Revision: 1056991
URL: http://svn.apache.org/viewvc?rev=1056991&view=rev
Log:
[SCM-591] Move to Java 1.5 : status command
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/status/LocalStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ChangedFileConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusConsumer.java?rev=1056991&r1=1056990&r2=1056991&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusConsumer.java
Sun Jan 9 18:09:10 2011
@@ -35,7 +35,7 @@ import java.util.List;
class BazaarStatusConsumer
extends BazaarConsumer
{
-private final List repositoryStatus = new ArrayList();
+private final List repositoryStatus = new ArrayList();
private final File workingDir;
@@ -91,7 +91,7 @@ class BazaarStatusConsumer
}
}
-List getStatus()
+List getStatus()
{
return repositoryStatus;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java?rev=1056991&r1=1056990&r2=1056991&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java
Sun Jan 9 18:09:10 2011
@@ -39,7 +39,7 @@ public class ClearCaseStatusConsumer
private File workingDirectory;
-private List checkedOutFiles = new ArrayList();
+private List checkedOutFiles = new ArrayList();
// --
//
@@ -70,7 +70,7 @@ public class ClearCaseStatusConsumer
//
// --
-public List getCheckedOutFiles()
+public List getCheckedOutFiles()
{
return checkedOutFiles;
}
Modified:
maven/scm/trunk/maven-scm-pro
svn commit: r1056990 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src: main/java/org/apache/maven/scm/provider/accurev/command/add/ main/java/org/apache/maven/scm/provider/accu
Author: olamy Date: Sun Jan 9 18:07:29 2011 New Revision: 1056990 URL: http://svn.apache.org/viewvc?rev=1056990&view=rev Log: [SCM-591] Move to Java 1.5 : remove no more needed SuppressWarning Modified: 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/checkin/AccuRevCheckInCommand.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/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 Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommand.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/command/add/AccuRevAddCommand.java?rev=1056990&r1=1056989&r2=1056990&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommand.java Sun Jan 9 18:07:29 2011 @@ -51,7 +51,6 @@ public class AccuRevAddCommand * * @todo handle the "binary" parameter. AccuRev does a reasonable job of detecting this itself. */ -@SuppressWarnings( "unchecked" ) protected ScmResult executeAccurevCommand( AccuRevScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException, AccuRevException Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommand.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/command/checkin/AccuRevCheckInCommand.java?rev=1056990&r1=1056989&r2=1056990&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommand.java Sun Jan 9 18:07:29 2011 @@ -59,7 +59,6 @@ public class AccuRevCheckInCommand List promotedFiles = null; File basedir = fileSet.getBasedir(); -@SuppressWarnings( "unchecked" ) List fileList = fileSet.getFileList(); if ( fileList.isEmpty() ) Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommand.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/command/remove/AccuRevRemoveCommand.java?rev=1056990&r1=1056989&r2=1056990&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/remove/AccuRevRemoveCommand.java Sun Jan 9 18:07:29 2011 @@ -57,7 +57,6 @@ public class AccuRevRemoveCommand File basedir = fileSet.getBasedir(); -@SuppressWarnings( "unchecked" ) List relativeFiles = fileSet.getFileList(); final List removedFiles = accuRev.defunct( basedir, relativeFiles, message ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-provider
svn commit: r1056982 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
Author: olamy Date: Sun Jan 9 17:25:13 2011 New Revision: 1056982 URL: http://svn.apache.org/viewvc?rev=1056982&view=rev Log: [SCM-591] Move to Java 1.5 : in diff result use CharSequence rather than a direct implementation fix junit compilation Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java?rev=1056982&r1=1056981&r2=1056982&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java Sun Jan 9 17:25:13 2011 @@ -80,10 +80,10 @@ public class GitDiffConsumerTest testScmFile( (ScmFile) changedFiles.get( 0 ), "olamy.test", ScmFileStatus.MODIFIED ); -Map differences = consumer.getDifferences(); +Map differences = consumer.getDifferences(); assertNotNull( differences ); -StringBuilder readmeDiffs = differences.get( "olamy.test" ); +StringBuilder readmeDiffs = new StringBuilder( differences.get( "olamy.test" ) ); assertNotNull( readmeDiffs ); assertTrue( readmeDiffs.indexOf( "+new line" ) >= 0 ); } @@ -112,14 +112,14 @@ public class GitDiffConsumerTest testScmFile( changedFiles.get( 1 ), "test.txt", ScmFileStatus.MODIFIED ); -Map differences = consumer.getDifferences(); +Map differences = consumer.getDifferences(); assertNotNull( differences ); -StringBuilder addDiffs = differences.get( "pom.xml" ); +StringBuilder addDiffs = new StringBuilder( differences.get( "pom.xml" ) ); assertNotNull( addDiffs ); assertTrue( addDiffs.indexOf( "+ " ) >= 0 ); -addDiffs = differences.get( "test.txt" ); +addDiffs = new StringBuilder( differences.get( "test.txt" ) ); assertNotNull( addDiffs ); assertTrue( addDiffs.indexOf( "+maven-scm git provider works fine :-)" ) >= 0 ); }
svn commit: r1056981 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/ maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/s
Author: olamy
Date: Sun Jan 9 17:24:53 2011
New Revision: 1056981
URL: http://svn.apache.org/viewvc?rev=1056981&view=rev
Log:
[SCM-591] Move to Java 1.5 : in diff result use CharSequence rather than a
direct implementation
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java?rev=1056981&r1=1056980&r2=1056981&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
Sun Jan 9 17:24:53 2011
@@ -36,11 +36,11 @@ public class DiffScmResult
private List changedFiles;
-private Map differences;
+private Map differences;
private String patch;
-public DiffScmResult( String commandLine, List changedFiles,
Map differences, String patch )
+public DiffScmResult( String commandLine, List changedFiles,
Map differences, String patch )
{
this( commandLine, null, null, true );
this.changedFiles = changedFiles;
@@ -53,7 +53,7 @@ public class DiffScmResult
super( commandLine, providerMessage, commandOutput, success );
}
-public DiffScmResult( List changedFiles,
Map differences, String patch, ScmResult result )
+public DiffScmResult( List changedFiles, Map
differences, String patch, ScmResult result )
{
super( result );
@@ -69,7 +69,7 @@ public class DiffScmResult
return changedFiles;
}
-public Map getDifferences()
+public Map getDifferences()
{
return differences;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java?rev=1056981&r1=1056980&r2=1056981&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
Sun Jan 9 17:24:53 2011
@@ -66,7 +66,7 @@ public class StarteamDiffConsumer
private List changedFiles = new ArrayList();
-private Map differences = new
HashMap();
+private Map differences = new
HashMap();
private StringBuffer patch = new StringBuffer();
@@ -205,7 +205,7 @@ public class StarteamDiffConsumer
return changedFiles;
}
-public Map getDifferences()
+public Map getDifferences()
{
return differences;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java?rev=1056981&r1=1056980&r2=1056981&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
Sun Jan 9 17:24:53 2011
@@ -82,9 +82,9 @@ public class CvsDiffConsumer
private List change
svn commit: r1056980 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/update/ maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/b
Author: olamy
Date: Sun Jan 9 17:23:55 2011
New Revision: 1056980
URL: http://svn.apache.org/viewvc?rev=1056980&view=rev
Log:
[SCM-591] Move to Java 1.5 : update command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.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/update/BazaarUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/pom.xml
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?rev=1056980&r1=1056979&r2=1056980&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
Sun Jan 9 17:23:55 2011
@@ -62,7 +62,7 @@ public abstract class AbstractUpdateComm
UpdateScmResult updateScmResult = executeUpdateCommand( repository,
fileSet, scmVersion );
-List filesList = updateScmResult.getUpdatedFiles();
+List filesList = updateScmResult.getUpdatedFiles();
if ( !runChangelog )
{
@@ -76,7 +76,7 @@ public abstract class AbstractUpdateComm
ChangeLogScmResult changeLogScmResult =
(ChangeLogScmResult) changeLogCmd.executeCommand( repository,
fileSet, parameters );
-List changes = new ArrayList();
+List changes = new ArrayList();
ChangeLogSet changeLogSet = changeLogScmResult.getChangeLog();
@@ -93,9 +93,9 @@ public abstract class AbstractUpdateComm
//Do nothing, startDate isn't define.
}
-for ( Iterator i = changeLogSet.getChangeSets().iterator();
i.hasNext(); )
+for ( Iterator i =
changeLogSet.getChangeSets().iterator(); i.hasNext(); )
{
-ChangeSet change = (ChangeSet) i.next();
+ChangeSet change = i.next();
if ( startDate != null && change.getDate() != null )
{
@@ -105,11 +105,11 @@ public abstract class AbstractUpdateComm
}
}
-for ( Iterator j = filesList.iterator(); j.hasNext(); )
+for ( Iterator j = filesList.iterator();
j.hasNext(); )
{
-ScmFile currentFile = (ScmFile) j.next();
+ScmFile currentFile = j.next();
-
svn commit: r1056960 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/ maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provide
Author: olamy
Date: Sun Jan 9 15:03:50 2011
New Revision: 1056960
URL: http://svn.apache.org/viewvc?rev=1056960&view=rev
Log:
[SCM-591] Move to Java 1.5 : unedit command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
Sun Jan 9 15:03:50 2011
@@ -19,38 +19,41 @@ package org.apache.maven.scm.command.une
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
+ * @author Olivier Lamy
* @version $Id$
*/
public class UnEditScmResult
extends ScmResult
{
-private List unEditFiles;
+private static final long serialVersionUID = 257465331122587798L;
+private List unEditFiles;
public UnEditScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
-public UnEditScmResult( String commandLine, List unEditFiles )
+public UnEditScmResult( String commandLine, List unEditFiles )
{
super( commandLine, null, null, true );
this.unEditFiles = unEditFiles;
}
-public UnEditScmResult( List unEditFiles, ScmResult result )
+public UnEditScmResult( List unEditFiles, ScmResult result )
{
super( result );
this.unEditFiles = unEditFiles;
}
-public List getUnEditFiles()
+public List getUnEditFiles()
{
return unEditFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
Sun Jan 9 15:03:50 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.cl
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -31,10 +34,9 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-
/**
* @author mailto:wim.debla...@gmail.com";>Wim Deblauwe
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseUnEditCommand
@@ -95,10 +97,9 @@ public class ClearCaseUnEditCommand
command.createArg().setValue( "unco" );
command.createArg().setValue( "-kee
svn commit: r1056959 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/ maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/baza
Author: olamy
Date: Sun Jan 9 15:02:55 2011
New Revision: 1056959
URL: http://svn.apache.org/viewvc?rev=1056959&view=rev
Log:
[SCM-591] Move to Java 1.5 : tag command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/tag/LocalTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/tag/VssTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
Sun Jan 9 15:02:55 2011
@@ -19,39 +19,43 @@ package org.apache.maven.scm.command.tag
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
+ * @author Olivier Lamy
* @version $Id$
*/
public class TagScmResult
extends ScmResult
{
-private List taggedFiles;
+private static final long serialVersionUID = -5068975000282095635L;
+
+private List taggedFiles;
public TagScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
-public TagScmResult( String commandLine, List taggedFiles )
+public TagScmResult( String commandLine, List taggedFiles )
{
super( commandLine, null, null, true );
this.taggedFiles = taggedFiles;
}
-public TagScmResult( List taggedFiles, ScmResult result )
+public TagScmResult( List taggedFiles, ScmResult result )
{
super( result );
this.taggedFiles = taggedFiles;
}
-public List getTaggedFiles()
+public List getTaggedFiles()
{
return taggedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarLsConsumer.java?rev=1056959&r1=1056958&r2=1056959&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/
svn commit: r1056938 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/ maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/b
Author: olamy
Date: Sun Jan 9 14:27:54 2011
New Revision: 1056938
URL: http://svn.apache.org/viewvc?rev=1056938&view=rev
Log:
[SCM-591] Move to Java 1.5 : remove command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.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-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/AbstractCvsRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/remove/CvsExeRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/remove/CvsJavaRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java?rev=1056938&r1=1056937&r2=1056938&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java
Sun Jan 9 14:27:54 2011
@@ -19,39 +19,43 @@ package org.apache.maven.scm.command.rem
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author mailto:br...@apache.org";>Brett Porter
+ * @author Olivier Lamy
* @version $Id$
*/
public class RemoveScmResult
extends ScmResult
{
-private List removedFiles;
+
+private static final long serialVersionUID = 8852310735079996771L;
+private List removedFiles;
public RemoveScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
-public RemoveScmResult( String commandLine, List removedFiles )
+public RemoveScmResult( String commandLine, List removedFiles )
{
super( commandLine, null, null, true );
this.removedFiles = removedFiles;
}
-public RemoveScmResult( List removedFiles, ScmResult result )
+public RemoveScmResult( List removedFiles, ScmResult result )
{
super( result );
this.removedFiles = removedFiles;
}
-public List getRemovedFiles()
+public List getRemovedFiles()
{
return removedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/
svn commit: r1056937 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/login/ maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/ maven-scm-providers/maven-sc
Author: olamy
Date: Sun Jan 9 14:26:04 2011
New Revision: 1056937
URL: http://svn.apache.org/viewvc?rev=1056937&view=rev
Log:
[SCM-591] Move to Java 1.5 : mkdir command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/LoginScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/mkdir/AbstractCvsMkdirCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/LoginScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/LoginScmResult.java?rev=1056937&r1=1056936&r2=1056937&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/LoginScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/LoginScmResult.java
Sun Jan 9 14:26:04 2011
@@ -28,6 +28,9 @@ import org.apache.maven.scm.ScmResult;
public class LoginScmResult
extends ScmResult
{
+
+private static final long serialVersionUID = -179242524702253809L;
+
public LoginScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java?rev=1056937&r1=1056936&r2=1056937&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/mkdir/MkdirScmResult.java
Sun Jan 9 14:26:04 2011
@@ -21,6 +21,7 @@ package org.apache.maven.scm.command.mkd
import java.util.List;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmResult;
/**
@@ -32,9 +33,12 @@ import org.apache.maven.scm.ScmResult;
public class MkdirScmResult
extends ScmResult
{
+
+private static final long serialVersionUID = -8717329738246682608L;
+
private String revision;
-private List createdDirs;
+private List createdDirs;
public MkdirScmResult( ScmResult scmResult )
{
@@ -53,7 +57,7 @@ public class MkdirScmResult
this.revision = revision;
}
-public MkdirScmResult( String commandLine, List createdDirs )
+public MkdirScmResult( String commandLine, List createdDirs )
{
this( commandLine, null, null, true );
@@ -67,7 +71,7 @@ public class MkdirScmResult
this.revision = revision;
}
-public MkdirScmResult( List createdDirs, ScmResult result )
+public MkdirScmResult( List createdDirs, ScmResult result )
{
super( result );
@@ -79,7 +83,7 @@ public class MkdirScmResult
return revision;
}
-public List getCreatedDirs()
+public List getCreatedDirs()
{
return createdDirs;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommand.java?rev=1056937&r1=1056936&r2=1056937&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/mkdir/LocalMkdirCommand.java
Sun Jan 9 14:26:04 2011
@@ -49,7 +49,7 @@ public class LocalMkdirCommand
throws ScmException
{
LocalScmProviderRepository repo = (LocalScmProviderRepository)
rep
svn commit: r1056932 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogComma
Author: olamy
Date: Sun Jan 9 13:45:51 2011
New Revision: 1056932
URL: http://svn.apache.org/viewvc?rev=1056932&view=rev
Log:
minor style formatting
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java?rev=1056932&r1=1056931&r2=1056932&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
Sun Jan 9 13:45:51 2011
@@ -182,7 +182,8 @@ public class SvnChangeLogCommand
}
}
-if (endVersion == null || !StringUtils.equals("BASE",
endVersion.getName())) {
+if (endVersion == null || !StringUtils.equals("BASE",
endVersion.getName()))
+{
cl.createArg().setValue( repository.getUrl() );
}
svn commit: r1056929 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src: main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/ test/java/or
Author: olamy
Date: Sun Jan 9 13:41:48 2011
New Revision: 1056929
URL: http://svn.apache.org/viewvc?rev=1056929&view=rev
Log:
[SCM-595] Allow to use BASE in revision range for changelog command
Submitted by Evgeny Mandrikov
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java?rev=1056929&r1=1056928&r2=1056929&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
Sun Jan 9 13:41:48 2011
@@ -182,7 +182,9 @@ public class SvnChangeLogCommand
}
}
-cl.createArg().setValue( repository.getUrl() );
+if (endVersion == null || !StringUtils.equals("BASE",
endVersion.getName())) {
+cl.createArg().setValue( repository.getUrl() );
+}
return cl;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java?rev=1056929&r1=1056928&r2=1056929&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
Sun Jan 9 13:41:48 2011
@@ -141,6 +141,13 @@ public class SvnChangeLogCommandTest
"svn --non-interactive log -v -r 1
http://foo.com/svn/trunk"; );
}
+public void testCommandLineWithBaseVersion()
+throws Exception
+{
+testCommandLine( "scm:svn:http://foo.com/svn/trunk";, new
ScmRevision("1"), new ScmRevision("BASE"),
+ "svn --non-interactive log -v -r 1:BASE" );
+}
+
// --
//
// --
@@ -171,7 +178,6 @@ public class SvnChangeLogCommandTest
Commandline cl = SvnChangeLogCommand.createCommandLine( svnRepository,
workingDirectory, null, null, null,
startVersion,
endVersion );
-
assertCommandLine( commandLine, workingDirectory, cl );
}
}
svn commit: r1055646 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ maven-scm-providers/maven-scm-pro
Author: olamy
Date: Wed Jan 5 21:22:58 2011
New Revision: 1055646
URL: http://svn.apache.org/viewvc?rev=1055646&view=rev
Log:
[SCM-591] move to java 1.5 . list command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java?rev=1055646&r1=1055645&r2=1055646&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
Wed Jan 5 21:22:58 2011
@@ -19,11 +19,12 @@ package org.apache.maven.scm.command.lis
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* Result of {...@link
org.apache.maven.scm.provider.ScmProvider#list(org.apache.maven.scm.repository.ScmRepository,
* org.apache.maven.scm.ScmFileSet, boolean, org.apache.maven.scm.ScmVersion)}
operation
@@ -34,32 +35,32 @@ import java.util.List;
public class ListScmResult
extends ScmResult
{
-// XXX List of what?
-private List files;
+
+private static final long serialVersionUID = 5402161066844465281L;
+private List files;
public ListScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
-files = new ArrayList( 0 );
+files = new ArrayList( 0 );
}
-public ListScmResult( String commandLine, List/**/ files )
+public ListScmResult( String commandLine, List files )
{
super( commandLine, null, null, true );
this.files = files;
}
-public ListScmResult( List/**/ files, ScmResult result )
+public ListScmResult( List files, ScmResult result )
{
super( result );
this.files = files;
}
-// XXX List of what?
-public List/**/ getFiles()
+public List getFiles()
{
return files;
}
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java?rev=1055646&r1=1055645&r2=1055646&view=diff
==
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
Wed Jan 5 21:22:58 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.plugin;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -26,10 +29,6 @@ import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.repository.ScmRepository;
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-
/**
* Get the list of project files.
*
@@ -78,9 +77,8 @@ public class ListMojo
if
svn commit: r1055645 - in /maven/scm/trunk: maven-scm-api/src/test/java/org/apache/maven/scm/ maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ maven-scm-providers/mav
Author: olamy
Date: Wed Jan 5 21:21:57 2011
New Revision: 1055645
URL: http://svn.apache.org/viewvc?rev=1055645&view=rev
Log:
[SCM-591] fix some generics warnings
Modified:
maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
Modified:
maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java?rev=1055645&r1=1055644&r2=1055645&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
Wed Jan 5 21:21:57 2011
@@ -79,9 +79,9 @@ public class ScmFileSetTest
{
ScmFileSet fileSet = new ScmFileSet( new File( getBasedir(), "src" ),
"**/**", "**/exclude/**" );
-List files = fileSet.getFileList();
+List files = fileSet.getFileList();
-Iterator it = files.iterator();
+Iterator it = files.iterator();
while ( it.hasNext() )
{
File file = (File) it.next();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java?rev=1055645&r1=1055644&r2=1055645&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
Wed Jan 5 21:21:57 2011
@@ -40,6 +40,7 @@ public class ChangeSetMatcher
private Matcher> changeFilesMatcher;
+@SuppressWarnings( "unchecked" )
public ChangeSetMatcher( String comment, String... fileNames )
{
this.comment = comment;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java?rev=1055645&r1=1055644&r2=1055645&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AccuRevTckUtil.java
Wed Jan 5 21:21:57 2011
@@ -109,7 +109,6 @@ public class AccuRevTckUtil
initRepo();
}
-@SuppressWarnings( "unchecked" )
private void initRepo()
throws Exception
{
@@ -135,7 +134,7 @@ public class AccuRevTckUtil
* patch to fix this.
*/
-List scmFileNames = new ArrayList( 4 );
+List scmFileNames = new ArrayList( 4 );
scmFileNames.add( "/pom.xml" );
scmFileNames.add( "/readme.txt" );
scmFileNames.add( "/src/main/java/Application.java" );
svn commit: r1055644 - /maven/scm/trunk/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
Author: olamy
Date: Wed Jan 5 21:21:30 2011
New Revision: 1055644
URL: http://svn.apache.org/viewvc?rev=1055644&view=rev
Log:
[SCM-591] move to java 1.5 fix generics warnings in scm client
Modified:
maven/scm/trunk/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
Modified:
maven/scm/trunk/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java?rev=1055644&r1=1055643&r2=1055644&view=diff
==
---
maven/scm/trunk/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
(original)
+++
maven/scm/trunk/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
Wed Jan 5 21:21:30 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.client.cli;
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -37,10 +40,6 @@ import org.apache.maven.scm.repository.S
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
@@ -245,14 +244,12 @@ public class MavenScmCli
return;
}
-List checkedOutFiles = result.getCheckedOutFiles();
+List checkedOutFiles = result.getCheckedOutFiles();
System.out.println( "Checked out these files: " );
-for ( Iterator it = checkedOutFiles.iterator(); it.hasNext(); )
+for ( ScmFile file : checkedOutFiles )
{
-ScmFile file = (ScmFile) it.next();
-
System.out.println( " " + file.getPath() );
}
}
@@ -280,14 +277,12 @@ public class MavenScmCli
return;
}
-List checkedInFiles = result.getCheckedInFiles();
+List checkedInFiles = result.getCheckedInFiles();
System.out.println( "Checked in these files: " );
-for ( Iterator it = checkedInFiles.iterator(); it.hasNext(); )
+for ( ScmFile file : checkedInFiles )
{
-ScmFile file = (ScmFile) it.next();
-
System.out.println( " " + file.getPath() );
}
}
@@ -312,14 +307,12 @@ public class MavenScmCli
return;
}
-List updatedFiles = result.getUpdatedFiles();
+List updatedFiles = result.getUpdatedFiles();
System.out.println( "Updated these files: " );
-for ( Iterator it = updatedFiles.iterator(); it.hasNext(); )
+for ( ScmFile file : updatedFiles )
{
-ScmFile file = (ScmFile) it.next();
-
System.out.println( " " + file.getPath() );
}
}
svn commit: r1055643 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/or
Author: olamy
Date: Wed Jan 5 21:21:13 2011
New Revision: 1055643
URL: http://svn.apache.org/viewvc?rev=1055643&view=rev
Log:
[SCM-591] move to Java 1.5. export command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResultWithRevision.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResult.java?rev=1055643&r1=1055642&r2=1055643&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResult.java
Wed Jan 5 21:21:13 2011
@@ -19,10 +19,11 @@ package org.apache.maven.scm.command.exp
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
* @version $Id$
@@ -30,21 +31,23 @@ import java.util.List;
public class ExportScmResult
extends ScmResult
{
-private List exportedFiles;
+
+private static final long serialVersionUID = 8564643361304165292L;
+private List exportedFiles;
public ExportScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
-public ExportScmResult( String commandLine, List updatedFiles )
+public ExportScmResult( String commandLine, List updatedFiles )
{
super( commandLine, null, null, true );
this.exportedFiles = updatedFiles;
}
-public List getExportedFiles()
+public List getExportedFiles()
{
return exportedFiles;
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResultWithRevision.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResultWithRevision.java?rev=1055643&r1=1055642&r2=1055643&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResultWithRevision.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/ExportScmResultWithRevision.java
Wed Jan 5 21:21:13 2011
@@ -21,6 +21,8 @@ package org.apache.maven.scm.command.exp
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+
/**
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
* @version $Id$
@@ -28,6 +30,8 @@ import java.util.List;
public class ExportScmResultWithRevision
extends ExportScmResult
{
+
+private static final long serialVersionUID = -7962912849216079039L;
private String revision;
public ExportScmResultWithRevision( String commandLine, String
providerMessage, String commandOutput,
@@ -38,7 +42,7 @@ public class ExportScmResultWithRevision
this.revision = revision;
}
-public ExportScmResultWithRevision( String commandLine, List
exportedFiles, String revision )
+public ExportScmResultWithRevision( String commandLine, List
exportedFiles, String revision )
{
super( commandLine, exportedFiles );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java?rev=1055643&r1=1055642&r2=1055643&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
Wed Jan 5 21:21:13 2011
@@ -37,7 +37,7 @@ public class CvsUpdateConsumer
{
private ScmLogger logger;
-priva
svn commit: r1054993 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java
Author: olamy Date: Tue Jan 4 12:24:59 2011 New Revision: 1054993 URL: http://svn.apache.org/viewvc?rev=1054993&view=rev Log: fix junit due to 1.5 move Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java?rev=1054993&r1=1054992&r2=1054993&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumerTest.java Tue Jan 4 12:24:59 2011 @@ -53,7 +53,7 @@ public class GitDiffConsumerTest consumer.consumeLine( line ); } -List changedFiles = consumer.getChangedFiles(); +List changedFiles = consumer.getChangedFiles(); assertEquals( 0, changedFiles.size() ); } @@ -74,16 +74,16 @@ public class GitDiffConsumerTest consumer.consumeLine( line ); } -List changedFiles = consumer.getChangedFiles(); +List changedFiles = consumer.getChangedFiles(); assertEquals( 1, changedFiles.size() ); testScmFile( (ScmFile) changedFiles.get( 0 ), "olamy.test", ScmFileStatus.MODIFIED ); -Map differences = consumer.getDifferences(); +Map differences = consumer.getDifferences(); assertNotNull( differences ); -StringBuffer readmeDiffs = (StringBuffer) differences.get( "olamy.test" ); +StringBuilder readmeDiffs = differences.get( "olamy.test" ); assertNotNull( readmeDiffs ); assertTrue( readmeDiffs.indexOf( "+new line" ) >= 0 ); } @@ -104,22 +104,22 @@ public class GitDiffConsumerTest consumer.consumeLine( line ); } -List changedFiles = consumer.getChangedFiles(); +List changedFiles = consumer.getChangedFiles(); assertEquals( 2, changedFiles.size() ); -testScmFile( (ScmFile) changedFiles.get( 0 ), "pom.xml", ScmFileStatus.MODIFIED ); +testScmFile( changedFiles.get( 0 ), "pom.xml", ScmFileStatus.MODIFIED ); -testScmFile( (ScmFile) changedFiles.get( 1 ), "test.txt", ScmFileStatus.MODIFIED ); +testScmFile( changedFiles.get( 1 ), "test.txt", ScmFileStatus.MODIFIED ); -Map differences = consumer.getDifferences(); +Map differences = consumer.getDifferences(); assertNotNull( differences ); -StringBuffer addDiffs = (StringBuffer) differences.get( "pom.xml" ); +StringBuilder addDiffs = differences.get( "pom.xml" ); assertNotNull( addDiffs ); assertTrue( addDiffs.indexOf( "+ " ) >= 0 ); -addDiffs = (StringBuffer) differences.get( "test.txt" ); +addDiffs = differences.get( "test.txt" ); assertNotNull( addDiffs ); assertTrue( addDiffs.indexOf( "+maven-scm git provider works fine :-)" ) >= 0 ); }
svn commit: r1054992 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml
Author: olamy Date: Tue Jan 4 12:23:57 2011 New Revision: 1054992 URL: http://svn.apache.org/viewvc?rev=1054992&view=rev Log: not possible to align modello version here Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml?rev=1054992&r1=1054991&r2=1054992&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml Tue Jan 4 12:23:57 2011 @@ -51,6 +51,7 @@ org.codehaus.modello modello-maven-plugin +1.0-alpha-21 @@ -63,9 +64,7 @@ 1.0.0 - -src/main/mdo/vss-settings.mdo - + src/main/mdo/vss-settings.mdo
svn commit: r1054982 - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/ac
Author: olamy
Date: Tue Jan 4 11:47:10 2011
New Revision: 1054982
URL: http://svn.apache.org/viewvc?rev=1054982&view=rev
Log:
fix junits
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.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/changelog/AccuRevChangeLogCommandTest.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-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/ChangeSetMatcher.java
Tue Jan 4 11:47:10 2011
@@ -40,7 +40,6 @@ public class ChangeSetMatcher
private Matcher> changeFilesMatcher;
-@SuppressWarnings( "unchecked" )
public ChangeSetMatcher( String comment, String... fileNames )
{
this.comment = comment;
@@ -53,7 +52,6 @@ public class ChangeSetMatcher
this.changeFilesMatcher = allOf( hasItems( elementMatchers ), size(
fileNames.length, ChangeFile.class ) );
}
-@SuppressWarnings( "unchecked" )
@Override
public boolean matchesSafely( ChangeSet changeSet )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/add/AccuRevAddCommandTest.java
Tue Jan 4 11:47:10 2011
@@ -41,7 +41,6 @@ public class AccuRevAddCommandTest
extends AbstractAccuRevCommandTest
{
-@SuppressWarnings( "unchecked" )
@Test
public void testAdd()
throws Exception
@@ -64,7 +63,6 @@ public class AccuRevAddCommandTest
assertHasScmFile( result.getAddedFiles(), "added/file",
ScmFileStatus.ADDED );
}
-@SuppressWarnings( "unchecked" )
@Test
public void testAddFailed()
throws Exception
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java?rev=1054982&r1=1054981&r2=1054982&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTest.java
Tue Jan 4 11:47:10 2011
@@ -110,7 +110,6 @@ public class AccuRevChangeLogCommandTest
}
-@SuppressWarnings("unchecked")
@Test
public void testStandardCase()
throws Exception
@@ -199,7 +198,6 @@ public class AccuRevChangeLogCommandTest
assertThat( cs.containsFilename( "created/file" ), is( true ) );
}
-@SuppressWarnings("unchecked")
@Test
public void testWorkspaceChangelog()
throws Exception
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/jav
svn commit: r1054981 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml
Author: olamy Date: Tue Jan 4 11:45:31 2011 New Revision: 1054981 URL: http://svn.apache.org/viewvc?rev=1054981&view=rev Log: align modello version for vss provider Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml?rev=1054981&r1=1054980&r2=1054981&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml Tue Jan 4 11:45:31 2011 @@ -51,7 +51,6 @@ org.codehaus.modello modello-maven-plugin -1.0-alpha-21 @@ -64,7 +63,9 @@ 1.0.0 - src/main/mdo/vss-settings.mdo + +src/main/mdo/vss-settings.mdo +
svn commit: r1054980 - /maven/scm/trunk/.gitignore
Author: olamy Date: Tue Jan 4 11:43:21 2011 New Revision: 1054980 URL: http://svn.apache.org/viewvc?rev=1054980&view=rev Log: ignore ignore build directory Modified: maven/scm/trunk/.gitignore Modified: maven/scm/trunk/.gitignore URL: http://svn.apache.org/viewvc/maven/scm/trunk/.gitignore?rev=1054980&r1=1054979&r2=1054980&view=diff == --- maven/scm/trunk/.gitignore (original) +++ maven/scm/trunk/.gitignore Tue Jan 4 11:43:21 2011 @@ -6,4 +6,4 @@ target .classpath .project .settings - +build
svn commit: r1054967 - /maven/scm/trunk/.gitignore
Author: olamy Date: Tue Jan 4 10:52:17 2011 New Revision: 1054967 URL: http://svn.apache.org/viewvc?rev=1054967&view=rev Log: add .gitignore Added: maven/scm/trunk/.gitignore Added: maven/scm/trunk/.gitignore URL: http://svn.apache.org/viewvc/maven/scm/trunk/.gitignore?rev=1054967&view=auto == --- maven/scm/trunk/.gitignore (added) +++ maven/scm/trunk/.gitignore Tue Jan 4 10:52:17 2011 @@ -0,0 +1,9 @@ +*.ipr +atlassian-ide-plugin.xml +*.iml +*.iws +target +.classpath +.project +.settings +
svn commit: r1054455 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/ maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/
Author: olamy Date: Sun Jan 2 18:40:29 2011 New Revision: 1054455 URL: http://svn.apache.org/viewvc?rev=1054455&view=rev Log: [SCM-591] move to Java 1.5 : checkin command Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.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-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkin/LocalCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkin/VssCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java?rev=1054455&r1=1054454&r2=1054455&view=diff == --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java Sun Jan 2 18:40:29 2011 @@ -31,6 +31,7 @@ import org.apache.maven.scm.provider.Scm /** * @author mailto:eveni...@apache.org";>Emmanuel Venisse * @author mailto:tryg...@inamo.no";>Trygve Laugstøl + * @author Olivier Lamy * @version $Id$ */ public abstract class AbstractCheckInCommand Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java?rev=1054455&r1=1054454&r2=1054455&view=diff == --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java Sun Jan 2 18:40:29 2011 @@ -19,19 +19,24 @@ package org.apache.maven.scm.command.che * under the License. */ -import org.apache.maven.scm.ScmResult; - +import java.util.ArrayList; import java.util.List; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm
svn commit: r1054399 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/ maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/
Author: olamy
Date: Sun Jan 2 13:19:52 2011
New Revision: 1054399
URL: http://svn.apache.org/viewvc?rev=1054399&view=rev
Log:
[SCM-591] move to Java 1.5 : branch command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/BranchScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/branch/CvsExeBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/branch/CvsJavaBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/AbstractFileCheckingConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/BranchScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/BranchScmResult.java?rev=1054399&r1=1054398&r2=1054399&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/BranchScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/BranchScmResult.java
Sun Jan 2 13:19:52 2011
@@ -19,39 +19,45 @@ package org.apache.maven.scm.command.bra
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
+ * @author Olivier Lamy
* @version $Id$
*/
public class BranchScmResult
extends ScmResult
{
-private List branchedFiles;
+/**
+ *
+ */
+private static final long serialVersionUID = -4241972929129557932L;
+private List branchedFiles;
public BranchScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
-public BranchScmResult( String commandLine, List branchedFiles )
+public BranchScmResult( String commandLine, List branchedFiles )
{
super( commandLine, null, null, true );
this.branchedFiles = branchedFiles;
}
-public BranchScmResult( List branchedFiles, ScmResult result )
+public BranchScmResult( List branchedFiles, ScmResult result )
{
super( result );
this.branchedFiles = branchedFiles;
}
-public List getBranchedFiles()
+public List getBranchedFiles()
{
return branchedFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java?rev=1054399&r1=1054398&r2=1054399&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java
Sun Jan 2 13:19:52 2011
@@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.tf
import java.util.ArrayList;
import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.branch.AbstractBranchCommand;
@@ -46,7 +47,7 @@ public class TfsBranchCommand
return new BranchScmResult( command.getCommandString(), "Error
code for TFS branch command - " + status,
err.getOutput(), false );
}
-return new BranchScmResult( command.getCommandString(), new
Arra
svn commit: r1054366 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/ maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/ba
Author: olamy
Date: Sun Jan 2 09:01:53 2011
New Revision: 1054366
URL: http://svn.apache.org/viewvc?rev=1054366&view=rev
Log:
[SCM-591] move to Java 1.5 : blame command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/blame/BazaarBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/blame/PerforceBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/blame/SvnBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/blame/SvnBlameConsumer.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameLine.java
Sun Jan 2 09:01:53 2011
@@ -29,6 +29,9 @@ import java.util.Date;
public class BlameLine
implements Serializable
{
+
+private static final long serialVersionUID = 2675122069344705612L;
+
private Date date;
private String revision;
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java?rev=1054366&r1=1054365&r2=1054366&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmResult.java
Sun Jan 2 09:01:53 2011
@@ -19,20 +19,22 @@ package org.apache.maven.scm.command.bla
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author Evgeny Mandrikov
+ * @author Olivier Lamy
* @since 1.4
*/
public class BlameScmResult
extends ScmResult
{
-private List lines;
+private static final long serialVersionUID = -3877526036464636595L;
+private List lines;
-public BlameScmResult( String commandLine, List /* BlameLine */ lines )
+public BlameScmResult( String commandLine, List lines )
{
this( commandLine, null, null, true );
@@ -44,14 +46,14 @@ public class BlameScmResult
super( commandLine, providerMessage, commandOutput, success );
}
-public BlameScmResult( List /* BlameLine */ lines, ScmRe
svn commit: r1054215 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/ maven-scm-api/src/main/java/org/apache/maven/scm/manager/ maven-scm-api/src/main/java/org/apache/maven/scm
Author: olamy
Date: Sat Jan 1 09:45:44 2011
New Revision: 1054215
URL: http://svn.apache.org/viewvc?rev=1054215&view=rev
Log:
[SCM-591] move to Java 1.5
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.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/repository/ScmRepositoryException.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
maven/scm/trunk/maven-scm-plugin/pom.xml
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
Sat Jan 1 09:45:44 2011
@@ -27,6 +27,7 @@ import java.util.Map;
/**
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
+ * @author Olivier Lamy
* @version $Id$
*/
public class CommandParameters
@@ -34,7 +35,7 @@ public class CommandParameters
{
private static final long serialVersionUID = -7346070735958137283L;
-private Map parameters = new HashMap();
+private Map parameters = new HashMap();
// --
// String
@@ -317,7 +318,7 @@ public class CommandParameters
* @return The parameter value
* @throws ScmException if the parameter doesn't exist
*/
-private Object getObject( Class clazz, CommandParameter parameter )
+private Object getObject( Class clazz, CommandParameter parameter )
throws ScmException
{
Object object = getObject( clazz, parameter, null );
@@ -339,7 +340,7 @@ public class CommandParameters
* @return The parameter value
* @throws ScmException if the defaultValue is in the wrong type
*/
-private Object getObject( Class clazz, CommandParameter parameter, Object
defaultValue )
+private Object getObject( Class clazz, CommandParameter parameter,
Object defaultValue )
throws ScmException
{
Object object = parameters.get( parameter.getName() );
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
Sat Jan 1 09:45:44 2011
@@ -52,6 +52,7 @@ import java.util.List;
* @author mailto:tryg...@inamo.no";>Trygve Laugstøl
* @author mailto:br...@apache.org";>Brett Porter
* @author mailto:eveni...@apache.org";>Emmanuel Venisse
+ * @author Olivier Lamy
* @version $Id$
*/
public interface ScmManager
@@ -82,7 +83,7 @@ public interface ScmManager
* @param scmUrl the SCM URL to validate
* @return List of String objects with the
messages returned by the SCM provider
*/
-List validateScmRepository( String scmUrl );
+List validateScmRepository( String scmUrl );
ScmProvider getProviderByUrl( String scmUrl )
throws ScmRepositoryException, NoSuchScmProviderException;
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
(original)
+
svn commit: r1054130 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/log/ maven-scm-api/src/main/java/org/apache/maven/scm/manager/ maven-scm-api/src/main/java/org/apache/maven
Author: olamy
Date: Fri Dec 31 16:01:45 2010
New Revision: 1054130
URL: http://svn.apache.org/viewvc?rev=1054130&view=rev
Log:
[SCM-591] move to Java 1.5
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.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/ScmUrlUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java?rev=1054130&r1=1054129&r2=1054130&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java
Fri Dec 31 16:01:45 2010
@@ -20,7 +20,6 @@ package org.apache.maven.scm.log;
*/
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -30,7 +29,7 @@ import java.util.List;
public class ScmLogDispatcher
implements ScmLogger
{
-private List listeners = new ArrayList();
+private List listeners = new ArrayList();
public void addListener( ScmLogger logger )
{
@@ -40,10 +39,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void debug( String content, Throwable error )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
logger.debug( content, error );
}
}
@@ -51,10 +48,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void debug( String content )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
logger.debug( content );
}
}
@@ -62,10 +57,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void debug( Throwable error )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
logger.debug( error );
}
}
@@ -73,10 +66,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void error( String content, Throwable error )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
logger.error( content, error );
}
}
@@ -84,10 +75,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void error( String content )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
logger.error( content );
}
}
@@ -95,10 +84,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void error( Throwable error )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
logger.error( error );
}
}
@@ -106,10 +93,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void info( String content, Throwable error )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
if ( logger.isInfoEnabled() )
{
logger.info( content, error );
@@ -120,10 +105,8 @@ public class ScmLogDispatcher
/** {...@inheritdoc} */
public void info( String content )
{
-for ( Iterator i = listeners.iterator(); i.hasNext(); )
+for ( ScmLogger logger : listeners )
{
-ScmLogger logger = (ScmLogger) i.next();
-
if ( logger.isInfoEnabled() )
{
logger.info( content );
@@ -134,10 +117,8 @@ public class ScmLogDispatcher
/**
svn commit: r1053421 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/ test/java/org/ap
Author: olamy
Date: Tue Dec 28 20:13:15 2010
New Revision: 1053421
URL: http://svn.apache.org/viewvc?rev=1053421&view=rev
Log:
[SCM-592] Error parsing blame for git
Submitted by Evgeny Mandrikov.
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumerTest.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/blame/
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/blame/git-blame.out
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java?rev=1053421&r1=1053420&r2=1053421&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameCommand.java
Tue Dec 28 20:13:15 2010
@@ -62,6 +62,7 @@ public class GitBlameCommand
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(
workingDirectory, "blame" );
cl.createArg().setValue( "-c" );
+cl.createArg().setValue( "-l" );
cl.createArg().setValue( filename );
return cl;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumer.java?rev=1053421&r1=1053420&r2=1053421&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitBlameConsumer.java
Tue Dec 28 20:13:15 2010
@@ -22,7 +22,6 @@ package org.apache.maven.scm.provider.gi
import org.apache.maven.scm.command.blame.BlameLine;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.util.AbstractConsumer;
-import org.apache.regexp.RE;
import java.util.ArrayList;
import java.util.Date;
@@ -37,37 +36,26 @@ public class GitBlameConsumer
{
private static final String GIT_TIMESTAMP_PATTERN = "-MM-dd HH:mm:ss
Z";
-private static final String LINE_PATTERN = "(.*)\t\\((.*)\t(.*)\t.*\\)";
-
-/**
- * @see #LINE_PATTERN
- */
-private RE lineRegexp;
-
private List lines = new ArrayList();
public GitBlameConsumer( ScmLogger logger )
{
super( logger );
-
-lineRegexp = new RE( LINE_PATTERN );
}
public void consumeLine( String line )
{
-if ( lineRegexp.match( line ) )
+String parts[] = line.split( "\t", 4 );
+String revision = parts[0];
+String author = parts[1].substring( 1 );
+String dateTimeStr = parts[2];
+
+Date dateTime = parseDate( dateTimeStr, null, GIT_TIMESTAMP_PATTERN );
+getLines().add( new BlameLine( dateTime, revision, author ) );
+
+if ( getLogger().isDebugEnabled() )
{
-String revision = lineRegexp.getParen( 1 );
-String author = lineRegexp.getParen( 2 );
-String dateTimeStr = lineRegexp.getParen( 3 );
-
-Date dateTime = parseDate( dateTimeStr, null,
GIT_TIMESTAMP_PATTERN );
-getLines().add( new BlameLine( dateTime, revision, author ) );
-
-if ( getLogger().isDebugEnabled() )
-{
-getLogger().debug( author + "
svn commit: r1052965 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
Author: olamy
Date: Sun Dec 26 21:39:20 2010
New Revision: 1052965
URL: http://svn.apache.org/viewvc?rev=1052965&view=rev
Log:
[SCM-576] PerforceTagCommand does not work when a ScmFileSet is specified.
Submitted by Rune Bremnes
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java?rev=1052965&r1=1052964&r2=1052965&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
Sun Dec 26 21:39:20 2010
@@ -213,7 +213,7 @@ public class PerforceTagCommand
for ( int i = 0; i < fs.size(); i++ )
{
File file = (File) fs.get( i );
-command.createArg().setValue( file.getName() );
+command.createArg().setValue( file.getPath() );
}
return command;
}
svn commit: r1052939 - /maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
Author: olamy Date: Sun Dec 26 20:21:54 2010 New Revision: 1052939 URL: http://svn.apache.org/viewvc?rev=1052939&view=rev Log: an other try to fix test on the grid. Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=1052939&r1=1052938&r2=1052939&view=diff == --- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Sun Dec 26 20:21:54 2010 @@ -128,7 +128,7 @@ public abstract class UpdateCommandTckTe Date lastUpdate = new Date( System.currentTimeMillis() - 10 ); -//Thread.sleep( 2000 ); +Thread.sleep( 2000 ); commit( getWorkingCopy(), repository );
svn commit: r1052935 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/update/ maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apa
Author: olamy
Date: Sun Dec 26 20:09:05 2010
New Revision: 1052935
URL: http://svn.apache.org/viewvc?rev=1052935&view=rev
Log:
so should fix test on the grid.
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateConsumer.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java?rev=1052935&r1=1052934&r2=1052935&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
Sun Dec 26 20:09:05 2010
@@ -19,6 +19,7 @@ package org.apache.maven.scm.command.upd
* under the License.
*/
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmResult;
@@ -68,7 +69,7 @@ public class UpdateScmResult
}
/**
- * @return {...@link List} of {...@link String}
+ * @return {...@link List} of {...@link ChangeSet}
*/
public List getChanges()
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java?rev=1052935&r1=1052934&r2=1052935&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
Sun Dec 26 20:09:05 2010
@@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.sv
import java.io.File;
import java.util.Iterator;
+import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -87,14 +88,9 @@ public class SvnUpdateCommand
UpdateScmResultWithRevision result = new UpdateScmResultWithRevision(
cl.toString(), consumer.getUpdatedFiles(),
String.valueOf(
consumer.getRevision() ) );
-if ( !result.getUpdatedFiles().isEmpty() )
-{
-for ( Iterator ite = result.getUpdatedFiles().iterator();
ite.hasNext(); )
-{
-ScmFile scmFile = (ScmFile) ite.next();
-result.getChanges().add( scmFile.getPath() );
-}
-}
+
+result.setChanges( consumer.getChangeSets() );
+getLogger().info( "changeSets " + consumer.getChangeSets());
return result;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateConsumer.java?rev=1052935&r1=1052934&r2=1052935&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateConsumer.java
Sun Dec 26 20:09:05 2010
@@ -19,14 +19,18 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import j
svn commit: r1052906 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.jav
Author: olamy Date: Sun Dec 26 15:49:10 2010 New Revision: 1052906 URL: http://svn.apache.org/viewvc?rev=1052906&view=rev Log: remove unused imports. Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java?rev=1052906&r1=1052905&r2=1052906&view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java Sun Dec 26 15:49:10 2010 @@ -20,9 +20,7 @@ package org.apache.maven.scm.provider.sv */ import java.io.File; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmException;
