You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by vs...@apache.org on 2008/08/13 15:36:07 UTC
svn commit: r685548 [5/7] - in /maven/scm/trunk/maven-scm-providers:
maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/
maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/add/
maven-scm-...
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=685548&r1=685547&r2=685548&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 Wed Aug 13 06:35:49 2008
@@ -43,66 +43,79 @@
public class CvsExeScmProvider
extends AbstractCvsScmProvider
{
+ /** {@inheritDoc} */
protected Command getAddCommand()
{
return new CvsExeAddCommand();
}
+ /** {@inheritDoc} */
protected Command getBranchCommand()
{
return new CvsExeBranchCommand();
}
+ /** {@inheritDoc} */
protected Command getChangeLogCommand()
{
return new CvsExeChangeLogCommand();
}
+ /** {@inheritDoc} */
protected Command getCheckInCommand()
{
return new CvsExeCheckInCommand();
}
+ /** {@inheritDoc} */
protected Command getCheckOutCommand()
{
return new CvsExeCheckOutCommand();
}
+ /** {@inheritDoc} */
protected Command getDiffCommand()
{
return new CvsExeDiffCommand();
}
+ /** {@inheritDoc} */
protected Command getExportCommand()
{
return new CvsExeExportCommand();
}
+ /** {@inheritDoc} */
protected Command getListCommand()
{
return new CvsExeListCommand();
}
+ /** {@inheritDoc} */
protected Command getLoginCommand()
{
return new CvsLoginCommand();
}
+ /** {@inheritDoc} */
protected Command getRemoveCommand()
{
return new CvsExeRemoveCommand();
}
+ /** {@inheritDoc} */
protected Command getStatusCommand()
{
return new CvsExeStatusCommand();
}
+ /** {@inheritDoc} */
protected Command getTagCommand()
{
return new CvsExeTagCommand();
}
+ /** {@inheritDoc} */
protected Command getUpdateCommand()
{
return new CvsExeUpdateCommand();
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/add/CvsExeAddCommand.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/add/CvsExeAddCommand.java?rev=685548&r1=685547&r2=685548&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/add/CvsExeAddCommand.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/add/CvsExeAddCommand.java Wed Aug 13 06:35:49 2008
@@ -35,6 +35,7 @@
public class CvsExeAddCommand
extends AbstractCvsAddCommand
{
+ /** {@inheritDoc} */
protected AddScmResult executeCvsCommand( Commandline cl, List addedFiles )
throws ScmException
{
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/branch/CvsExeBranchCommand.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/branch/CvsExeBranchCommand.java?rev=685548&r1=685547&r2=685548&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/branch/CvsExeBranchCommand.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/branch/CvsExeBranchCommand.java Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeBranchCommand
extends AbstractCvsBranchCommand
{
+ /** {@inheritDoc} */
protected BranchScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/changelog/CvsExeChangeLogCommand.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/changelog/CvsExeChangeLogCommand.java?rev=685548&r1=685547&r2=685548&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/changelog/CvsExeChangeLogCommand.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/changelog/CvsExeChangeLogCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsExeChangeLogCommand
extends AbstractCvsChangeLogCommand
{
+ /** {@inheritDoc} */
protected ChangeLogScmResult executeCvsCommand( Commandline cl, Date startDate, Date endDate,
ScmVersion startVersion, ScmVersion endVersion, String datePattern )
throws ScmException
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/checkin/CvsExeCheckInCommand.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/checkin/CvsExeCheckInCommand.java?rev=685548&r1=685547&r2=685548&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/checkin/CvsExeCheckInCommand.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/checkin/CvsExeCheckInCommand.java Wed Aug 13 06:35:49 2008
@@ -39,6 +39,7 @@
public class CvsExeCheckInCommand
extends AbstractCvsCheckInCommand
{
+ /** {@inheritDoc} */
protected CheckInScmResult executeCvsCommand( Commandline cl, CvsScmProviderRepository repository,
File messageFile )
throws ScmException
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/checkout/CvsExeCheckOutCommand.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/checkout/CvsExeCheckOutCommand.java?rev=685548&r1=685547&r2=685548&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/checkout/CvsExeCheckOutCommand.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/checkout/CvsExeCheckOutCommand.java Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeCheckOutCommand
extends AbstractCvsCheckOutCommand
{
+ /** {@inheritDoc} */
protected CheckOutScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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=685548&r1=685547&r2=685548&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 Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeDiffCommand
extends AbstractCvsDiffCommand
{
+ /** {@inheritDoc} */
protected DiffScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/export/CvsExeExportCommand.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/export/CvsExeExportCommand.java?rev=685548&r1=685547&r2=685548&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/export/CvsExeExportCommand.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/export/CvsExeExportCommand.java Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeExportCommand
extends AbstractCvsExportCommand
{
+ /** {@inheritDoc} */
protected ExportScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/list/CvsExeListCommand.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/list/CvsExeListCommand.java?rev=685548&r1=685547&r2=685548&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/list/CvsExeListCommand.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/list/CvsExeListCommand.java Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeListCommand
extends AbstractCvsListCommand
{
+ /** {@inheritDoc} */
protected ListScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/remove/CvsExeRemoveCommand.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/remove/CvsExeRemoveCommand.java?rev=685548&r1=685547&r2=685548&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/remove/CvsExeRemoveCommand.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/remove/CvsExeRemoveCommand.java Wed Aug 13 06:35:49 2008
@@ -35,6 +35,7 @@
public class CvsExeRemoveCommand
extends AbstractCvsRemoveCommand
{
+ /** {@inheritDoc} */
protected RemoveScmResult executeCvsCommand( Commandline cl, List removedFiles )
throws ScmException
{
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/status/CvsExeStatusCommand.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/status/CvsExeStatusCommand.java?rev=685548&r1=685547&r2=685548&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/status/CvsExeStatusCommand.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/status/CvsExeStatusCommand.java Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeStatusCommand
extends AbstractCvsStatusCommand
{
+ /** {@inheritDoc} */
protected StatusScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/tag/CvsExeTagCommand.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/tag/CvsExeTagCommand.java?rev=685548&r1=685547&r2=685548&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/tag/CvsExeTagCommand.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/tag/CvsExeTagCommand.java Wed Aug 13 06:35:49 2008
@@ -34,6 +34,7 @@
public class CvsExeTagCommand
extends AbstractCvsTagCommand
{
+ /** {@inheritDoc} */
protected TagScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/update/CvsExeUpdateCommand.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/update/CvsExeUpdateCommand.java?rev=685548&r1=685547&r2=685548&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/update/CvsExeUpdateCommand.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/update/CvsExeUpdateCommand.java Wed Aug 13 06:35:49 2008
@@ -36,6 +36,7 @@
public class CvsExeUpdateCommand
extends AbstractCvsUpdateCommand
{
+ /** {@inheritDoc} */
protected UpdateScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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=685548&r1=685547&r2=685548&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 Wed Aug 13 06:35:49 2008
@@ -43,66 +43,79 @@
public class CvsJavaScmProvider
extends AbstractCvsScmProvider
{
+ /** {@inheritDoc} */
protected Command getAddCommand()
{
return new CvsJavaAddCommand();
}
+ /** {@inheritDoc} */
protected Command getBranchCommand()
{
return new CvsJavaBranchCommand();
}
+ /** {@inheritDoc} */
protected Command getChangeLogCommand()
{
return new CvsJavaChangeLogCommand();
}
+ /** {@inheritDoc} */
protected Command getCheckInCommand()
{
return new CvsJavaCheckInCommand();
}
+ /** {@inheritDoc} */
protected Command getCheckOutCommand()
{
return new CvsJavaCheckOutCommand();
}
+ /** {@inheritDoc} */
protected Command getDiffCommand()
{
return new CvsJavaDiffCommand();
}
+ /** {@inheritDoc} */
protected Command getExportCommand()
{
return new CvsJavaExportCommand();
}
+ /** {@inheritDoc} */
protected Command getListCommand()
{
return new CvsJavaListCommand();
}
+ /** {@inheritDoc} */
protected Command getLoginCommand()
{
return new CvsJavaLoginCommand();
}
+ /** {@inheritDoc} */
protected Command getRemoveCommand()
{
return new CvsJavaRemoveCommand();
}
+ /** {@inheritDoc} */
protected Command getStatusCommand()
{
return new CvsJavaStatusCommand();
}
+ /** {@inheritDoc} */
protected Command getTagCommand()
{
return new CvsJavaTagCommand();
}
+ /** {@inheritDoc} */
protected Command getUpdateCommand()
{
return new CvsJavaUpdateCommand();
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/add/CvsJavaAddCommand.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/add/CvsJavaAddCommand.java?rev=685548&r1=685547&r2=685548&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/add/CvsJavaAddCommand.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/add/CvsJavaAddCommand.java Wed Aug 13 06:35:49 2008
@@ -35,6 +35,7 @@
public class CvsJavaAddCommand
extends AbstractCvsAddCommand
{
+ /** {@inheritDoc} */
protected AddScmResult executeCvsCommand( Commandline cl, List addedFiles )
throws ScmException
{
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/branch/CvsJavaBranchCommand.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/branch/CvsJavaBranchCommand.java?rev=685548&r1=685547&r2=685548&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/branch/CvsJavaBranchCommand.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/branch/CvsJavaBranchCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaBranchCommand
extends AbstractCvsBranchCommand
{
+ /** {@inheritDoc} */
protected BranchScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/changelog/CvsJavaChangeLogCommand.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/changelog/CvsJavaChangeLogCommand.java?rev=685548&r1=685547&r2=685548&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/changelog/CvsJavaChangeLogCommand.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/changelog/CvsJavaChangeLogCommand.java Wed Aug 13 06:35:49 2008
@@ -41,6 +41,7 @@
public class CvsJavaChangeLogCommand
extends AbstractCvsChangeLogCommand
{
+ /** {@inheritDoc} */
protected ChangeLogScmResult executeCvsCommand( Commandline cl, Date startDate, Date endDate,
ScmVersion startVersion, ScmVersion endVersion, String datePattern )
throws ScmException
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/checkin/CvsJavaCheckInCommand.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/checkin/CvsJavaCheckInCommand.java?rev=685548&r1=685547&r2=685548&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/checkin/CvsJavaCheckInCommand.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/checkin/CvsJavaCheckInCommand.java Wed Aug 13 06:35:49 2008
@@ -42,6 +42,7 @@
public class CvsJavaCheckInCommand
extends AbstractCvsCheckInCommand
{
+ /** {@inheritDoc} */
protected CheckInScmResult executeCvsCommand( Commandline cl, CvsScmProviderRepository repository,
File messageFile )
throws ScmException
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/checkout/CvsJavaCheckOutCommand.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/checkout/CvsJavaCheckOutCommand.java?rev=685548&r1=685547&r2=685548&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/checkout/CvsJavaCheckOutCommand.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/checkout/CvsJavaCheckOutCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaCheckOutCommand
extends AbstractCvsCheckOutCommand
{
+ /** {@inheritDoc} */
protected CheckOutScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/diff/CvsJavaDiffCommand.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/diff/CvsJavaDiffCommand.java?rev=685548&r1=685547&r2=685548&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/diff/CvsJavaDiffCommand.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/diff/CvsJavaDiffCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaDiffCommand
extends AbstractCvsDiffCommand
{
+ /** {@inheritDoc} */
protected DiffScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/export/CvsJavaExportCommand.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/export/CvsJavaExportCommand.java?rev=685548&r1=685547&r2=685548&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/export/CvsJavaExportCommand.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/export/CvsJavaExportCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaExportCommand
extends AbstractCvsExportCommand
{
+ /** {@inheritDoc} */
protected ExportScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/list/CvsJavaListCommand.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/list/CvsJavaListCommand.java?rev=685548&r1=685547&r2=685548&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/list/CvsJavaListCommand.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/list/CvsJavaListCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaListCommand
extends AbstractCvsListCommand
{
+ /** {@inheritDoc} */
protected ListScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/login/CvsJavaLoginCommand.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/login/CvsJavaLoginCommand.java?rev=685548&r1=685547&r2=685548&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/login/CvsJavaLoginCommand.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/login/CvsJavaLoginCommand.java Wed Aug 13 06:35:49 2008
@@ -29,6 +29,7 @@
public class CvsJavaLoginCommand
extends CvsLoginCommand
{
+ /** {@inheritDoc} */
public boolean isCvsNT()
throws ScmException
{
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/remove/CvsJavaRemoveCommand.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/remove/CvsJavaRemoveCommand.java?rev=685548&r1=685547&r2=685548&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/remove/CvsJavaRemoveCommand.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/remove/CvsJavaRemoveCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaRemoveCommand
extends AbstractCvsRemoveCommand
{
+ /** {@inheritDoc} */
protected RemoveScmResult executeCvsCommand( Commandline cl, List removedFiles )
throws ScmException
{
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/status/CvsJavaStatusCommand.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/status/CvsJavaStatusCommand.java?rev=685548&r1=685547&r2=685548&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/status/CvsJavaStatusCommand.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/status/CvsJavaStatusCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaStatusCommand
extends AbstractCvsStatusCommand
{
+ /** {@inheritDoc} */
protected StatusScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/tag/CvsJavaTagCommand.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/tag/CvsJavaTagCommand.java?rev=685548&r1=685547&r2=685548&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/tag/CvsJavaTagCommand.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/tag/CvsJavaTagCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
public class CvsJavaTagCommand
extends AbstractCvsTagCommand
{
+ /** {@inheritDoc} */
protected TagScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/update/CvsJavaUpdateCommand.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/update/CvsJavaUpdateCommand.java?rev=685548&r1=685547&r2=685548&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/update/CvsJavaUpdateCommand.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/update/CvsJavaUpdateCommand.java Wed Aug 13 06:35:49 2008
@@ -40,6 +40,7 @@
public class CvsJavaUpdateCommand
extends AbstractCvsUpdateCommand
{
+ /** {@inheritDoc} */
protected UpdateScmResult executeCvsCommand( Commandline cl )
throws ScmException
{
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/util/CvsConnection.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/util/CvsConnection.java?rev=685548&r1=685547&r2=685548&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/util/CvsConnection.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/util/CvsConnection.java Wed Aug 13 06:35:49 2008
@@ -48,6 +48,7 @@
* A Cvs connection that simulates a command line interface.
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
+ * @version $Id$
*/
public class CvsConnection
{
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/util/CvsLogListener.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/util/CvsLogListener.java?rev=685548&r1=685547&r2=685548&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/util/CvsLogListener.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/util/CvsLogListener.java Wed Aug 13 06:35:49 2008
@@ -25,8 +25,9 @@
/**
* A basic implementation of a CVS listener. It merely saves up
* into StringBuffers the stdout and stderr printstreams.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
+ * @version $Id$
*/
public class CvsLogListener extends CVSAdapter
{
@@ -35,12 +36,12 @@
private StringBuffer stderr = new StringBuffer();
/**
- * Called when the server wants to send a message to be displayed to the
- * user. The message is only for information purposes and clients can
- * choose to ignore these messages if they wish.
- *
- * @param e the event
- */
+ * Called when the server wants to send a message to be displayed to the
+ * user. The message is only for information purposes and clients can
+ * choose to ignore these messages if they wish.
+ *
+ * {@inheritDoc}
+ */
public void messageSent(MessageEvent e)
{
String line = e.getMessage();
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/util/ExtConnection.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/util/ExtConnection.java?rev=685548&r1=685547&r2=685548&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/util/ExtConnection.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/util/ExtConnection.java Wed Aug 13 06:35:49 2008
@@ -86,6 +86,7 @@
}
}
+ /** {@inheritDoc} */
public void open()
throws AuthenticationException, CommandAbortedException
{
@@ -163,6 +164,7 @@
setOutputStream( new LoggedDataOutputStream( session.getStdin() ) );
}
+ /** {@inheritDoc} */
public void verify()
throws AuthenticationException
{
@@ -225,28 +227,33 @@
setOutputStream( null );
}
+ /** {@inheritDoc} */
public void close()
throws IOException
{
closeConnection();
}
+ /** {@inheritDoc} */
public boolean isOpen()
{
return connection != null;
}
+ /** {@inheritDoc} */
public int getPort()
{
return port;
}
+ /** {@inheritDoc} */
public void modifyInputStream( ConnectionModifier modifier )
throws IOException
{
modifier.modifyInputStream( getInputStream() );
}
+ /** {@inheritDoc} */
public void modifyOutputStream( ConnectionModifier modifier )
throws IOException
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.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/AbstractCvsScmTest.java?rev=685548&r1=685547&r2=685548&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/AbstractCvsScmTest.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/AbstractCvsScmTest.java Wed Aug 13 06:35:49 2008
@@ -32,6 +32,7 @@
public abstract class AbstractCvsScmTest
extends ScmTestCase
{
+ /** {@inheritDoc} */
public void setUp()
throws Exception
{
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/branch/CvsBranchCommandTckTest.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/branch/CvsBranchCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/branch/CvsBranchCommandTckTest.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/branch/CvsBranchCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -31,16 +31,19 @@
public class CvsBranchCommandTckTest
extends BranchCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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/changelog/CvsChangeLogCommandTest.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/changelog/CvsChangeLogCommandTest.java?rev=685548&r1=685547&r2=685548&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/changelog/CvsChangeLogCommandTest.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/changelog/CvsChangeLogCommandTest.java Wed Aug 13 06:35:49 2008
@@ -35,6 +35,7 @@
public class CvsChangeLogCommandTest
extends AbstractCvsScmTest
{
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/changelog";
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/checkin/CvsCheckInCommandTckTest.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/checkin/CvsCheckInCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/checkin/CvsCheckInCommandTckTest.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/checkin/CvsCheckInCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -29,16 +29,19 @@
public class CvsCheckInCommandTckTest
extends CheckInCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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/CvsCheckOutCommandTckTest.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/CvsCheckOutCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/CvsCheckOutCommandTckTest.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/CvsCheckOutCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -29,16 +29,19 @@
public class CvsCheckOutCommandTckTest
extends CheckOutCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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=685548&r1=685547&r2=685548&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 Wed Aug 13 06:35:49 2008
@@ -36,6 +36,7 @@
public class CvsCheckoutCommandTest
extends AbstractCvsScmTest
{
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/checkout";
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/diff/CvsDiffCommandTckTest.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/diff/CvsDiffCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/diff/CvsDiffCommandTckTest.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/diff/CvsDiffCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -29,16 +29,19 @@
public class CvsDiffCommandTckTest
extends DiffCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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/status/CvsStatusCommandTckTest.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/status/CvsStatusCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/status/CvsStatusCommandTckTest.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/status/CvsStatusCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -29,16 +29,19 @@
public class CvsStatusCommandTckTest
extends StatusCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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/tag/CvsTagCommandTckTest.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/tag/CvsTagCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/tag/CvsTagCommandTckTest.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/tag/CvsTagCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -31,16 +31,19 @@
public class CvsTagCommandTckTest
extends TagCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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/update/CvsUpdateCommandTckTest.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/update/CvsUpdateCommandTckTest.java?rev=685548&r1=685547&r2=685548&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/update/CvsUpdateCommandTckTest.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/update/CvsUpdateCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -29,16 +29,19 @@
public class CvsUpdateCommandTckTest
extends UpdateCommandTckTest
{
+ /** {@inheritDoc} */
public String getScmUrl()
{
return CvsScmTestUtils.getScmUrl( getRepositoryRoot(), getModule() );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/module";
}
+ /** {@inheritDoc} */
public void initRepo()
throws Exception
{
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/update/CvsUpdateCommandTest.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/update/CvsUpdateCommandTest.java?rev=685548&r1=685547&r2=685548&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/update/CvsUpdateCommandTest.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/update/CvsUpdateCommandTest.java Wed Aug 13 06:35:49 2008
@@ -46,6 +46,7 @@
private File assertionDirectory;
+ /** {@inheritDoc} */
public void setUp()
throws Exception
{
@@ -60,6 +61,7 @@
CvsScmTestUtils.initRepo( repository, workingDirectory, assertionDirectory );
}
+ /** {@inheritDoc} */
protected String getModule()
{
return "test-repo/update";
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=685548&r1=685547&r2=685548&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 Aug 13 06:35:49 2008
@@ -49,7 +49,7 @@
/**
* SCM Provider for git
- *
+ *
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -73,11 +73,13 @@
// ScmProvider Implementation
// ----------------------------------------------------------------------
+ /** {@inheritDoc} */
public String getScmSpecificFilename()
{
return ".git";
}
+ /** {@inheritDoc} */
public ScmProviderRepository makeProviderScmRepository( String scmSpecificUrl, char delimiter )
throws ScmRepositoryException
{
@@ -91,10 +93,7 @@
return result.repository;
}
- /**
- * This creates a local ScmProviderRepository for the given path
- * @see org.apache.maven.scm.provider.AbstractScmProvider#makeProviderScmRepository(java.io.File)
- */
+ /** {@inheritDoc} */
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
@@ -127,6 +126,7 @@
protected abstract String getRepositoryURL( File path )
throws ScmException;
+ /** {@inheritDoc} */
public List validateScmUrl( String scmSpecificUrl, char delimiter )
{
List messages = new ArrayList();
@@ -141,6 +141,7 @@
return messages;
}
+ /** {@inheritDoc} */
public String getScmType()
{
return "git";
@@ -223,9 +224,7 @@
protected abstract GitCommand getAddCommand();
- /**
- * @see AbstractScmProvider#add(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public AddScmResult add( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -234,9 +233,7 @@
protected abstract GitCommand getBranchCommand();
- /**
- * @see AbstractScmProvider#branch(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
protected BranchScmResult branch( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -246,9 +243,7 @@
protected abstract GitCommand getChangeLogCommand();
- /**
- * @see AbstractScmProvider#changelog(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -258,9 +253,7 @@
protected abstract GitCommand getCheckInCommand();
- /**
- * @see AbstractScmProvider#checkin(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public CheckInScmResult checkin( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -270,9 +263,7 @@
protected abstract GitCommand getCheckOutCommand();
- /**
- * @see AbstractScmProvider#checkout(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -282,9 +273,7 @@
protected abstract GitCommand getDiffCommand();
- /**
- * @see AbstractScmProvider#diff(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public DiffScmResult diff( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -293,6 +282,7 @@
protected abstract GitCommand getExportCommand();
+ /** {@inheritDoc} */
protected ExportScmResult export( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -302,9 +292,7 @@
protected abstract GitCommand getRemoveCommand();
- /**
- * @see AbstractScmProvider#remove(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -313,9 +301,7 @@
protected abstract GitCommand getStatusCommand();
- /**
- * @see AbstractScmProvider#status(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -324,9 +310,7 @@
protected abstract GitCommand getTagCommand();
- /**
- * @see AbstractScmProvider#tag(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public TagScmResult tag( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -335,9 +319,7 @@
protected abstract GitCommand getUpdateCommand();
- /**
- * @see AbstractScmProvider#update(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -355,9 +337,7 @@
protected abstract GitCommand getListCommand();
- /**
- * @see AbstractScmProvider#list(ScmProviderRepository,ScmFileSet,CommandParameters)
- */
+ /** {@inheritDoc} */
public ListScmResult list( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
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=685548&r1=685547&r2=685548&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/apache/maven/scm/provider/git/GitChangeSet.java Wed Aug 13 06:35:49 2008
@@ -51,6 +51,7 @@
super( date, comment, author, files );
}
+ /** {@inheritDoc} */
public boolean containsFilename( String filename, ScmProviderRepository repository )
{
GitScmProviderRepository repo = (GitScmProviderRepository) repository;
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/diff/GitDiffConsumer.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/command/diff/GitDiffConsumer.java?rev=685548&r1=685547&r2=685548&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/diff/GitDiffConsumer.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/command/diff/GitDiffConsumer.java Wed Aug 13 06:35:49 2008
@@ -35,47 +35,48 @@
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
*/
public class GitDiffConsumer
implements StreamConsumer
{
- // diff --git a/readme.txt b/readme.txt
- // index fea1611..9e131cf 100644
- // --- a/readme.txt
- // +++ b/readme.txt
- // @@ -1 +1 @@
- // -/readme.txt
- // \ No newline at end of file
- // +new version of /readme.txt
+ // diff --git a/readme.txt b/readme.txt
+ // index fea1611..9e131cf 100644
+ // --- a/readme.txt
+ // +++ b/readme.txt
+ // @@ -1 +1 @@
+ // -/readme.txt
+ // \ No newline at end of file
+ // +new version of /readme.txt
- /**
- * patern matches the index line of the diff comparison
- * paren.1 matches the first file
- * paren.2 matches the 2nd file
- */
- private final static String DIFF_FILES_PATTERN = "^diff --git\\sa/(.*)\\sb/(.*)";
+ /**
+ * patern matches the index line of the diff comparison
+ * paren.1 matches the first file
+ * paren.2 matches the 2nd file
+ */
+ private static final String DIFF_FILES_PATTERN = "^diff --git\\sa/(.*)\\sb/(.*)";
+
+ private static final String START_REVISION_TOKEN = "---";
- private final static String START_REVISION_TOKEN = "---";
+ private static final String END_REVISION_TOKEN = "+++";
- private final static String END_REVISION_TOKEN = "+++";
+ private static final String ADDED_LINE_TOKEN = "+";
- private final static String ADDED_LINE_TOKEN = "+";
+ private static final String REMOVED_LINE_TOKEN = "-";
- private final static String REMOVED_LINE_TOKEN = "-";
+ private static final String UNCHANGED_LINE_TOKEN = " ";
- private final static String UNCHANGED_LINE_TOKEN = " ";
+ private static final String CHANGE_SEPARATOR_TOKEN = "@@";
- private final static String CHANGE_SEPARATOR_TOKEN = "@@";
+ private static final String NO_NEWLINE_TOKEN = "\\ No newline at end of file";
- private final static String NO_NEWLINE_TOKEN = "\\ No newline at end of file";
+ private static final String INDEX_LINE_TOKEN = "index ";
- private final static String INDEX_LINE_TOKEN = "index ";
+ private static final String NEW_FILE_MODE_TOKEN = "new file mode ";
+
+ private static final String DELETED_FILE_MODE_TOKEN = "deleted file mode ";
- private final static String NEW_FILE_MODE_TOKEN = "new file mode ";
-
- private final static String DELETED_FILE_MODE_TOKEN = "deleted file mode ";
-
private ScmLogger logger;
private String currentFile;
@@ -102,14 +103,14 @@
this.logger = logger;
try
{
- filesRegexp = new RE( DIFF_FILES_PATTERN );
+ filesRegexp = new RE( DIFF_FILES_PATTERN );
}
catch ( RESyntaxException ex )
{
throw new RuntimeException(
"INTERNAL ERROR: Could not create regexp to parse git log file. This shouldn't happen. Something is probably wrong with the oro installation.",
ex );
- }
+ }
}
@@ -117,6 +118,7 @@
// StreamConsumer Implementation
// ----------------------------------------------------------------------
+ /** {@inheritDoc} */
public void consumeLine( String line )
{
if ( filesRegexp.match(line) )
@@ -146,8 +148,8 @@
// skip, though could parse to verify start revision and end revision
patch.append( line ).append( "\n" );
}
- else if ( line.startsWith( NEW_FILE_MODE_TOKEN ) ||
- line.startsWith( DELETED_FILE_MODE_TOKEN ))
+ else if ( line.startsWith( NEW_FILE_MODE_TOKEN ) ||
+ line.startsWith( DELETED_FILE_MODE_TOKEN ))
{
// skip, though could parse to verify file mode
patch.append( line ).append( "\n" );
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
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/command/info/GitInfoItem.java?rev=685548&r1=685547&r2=685548&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-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java Wed Aug 13 06:35:49 2008
@@ -21,8 +21,7 @@
/**
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- * <p/>
- * $Id$
+ * @version $Id$
*/
public class GitInfoItem
{
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/GitInfoScmResult.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/command/info/GitInfoScmResult.java?rev=685548&r1=685547&r2=685548&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/GitInfoScmResult.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/command/info/GitInfoScmResult.java Wed Aug 13 06:35:49 2008
@@ -26,8 +26,7 @@
/**
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- * <p/>
- * $Id$
+ * @version $Id$
*/
public class GitInfoScmResult
extends ScmResult
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/repository/GitScmProviderRepository.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/repository/GitScmProviderRepository.java?rev=685548&r1=685547&r2=685548&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/repository/GitScmProviderRepository.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/repository/GitScmProviderRepository.java Wed Aug 13 06:35:49 2008
@@ -32,29 +32,29 @@
/** */
private String url;
- /**
+ /**
* the protocol to use
*/
private String protocol;
/** use local file as transport*/
- public final static String PROTOCOL_FILE = "file";
+ public static final String PROTOCOL_FILE = "file";
/** use gits internal protocol */
- public final static String PROTOCOL_GIT = "git";
+ public static final String PROTOCOL_GIT = "git";
/** use secure shell protocol */
- public final static String PROTOCOL_SSH = "ssh";
+ public static final String PROTOCOL_SSH = "ssh";
/** use the standard port 80 http protocol */
- public final static String PROTOCOL_HTTP = "http";
+ public static final String PROTOCOL_HTTP = "http";
/** use the standard port 443 https protocol */
- public final static String PROTOCOL_HTTPS = "https";
+ public static final String PROTOCOL_HTTPS = "https";
/** use rsync for retrieving the data
* TODO implement! */
- public final static String PROTOCOL_RSYNC = "rsync";
+ public static final String PROTOCOL_RSYNC = "rsync";
public GitScmProviderRepository( String url )
@@ -143,29 +143,29 @@
urlPath = urlPath.substring( indexAt + 1 );
- if ( PROTOCOL_SSH.equals( getProtocol() ) )
+ if ( PROTOCOL_SSH.equals( getProtocol() ) )
{
StringBuffer urlSb = new StringBuffer( getProtocol() );
-
+
urlSb.append( "://" );
-
- if ( getUser() != null )
+
+ if ( getUser() != null )
{
urlSb.append( getUser() );
-
+
if ( getPassword() != null )
{
urlSb.append( ':' ).append( getPassword() );
}
-
+
urlSb.append( '@' );
}
-
+
urlSb.append( urlPath );
-
+
this.url = urlSb.toString();
}
- else
+ else
{
this.url = getProtocol() + "://" + urlPath;
}
@@ -197,15 +197,11 @@
{
setHost( hostPort );
}
-
+
}
}
- /**
- * A ScmProviderRepository like this but with the parent url (stripping the last directory)
- *
- * @return the parent repository or <code>null</null> if this is the top level repository
- */
+ /** {@inheritDoc} */
public ScmProviderRepository getParent()
{
String newUrl = getUrl().substring( getProtocol().length() );
@@ -231,9 +227,7 @@
return new GitScmProviderRepository( getProtocol() + newUrl, getUser(), getPassword() );
}
- /**
- * Get the relative path from the ancestor to this repository
- */
+ /** {@inheritDoc} */
public String getRelativePath( ScmProviderRepository ancestor )
{
if ( ancestor instanceof GitScmProviderRepository )
@@ -250,6 +244,7 @@
return null;
}
+ /** {@inheritDoc} */
public String toString()
{
return getUrl();
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-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java?rev=685548&r1=685547&r2=685548&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/GitExeScmProvider.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/GitExeScmProvider.java Wed Aug 13 06:35:49 2008
@@ -47,74 +47,85 @@
public class GitExeScmProvider
extends AbstractGitScmProvider
{
+ /** {@inheritDoc} */
protected GitCommand getAddCommand()
{
return new GitAddCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getBranchCommand()
{
return new GitBranchCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getChangeLogCommand()
{
return new GitChangeLogCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getCheckInCommand()
{
return new GitCheckInCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getCheckOutCommand()
{
return new GitCheckOutCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getDiffCommand()
{
return new GitDiffCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getExportCommand()
{
return null; //X TODO
}
+ /** {@inheritDoc} */
protected GitCommand getRemoveCommand()
{
return new GitRemoveCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getStatusCommand()
{
return new GitStatusCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getTagCommand()
{
return new GitTagCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getUpdateCommand()
{
return new GitUpdateCommand();
}
+ /** {@inheritDoc} */
protected GitCommand getListCommand()
{
return null; //X TODO
}
+ /** {@inheritDoc} */
public GitCommand getInfoCommand()
{
return null; //X TODO
}
- /**
- * Implements retrieving the repository url for a certain path using the 'git info' command.
- */
+ /** {@inheritDoc} */
protected String getRepositoryURL( File path )
throws ScmException
{
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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java?rev=685548&r1=685547&r2=685548&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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java Wed Aug 13 06:35:49 2008
@@ -30,6 +30,7 @@
/**
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
+ * @version $Id$
*/
public abstract class AbstractFileCheckingConsumer
implements StreamConsumer
@@ -50,6 +51,7 @@
this.workingDirectory = workingDirectory;
}
+ /** {@inheritDoc} */
public final void consumeLine( String line )
{
if ( line.length() <= 3 )
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/GitCommandLineUtils.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/GitCommandLineUtils.java?rev=685548&r1=685547&r2=685548&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/GitCommandLineUtils.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/GitCommandLineUtils.java Wed Aug 13 06:35:49 2008
@@ -35,6 +35,7 @@
*
* @author Brett Porter
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
*/
public class GitCommandLineUtils
{
@@ -49,18 +50,18 @@
{
File f = (File) i.next();
String relativeFile = f.getPath();
-
+
if ( f.getAbsolutePath().startsWith( cl.getWorkingDirectory().getAbsolutePath() ))
{
// so we can omit the starting characters
relativeFile = relativeFile.substring( cl.getWorkingDirectory().getAbsolutePath().length() );
-
+
if ( relativeFile.startsWith( File.separator ) )
{
relativeFile = relativeFile.substring( File.separator.length() );
}
}
-
+
// no setFile() since this screws up the working directory!
cl.createArgument().setValue( relativeFile );
}
@@ -69,15 +70,15 @@
public static Commandline getBaseGitCommandLine( File workingDirectory, String command )
{
- if ( command == null || command.length() == 0)
+ if ( command == null || command.length() == 0)
{
return null;
}
-
+
Commandline cl = new Commandline();
cl.setExecutable( "git" );
-
+
cl.createArgument().setValue( command );
cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
@@ -92,7 +93,7 @@
logger.info( "Executing: " + cl );
logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
- int exitCode;
+ int exitCode;
try
{
exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
@@ -112,7 +113,7 @@
logger.info( "Executing: " + cl );
logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
- int exitCode;
+ int exitCode;
try
{
exitCode = CommandLineUtils.executeCommandLine( cl, stdout, stderr );
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/add/GitAddCommand.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/add/GitAddCommand.java?rev=685548&r1=685547&r2=685548&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/add/GitAddCommand.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/add/GitAddCommand.java Wed Aug 13 06:35:49 2008
@@ -41,15 +41,17 @@
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
*/
public class GitAddCommand extends AbstractAddCommand implements GitCommand
{
+ /** {@inheritDoc} */
protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
boolean binary )
throws ScmException
{
GitScmProviderRepository repository = (GitScmProviderRepository) repo;
-
+
if ( fileSet.getFileList().isEmpty() )
{
throw new ScmException( "You must provide at least one file/directory to add" );
@@ -67,12 +69,12 @@
{
return new AddScmResult( cl.toString(), "The git-add command failed.", stderr.getOutput(), false );
}
-
+
// git-add doesn't show single files, but only summary :/
// so we must run git-status and consume the output
// borrow a few things from the git-status command
Commandline clStatus = GitStatusCommand.createCommandLine( repository, fileSet );
-
+
GitStatusConsumer statusConsumer = new GitStatusConsumer( getLogger(), fileSet.getBasedir() );
exitCode = GitCommandLineUtils.execute( clStatus, statusConsumer, stderr, getLogger() );
if ( exitCode != 0 )
@@ -82,22 +84,22 @@
}
List changedFiles = new ArrayList();
-
+
// rewrite all detected files to now have status 'checked_in'
for ( Iterator it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); )
{
ScmFile scmfile = (ScmFile) it.next();
-
+
// if a specific fileSet is given, we have to check if the file is really tracked
for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); )
{
File f = (File) itfl.next();
- if ( f.toString().equals( scmfile.getPath() ))
+ if ( f.toString().equals( scmfile.getPath() ))
{
- changedFiles.add( scmfile );
+ changedFiles.add( scmfile );
}
}
- }
+ }
return new AddScmResult( cl.toString(), changedFiles );
}
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/branch/GitBranchCommand.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/branch/GitBranchCommand.java?rev=685548&r1=685547&r2=685548&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/branch/GitBranchCommand.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/branch/GitBranchCommand.java Wed Aug 13 06:35:49 2008
@@ -39,9 +39,11 @@
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
*/
public class GitBranchCommand extends AbstractBranchCommand implements GitCommand
{
+ /** {@inheritDoc} */
public ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch,
String message )
throws ScmException
@@ -69,10 +71,10 @@
{
return new BranchScmResult( cl.toString(), "The git-branch command failed.", stderr.getOutput(), false );
}
-
+
// and now push the branch to the origin repository
Commandline clPush = createPushCommandLine( repository, fileSet, branch );
-
+
exitCode = GitCommandLineUtils.execute( clPush, stdout, stderr, getLogger() );
if ( exitCode != 0 )
{
@@ -81,11 +83,11 @@
// as last action we search for the branched files
GitListConsumer listConsumer = new GitListConsumer( getLogger()
- , fileSet.getBasedir()
- , ScmFileStatus.TAGGED);
+ , fileSet.getBasedir()
+ , ScmFileStatus.TAGGED);
Commandline clList = GitListCommand.createCommandLine( repository, fileSet.getBasedir() );
-
+
exitCode = GitCommandLineUtils.execute( clList, listConsumer, stderr, getLogger() );
if ( exitCode != 0 )
{
@@ -108,17 +110,17 @@
return cl;
}
-
+
public static Commandline createPushCommandLine( GitScmProviderRepository repository, ScmFileSet fileSet,
String branch )
- throws ScmException
- {
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push");
-
- cl.createArgument().setValue( "origin" );
- cl.createArgument().setValue( branch );
-
- return cl;
- }
+ throws ScmException
+ {
+ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push");
+
+ cl.createArgument().setValue( "origin" );
+ cl.createArgument().setValue( branch );
+
+ 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/changelog/GitChangeLogCommand.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/changelog/GitChangeLogCommand.java?rev=685548&r1=685547&r2=685548&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/changelog/GitChangeLogCommand.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/changelog/GitChangeLogCommand.java Wed Aug 13 06:35:49 2008
@@ -47,8 +47,9 @@
extends AbstractChangeLogCommand
implements GitCommand
{
- private final static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss Z";
+ private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss Z";
+ /** {@inheritDoc} */
protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
ScmVersion startVersion, ScmVersion endVersion,
String datePattern )
@@ -57,6 +58,7 @@
return executeChangeLogCommand( repo, fileSet, null, null, null, datePattern, startVersion, endVersion );
}
+ /** {@inheritDoc} */
protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
Date startDate, Date endDate, ScmBranch branch,
String datePattern )
@@ -102,20 +104,20 @@
{
SimpleDateFormat dateFormat = new SimpleDateFormat( DATE_FORMAT );
dateFormat.setTimeZone( TimeZone.getTimeZone( "GMT" ) );
-
+
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "log" );
if ( startVersion != null ) {
cl.createArgument().setValue( "--since=" + StringUtils.escape( startVersion.getName() ) );
}
- else
+ else
{
if ( startDate != null )
{
cl.createArgument().setValue( "--since=" + StringUtils.escape( dateFormat.format( startDate ) ) );
}
}
-
+
if ( endVersion != null ) {
cl.createArgument().setValue( "--until=" + StringUtils.escape( endVersion.getName() ) );
}
@@ -126,9 +128,9 @@
cl.createArgument().setValue( "--until=" + StringUtils.escape( dateFormat.format( endDate ) ) );
}
}
-
+
cl.createArgument().setValue( "--date=iso" );
-
+
return cl;
}
}