Author: olamy
Date: Fri May 7 21:46:19 2010
New Revision: 942245
URL: http://svn.apache.org/viewvc?rev=942245&view=rev
Log:
oops missed to commit some files with the previous fix.
Modified:
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/blame/CvsExeBlameCommand.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/diff/CvsExeDiffCommand.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/command/checkout/CvsExeCheckoutCommandTest.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/blame/CvsJavaBlameCommand.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-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/blame/CvsExeBlameCommand.java
URL:
http://svn.apache.org/viewvc/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/blame/CvsExeBlameCommand.java?rev=942245&r1=942244&r2=942245&view=diff
==============================================================================
---
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/blame/CvsExeBlameCommand.java
(original)
+++
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/blame/CvsExeBlameCommand.java
Fri May 7 21:46:19 2010
@@ -21,7 +21,7 @@ package org.apache.maven.scm.provider.cv
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.blame.BlameScmResult;
-import
org.apache.maven.scm.provider.cvslib.command.blame.AbsrtactCvsBlameCommand;
+import
org.apache.maven.scm.provider.cvslib.command.blame.AbstractCvsBlameCommand;
import org.apache.maven.scm.provider.cvslib.command.blame.CvsBlameConsumer;
import
org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -33,7 +33,7 @@ import org.codehaus.plexus.util.cli.Comm
* @since 1.4
*/
public class CvsExeBlameCommand
- extends AbsrtactCvsBlameCommand
+ extends AbstractCvsBlameCommand
{
/**
* {...@inheritdoc}
Modified:
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/diff/CvsExeDiffCommand.java
URL:
http://svn.apache.org/viewvc/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/diff/CvsExeDiffCommand.java?rev=942245&r1=942244&r2=942245&view=diff
==============================================================================
---
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/diff/CvsExeDiffCommand.java
(original)
+++
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/diff/CvsExeDiffCommand.java
Fri May 7 21:46:19 2010
@@ -42,11 +42,10 @@ public class CvsExeDiffCommand
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
- int exitCode;
try
{
- exitCode = CommandLineUtils.executeCommandLine( cl, consumer,
stderr );
+ CommandLineUtils.executeCommandLine( cl, consumer, stderr );
}
catch ( CommandLineException ex )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckoutCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckoutCommandTest.java?rev=942245&r1=942244&r2=942245&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckoutCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckoutCommandTest.java
Fri May 7 21:46:19 2010
@@ -28,4 +28,5 @@ import org.apache.maven.scm.provider.cvs
public class CvsExeCheckoutCommandTest
extends CvsCheckoutCommandTest
{
+ // no op
}
Modified:
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/blame/CvsJavaBlameCommand.java
URL:
http://svn.apache.org/viewvc/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/blame/CvsJavaBlameCommand.java?rev=942245&r1=942244&r2=942245&view=diff
==============================================================================
---
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/blame/CvsJavaBlameCommand.java
(original)
+++
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/blame/CvsJavaBlameCommand.java
Fri May 7 21:46:19 2010
@@ -20,7 +20,7 @@ package org.apache.maven.scm.provider.cv
*/
import org.apache.maven.scm.command.blame.BlameScmResult;
-import
org.apache.maven.scm.provider.cvslib.command.blame.AbsrtactCvsBlameCommand;
+import
org.apache.maven.scm.provider.cvslib.command.blame.AbstractCvsBlameCommand;
import org.apache.maven.scm.provider.cvslib.command.blame.CvsBlameConsumer;
import org.apache.maven.scm.provider.cvslib.cvsjava.util.CvsConnection;
import org.apache.maven.scm.provider.cvslib.cvsjava.util.CvsLogListener;
@@ -36,7 +36,7 @@ import java.io.InputStreamReader;
* @since 1.4
*/
public class CvsJavaBlameCommand
- extends AbsrtactCvsBlameCommand
+ extends AbstractCvsBlameCommand
{
/**
* {...@inheritdoc}
Modified:
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
URL:
http://svn.apache.org/viewvc/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?rev=942245&r1=942244&r2=942245&view=diff
==============================================================================
---
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
(original)
+++
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
Fri May 7 21:46:19 2010
@@ -62,7 +62,7 @@ public class CvsCheckoutCommandTest
if ( !result.isSuccess() )
{
- fail( result.getProviderMessage() + "\n" +
result.getCommandOutput() );
+ fail( result.getProviderMessage() + "\n" +
result.getCommandOutput() + "\n" + result.getCommandLine() );
}
List files = result.getCheckedOutFiles();
