Author: olamy Date: Thu Aug 5 13:03:00 2010 New Revision: 982593 URL: http://svn.apache.org/viewvc?rev=982593&view=rev Log: [SCM-568] cvs providers Exception No such command 'blame' Submitted by Evgeny Mandrikov
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/AbstractCvsScmProvider.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/TestCvsScmProvider.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/CvsExeScmProvider.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/CvsJavaScmProvider.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/AbstractCvsScmProvider.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/AbstractCvsScmProvider.java?rev=982593&r1=982592&r2=982593&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/AbstractCvsScmProvider.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/AbstractCvsScmProvider.java Thu Aug 5 13:03:00 2010 @@ -32,6 +32,7 @@ import org.apache.maven.scm.ScmResult; import org.apache.maven.scm.ScmTagParameters; import org.apache.maven.scm.command.Command; 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; @@ -268,6 +269,13 @@ public abstract class AbstractCvsScmProv } /** {...@inheritdoc} */ + protected BlameScmResult blame( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) + throws ScmException + { + return (BlameScmResult) executeCommand( getBlameCommand(), repository, fileSet, parameters ); + } + + /** {...@inheritdoc} */ public ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException @@ -721,6 +729,8 @@ public abstract class AbstractCvsScmProv protected abstract Command getBranchCommand(); + protected abstract Command getBlameCommand(); + protected abstract Command getChangeLogCommand(); protected abstract Command getCheckInCommand(); 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/TestCvsScmProvider.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/repository/TestCvsScmProvider.java?rev=982593&r1=982592&r2=982593&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/repository/TestCvsScmProvider.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/repository/TestCvsScmProvider.java Thu Aug 5 13:03:00 2010 @@ -39,6 +39,11 @@ public class TestCvsScmProvider return null; } + protected Command getBlameCommand() + { + return null; + } + protected Command getChangeLogCommand() { return null; 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/CvsExeScmProvider.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/CvsExeScmProvider.java?rev=982593&r1=982592&r2=982593&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/CvsExeScmProvider.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/CvsExeScmProvider.java Thu Aug 5 13:03:00 2010 @@ -23,6 +23,7 @@ import org.apache.maven.scm.command.Comm import org.apache.maven.scm.provider.cvslib.AbstractCvsScmProvider; import org.apache.maven.scm.provider.cvslib.command.login.CvsLoginCommand; import org.apache.maven.scm.provider.cvslib.cvsexe.command.add.CvsExeAddCommand; +import org.apache.maven.scm.provider.cvslib.cvsexe.command.blame.CvsExeBlameCommand; import org.apache.maven.scm.provider.cvslib.cvsexe.command.branch.CvsExeBranchCommand; import org.apache.maven.scm.provider.cvslib.cvsexe.command.changelog.CvsExeChangeLogCommand; import org.apache.maven.scm.provider.cvslib.cvsexe.command.checkin.CvsExeCheckInCommand; @@ -62,6 +63,12 @@ public class CvsExeScmProvider } /** {...@inheritdoc} */ + protected Command getBlameCommand() + { + return new CvsExeBlameCommand(); + } + + /** {...@inheritdoc} */ protected Command getChangeLogCommand() { return new CvsExeChangeLogCommand(); 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/CvsJavaScmProvider.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/CvsJavaScmProvider.java?rev=982593&r1=982592&r2=982593&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/CvsJavaScmProvider.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/CvsJavaScmProvider.java Thu Aug 5 13:03:00 2010 @@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.cv import org.apache.maven.scm.command.Command; import org.apache.maven.scm.provider.cvslib.AbstractCvsScmProvider; import org.apache.maven.scm.provider.cvslib.cvsjava.command.add.CvsJavaAddCommand; +import org.apache.maven.scm.provider.cvslib.cvsjava.command.blame.CvsJavaBlameCommand; import org.apache.maven.scm.provider.cvslib.cvsjava.command.branch.CvsJavaBranchCommand; import org.apache.maven.scm.provider.cvslib.cvsjava.command.changelog.CvsJavaChangeLogCommand; import org.apache.maven.scm.provider.cvslib.cvsjava.command.checkin.CvsJavaCheckInCommand; @@ -57,6 +58,12 @@ public class CvsJavaScmProvider } /** {...@inheritdoc} */ + protected Command getBlameCommand() + { + return new CvsJavaBlameCommand(); + } + + /** {...@inheritdoc} */ protected Command getChangeLogCommand() { return new CvsJavaChangeLogCommand();