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/09/01 17:29:30 UTC
svn commit: r690997 [2/2] - in /maven/scm/trunk/maven-scm-providers:
maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/
maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/comm...
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java Mon Sep 1 08:29:28 2008
@@ -97,24 +97,24 @@
command.setExecutable( ssDir + VssConstants.SS_EXE );
- command.createArgument().setValue( VssConstants.COMMAND_DIFF );
+ command.createArg().setValue( VssConstants.COMMAND_DIFF );
- command.createArgument().setValue( VssConstants.PROJECT_PREFIX + repo.getProject() );
+ command.createArg().setValue( VssConstants.PROJECT_PREFIX + repo.getProject() );
//User identification to get access to vss repository
if ( repo.getUserPassword() != null )
{
- command.createArgument().setValue( VssConstants.FLAG_LOGIN + repo.getUserPassword() );
+ command.createArg().setValue( VssConstants.FLAG_LOGIN + repo.getUserPassword() );
}
//Display the history of an entire project list
- command.createArgument().setValue( VssConstants.FLAG_RECURSION );
+ command.createArg().setValue( VssConstants.FLAG_RECURSION );
//Ignore: Do not ask for input under any circumstances.
- command.createArgument().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
+ command.createArg().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
// TODO: Get Labled Version
- // command.createArgument().setValue( VssConstants.FLAG_VERSION_LABEL );
+ // command.createArg().setValue( VssConstants.FLAG_VERSION_LABEL );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java Mon Sep 1 08:29:28 2008
@@ -103,31 +103,31 @@
command.setExecutable( ssDir + VssConstants.SS_EXE );
- command.createArgument().setValue( VssConstants.COMMAND_GET );
+ command.createArg().setValue( VssConstants.COMMAND_GET );
- command.createArgument().setValue( VssConstants.PROJECT_PREFIX + repo.getProject() );
+ command.createArg().setValue( VssConstants.PROJECT_PREFIX + repo.getProject() );
//User identification to get access to vss repository
if ( repo.getUserPassword() != null )
{
- command.createArgument().setValue( VssConstants.FLAG_LOGIN + repo.getUserPassword() );
+ command.createArg().setValue( VssConstants.FLAG_LOGIN + repo.getUserPassword() );
}
//Display the history of an entire project list
- command.createArgument().setValue( VssConstants.FLAG_RECURSION );
+ command.createArg().setValue( VssConstants.FLAG_RECURSION );
//Ignore: Do not ask for input under any circumstances.
- command.createArgument().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
+ command.createArg().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
// FIXME Update command only works if there is no file checked out
// or no file is dirty locally. It's better than overwriting
// checked out files
//Ignore: Do not touch local writable files.
- command.createArgument().setValue( VssConstants.FLAG_SKIP_WRITABLE );
-// command.createArgument().setValue( VssConstants.FLAG_REPLACE_WRITABLE );
+ command.createArg().setValue( VssConstants.FLAG_SKIP_WRITABLE );
+// command.createArg().setValue( VssConstants.FLAG_REPLACE_WRITABLE );
// ToDo: Get Labled Version
- // command.createArgument().setValue( VssConstants.FLAG_VERSION_LABEL );
+ // command.createArg().setValue( VssConstants.FLAG_VERSION_LABEL );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java Mon Sep 1 08:29:28 2008
@@ -49,7 +49,7 @@
cl.setExecutable( "cvs" );
- cl.createArgument().setValue( "-v" );
+ cl.createArg().setValue( "-v" );
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -97,21 +97,21 @@
if ( Boolean.getBoolean( "maven.scm.cvs.use_compression" ) )
{
- cl.createArgument().setValue( "-z" + System.getProperty( "maven.scm.cvs.compression_level", "3" ) );
+ cl.createArg().setValue( "-z" + System.getProperty( "maven.scm.cvs.compression_level", "3" ) );
}
else if ( settings.getCompressionLevel() > 0 )
{
- cl.createArgument().setValue( "-z" + settings.getCompressionLevel() );
+ cl.createArg().setValue( "-z" + settings.getCompressionLevel() );
}
if ( !settings.isUseCvsrc() )
{
- cl.createArgument().setValue( "-f" ); // don't use ~/.cvsrc
+ cl.createArg().setValue( "-f" ); // don't use ~/.cvsrc
}
if ( settings.isTraceCvsCommand() )
{
- cl.createArgument().setValue( "-t" );
+ cl.createArg().setValue( "-t" );
}
if ( !StringUtils.isEmpty( settings.getTemporaryFilesDirectory() ) )
@@ -123,9 +123,9 @@
tempDir.mkdirs();
}
- cl.createArgument().setValue( "-T" );
+ cl.createArg().setValue( "-T" );
- cl.createArgument().setValue( tempDir.getAbsolutePath() );
+ cl.createArg().setValue( tempDir.getAbsolutePath() );
}
if ( settings.getCvsVariables().size() > 0 )
@@ -134,23 +134,23 @@
{
String key = (String) e.nextElement();
String value = settings.getCvsVariables().getProperty( key );
- cl.createArgument().setValue( "-s" );
- cl.createArgument().setValue( key + "=" + value );
+ cl.createArg().setValue( "-s" );
+ cl.createArg().setValue( key + "=" + value );
}
}
if ( addCvsRoot )
{
- cl.createArgument().setValue( "-d" );
+ cl.createArg().setValue( "-d" );
- cl.createArgument().setValue( repo.getCvsRoot() );
+ cl.createArg().setValue( repo.getCvsRoot() );
}
- cl.createArgument().setLine( options );
+ cl.createArg().setLine( options );
- cl.createArgument().setValue( "-q" );
+ cl.createArg().setValue( "-q" );
- cl.createArgument().setValue( commandName );
+ cl.createArg().setValue( commandName );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/AbstractCvsAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/AbstractCvsAddCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/AbstractCvsAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/AbstractCvsAddCommand.java Mon Sep 1 08:29:28 2008
@@ -56,14 +56,14 @@
if ( binary )
{
- cl.createArgument().setValue( "-kb" );
+ cl.createArg().setValue( "-kb" );
}
if ( message != null && message.length() > 0 )
{
- cl.createArgument().setValue( "-m" );
+ cl.createArg().setValue( "-m" );
- cl.createArgument().setValue( "\"" + message + "\"" );
+ cl.createArg().setValue( "\"" + message + "\"" );
}
File[] files = fileSet.getFiles();
@@ -74,7 +74,7 @@
{
String path = files[i].getPath().replace( '\\', '/' );
- cl.createArgument().setValue( path );
+ cl.createArg().setValue( path );
addedFiles.add( new ScmFile( path, ScmFileStatus.ADDED ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/branch/AbstractCvsBranchCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/branch/AbstractCvsBranchCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/branch/AbstractCvsBranchCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/branch/AbstractCvsBranchCommand.java Mon Sep 1 08:29:28 2008
@@ -47,13 +47,13 @@
Commandline cl = CvsCommandUtils.getBaseCommand( "tag", repository, fileSet, false );
- cl.createArgument().setValue( "-b" );
+ cl.createArg().setValue( "-b" );
- cl.createArgument().setValue( "-F" );
+ cl.createArg().setValue( "-F" );
- cl.createArgument().setValue( "-c" );
+ cl.createArg().setValue( "-c" );
- cl.createArgument().setValue( branchName );
+ cl.createArg().setValue( branchName );
getLogger().info( "Executing: " + cl );
getLogger().info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java Mon Sep 1 08:29:28 2008
@@ -87,14 +87,14 @@
dateRange = outputDate.format( startDate ) + "<" + outputDate.format( endDate );
}
- cl.createArgument().setValue( "-d" );
+ cl.createArg().setValue( "-d" );
addDateRangeParameter( cl, dateRange );
}
if ( branch != null && StringUtils.isNotEmpty( branch.getName() ) )
{
- cl.createArgument().setValue( "-r" + branch.getName() );
+ cl.createArg().setValue( "-r" + branch.getName() );
}
if ( startVersion != null && StringUtils.isNotEmpty( startVersion.getName() ) )
@@ -102,7 +102,7 @@
String param = "-r" + startVersion.getName() + ":"
+ ( endVersion != null && StringUtils.isNotEmpty( endVersion.getName() ) ? endVersion.getName() : "" );
- cl.createArgument().setValue( param );
+ cl.createArg().setValue( param );
}
getLogger().info( "Executing: " + cl );
@@ -127,11 +127,11 @@
// See http://jira.codehaus.org/browse/SCM-187
if ( System.getProperty( "os.name" ).toLowerCase().indexOf( "windows" ) > -1 )
{
- cl.createArgument().setValue( "\"" + dateRange + "\"" );
+ cl.createArg().setValue( "\"" + dateRange + "\"" );
}
else
{
- cl.createArgument().setValue( dateRange );
+ cl.createArg().setValue( dateRange );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java Mon Sep 1 08:29:28 2008
@@ -55,12 +55,12 @@
if ( version != null && !StringUtils.isEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-r" + version.getName() );
+ cl.createArg().setValue( "-r" + version.getName() );
}
- cl.createArgument().setValue( "-R" );
+ cl.createArg().setValue( "-R" );
- cl.createArgument().setValue( "-F" );
+ cl.createArg().setValue( "-F" );
File messageFile;
@@ -75,13 +75,13 @@
throw new ScmException( "Error while making a temporary commit message file." );
}
- cl.createArgument().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( messageFile.getAbsolutePath() );
File[] files = fileSet.getFiles();
for ( int i = 0; i < files.length; i++ )
{
- cl.createArgument().setValue( files[i].getPath().replace( '\\', '/' ) );
+ cl.createArg().setValue( files[i].getPath().replace( '\\', '/' ) );
}
getLogger().info( "Executing: " + cl );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/AbstractCvsCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/AbstractCvsCheckOutCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/AbstractCvsCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/AbstractCvsCheckOutCommand.java Mon Sep 1 08:29:28 2008
@@ -68,15 +68,15 @@
if ( version != null && !StringUtils.isEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( version.getName() );
}
- cl.createArgument().setValue( "-d" );
+ cl.createArg().setValue( "-d" );
- cl.createArgument().setValue( fileSet.getBasedir().getName() );
+ cl.createArg().setValue( fileSet.getBasedir().getName() );
- cl.createArgument().setValue( repository.getModule() );
+ cl.createArg().setValue( repository.getModule() );
getLogger().info( "Executing: " + cl );
getLogger().info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java Mon Sep 1 08:29:28 2008
@@ -48,23 +48,23 @@
Commandline cl = CvsCommandUtils.getBaseCommand( "diff", repository, fileSet );
- cl.createArgument().setValue( "-u" );
+ cl.createArg().setValue( "-u" );
if ( isSupportNewFileParameter() )
{
- cl.createArgument().setValue( "-N" );
+ cl.createArg().setValue( "-N" );
}
if ( startRevision != null && StringUtils.isNotEmpty( startRevision.getName() ) )
{
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( startRevision.getName() );
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( startRevision.getName() );
}
if ( endRevision != null && StringUtils.isNotEmpty( endRevision.getName() ) )
{
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( endRevision.getName() );
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( endRevision.getName() );
}
getLogger().info( "Executing: " + cl );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/export/AbstractCvsExportCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/export/AbstractCvsExportCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/export/AbstractCvsExportCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/export/AbstractCvsExportCommand.java Mon Sep 1 08:29:28 2008
@@ -48,21 +48,21 @@
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-r" + version.getName() );
+ cl.createArg().setValue( "-r" + version.getName() );
}
else
{
- cl.createArgument().setValue( "-rHEAD" );
+ cl.createArg().setValue( "-rHEAD" );
}
if ( StringUtils.isNotEmpty( outputDirectory ) )
{
- cl.createArgument().setValue( "-d" );
+ cl.createArg().setValue( "-d" );
- cl.createArgument().setValue( outputDirectory );
+ cl.createArg().setValue( outputDirectory );
}
- cl.createArgument().setValue( repository.getModule() );
+ cl.createArg().setValue( repository.getModule() );
getLogger().info( "Executing: " + cl );
getLogger().info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java Mon Sep 1 08:29:28 2008
@@ -53,16 +53,16 @@
if ( version != null && !StringUtils.isEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( version.getName() );
}
- cl.createArgument().setValue( "-d" );
- cl.createArgument().setValue( "-e" ); // szakusov: to fix "Unknown file status" problem
+ cl.createArg().setValue( "-d" );
+ cl.createArg().setValue( "-e" ); // szakusov: to fix "Unknown file status" problem
if ( recursive )
{
- cl.createArgument().setValue( "-R" );
+ cl.createArg().setValue( "-R" );
}
for ( Iterator it = fileSet.getFileList().iterator(); it.hasNext(); )
@@ -73,7 +73,7 @@
{
path = path.substring( 1 );
}
- cl.createArgument().setValue( path );
+ cl.createArg().setValue( path );
}
getLogger().info( "Executing: " + cl );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/AbstractCvsRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/AbstractCvsRemoveCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/AbstractCvsRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/AbstractCvsRemoveCommand.java Mon Sep 1 08:29:28 2008
@@ -53,9 +53,9 @@
Commandline cl = CvsCommandUtils.getBaseCommand( "remove", repository, fileSet );
- cl.createArgument().setValue( "-f" );
+ cl.createArg().setValue( "-f" );
- cl.createArgument().setValue( "-l" );
+ cl.createArg().setValue( "-l" );
File[] files = fileSet.getFiles();
@@ -65,7 +65,7 @@
{
String path = files[i].getPath().replace( '\\', '/' );
- cl.createArgument().setValue( path );
+ cl.createArg().setValue( path );
removedFiles.add( new ScmFile( path, ScmFileStatus.DELETED ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/AbstractCvsStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/AbstractCvsStatusCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/AbstractCvsStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/AbstractCvsStatusCommand.java Mon Sep 1 08:29:28 2008
@@ -45,7 +45,7 @@
Commandline cl = CvsCommandUtils.getBaseCommand( "update", repository, fileSet, "-n" );
- cl.createArgument().setValue( "-d" );
+ cl.createArg().setValue( "-d" );
getLogger().info( "Executing: " + cl );
getLogger().info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java Mon Sep 1 08:29:28 2008
@@ -50,18 +50,18 @@
Commandline cl = CvsCommandUtils.getBaseCommand( "tag", repository, fileSet, false );
- cl.createArgument().setValue( "-F" );
+ cl.createArg().setValue( "-F" );
- cl.createArgument().setValue( "-c" );
+ cl.createArg().setValue( "-c" );
- cl.createArgument().setValue( tag );
+ cl.createArg().setValue( tag );
if ( fileSet.getFileList() != null && !fileSet.getFileList().isEmpty() )
{
for ( Iterator it = fileSet.getFileList().iterator(); it.hasNext(); )
{
File fileName = (File) it.next();
- cl.createArgument().setValue( fileName.toString() );
+ cl.createArg().setValue( fileName.toString() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java Mon Sep 1 08:29:28 2008
@@ -48,11 +48,11 @@
Commandline cl = CvsCommandUtils.getBaseCommand( "update", repository, fileSet, false );
- cl.createArgument().setValue( "-d" );
+ cl.createArg().setValue( "-d" );
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-r" + version.getName() );
+ cl.createArg().setValue( "-r" + version.getName() );
}
getLogger().info( "Executing: " + cl );
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=690997&r1=690996&r2=690997&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 Mon Sep 1 08:29:28 2008
@@ -87,6 +87,6 @@
protected void addDateRangeParameter( Commandline cl, String dateRange )
{
- cl.createArgument().setValue( dateRange );
+ cl.createArg().setValue( dateRange );
}
}
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/GitCommandUtils.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/GitCommandUtils.java?rev=690997&r1=690996&r2=690997&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/GitCommandUtils.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/GitCommandUtils.java Mon Sep 1 08:29:28 2008
@@ -59,8 +59,8 @@
cl.addEnvironment( "GIT_TRACE", settings.getTraceGitCommand() );
}
- cl.createArgument().setLine( options );
- cl.createArgument().setValue( commandName );
+ cl.createArg().setLine( options );
+ cl.createArg().setValue( commandName );
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/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=690997&r1=690996&r2=690997&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 Mon Sep 1 08:29:28 2008
@@ -63,7 +63,7 @@
}
// no setFile() since this screws up the working directory!
- cl.createArgument().setValue( relativeFile );
+ cl.createArg().setValue( relativeFile );
}
}
@@ -79,7 +79,7 @@
cl.setExecutable( "git" );
- cl.createArgument().setValue( command );
+ cl.createArg().setValue( command );
cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
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=690997&r1=690996&r2=690997&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 Mon Sep 1 08:29:28 2008
@@ -106,7 +106,7 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "branch" );
- cl.createArgument().setValue( branch );
+ cl.createArg().setValue( branch );
return cl;
}
@@ -117,8 +117,8 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" );
- cl.createArgument().setValue( "origin" );
- cl.createArgument().setValue( branch );
+ cl.createArg().setValue( "origin" );
+ cl.createArg().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=690997&r1=690996&r2=690997&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 Mon Sep 1 08:29:28 2008
@@ -109,29 +109,29 @@
if ( startVersion != null )
{
- cl.createArgument().setValue( "--since=" + StringUtils.escape( startVersion.getName() ) );
+ cl.createArg().setValue( "--since=" + StringUtils.escape( startVersion.getName() ) );
}
else
{
if ( startDate != null )
{
- cl.createArgument().setValue( "--since=" + StringUtils.escape( dateFormat.format( startDate ) ) );
+ cl.createArg().setValue( "--since=" + StringUtils.escape( dateFormat.format( startDate ) ) );
}
}
if ( endVersion != null )
{
- cl.createArgument().setValue( "--until=" + StringUtils.escape( endVersion.getName() ) );
+ cl.createArg().setValue( "--until=" + StringUtils.escape( endVersion.getName() ) );
}
else
{
if ( endDate != null )
{
- cl.createArgument().setValue( "--until=" + StringUtils.escape( dateFormat.format( endDate ) ) );
+ cl.createArg().setValue( "--until=" + StringUtils.escape( dateFormat.format( endDate ) ) );
}
}
- cl.createArgument().setValue( "--date=iso" );
+ cl.createArg().setValue( "--date=iso" );
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/checkin/GitCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java Mon Sep 1 08:29:28 2008
@@ -187,16 +187,16 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "commit" );
- cl.createArgument().setValue( "--verbose" );
+ cl.createArg().setValue( "--verbose" );
- cl.createArgument().setValue( "-F" );
+ cl.createArg().setValue( "-F" );
- cl.createArgument().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( messageFile.getAbsolutePath() );
if ( fileSet.getFileList().isEmpty() )
{
// commit all tracked files
- cl.createArgument().setValue( "-a" );
+ cl.createArg().setValue( "-a" );
}
else
{
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/checkout/GitCheckOutCommand.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/checkout/GitCheckOutCommand.java?rev=690997&r1=690996&r2=690997&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/checkout/GitCheckOutCommand.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/checkout/GitCheckOutCommand.java Mon Sep 1 08:29:28 2008
@@ -138,7 +138,7 @@
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( version.getName() );
}
return cl;
@@ -151,9 +151,9 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory.getParentFile(), "clone" );
- cl.createArgument().setValue( repository.getUrl() );
+ cl.createArg().setValue( repository.getUrl() );
- cl.createArgument().setFile( workingDirectory );
+ cl.createArg().setFile( workingDirectory );
return cl;
}
@@ -166,23 +166,23 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "pull" );
- cl.createArgument().setValue( repository.getUrl() );
+ cl.createArg().setValue( repository.getUrl() );
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
if ( version instanceof ScmTag )
{
- cl.createArgument().setValue( "tag" );
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( "tag" );
+ cl.createArg().setValue( version.getName() );
}
else
{
- cl.createArgument().setValue( version.getName() + ":" + version.getName() );
+ cl.createArg().setValue( version.getName() + ":" + version.getName() );
}
}
else
{
- cl.createArgument().setValue( "master" );
+ cl.createArg().setValue( "master" );
}
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/diff/GitDiffCommand.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/diff/GitDiffCommand.java?rev=690997&r1=690996&r2=690997&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/diff/GitDiffCommand.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/diff/GitDiffCommand.java Mon Sep 1 08:29:28 2008
@@ -86,16 +86,16 @@
if ( cached )
{
- cl.createArgument().setValue( "--cached" );
+ cl.createArg().setValue( "--cached" );
}
if ( startVersion != null && StringUtils.isNotEmpty( startVersion.getName() ) )
{
- cl.createArgument().setValue( startVersion.getName() );
+ cl.createArg().setValue( startVersion.getName() );
}
if ( endVersion != null && StringUtils.isNotEmpty( endVersion.getName() ) )
{
- cl.createArgument().setValue( endVersion.getName() );
+ cl.createArg().setValue( endVersion.getName() );
}
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/tag/GitTagCommand.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/tag/GitTagCommand.java?rev=690997&r1=690996&r2=690997&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/tag/GitTagCommand.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/tag/GitTagCommand.java Mon Sep 1 08:29:28 2008
@@ -137,11 +137,11 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "tag" );
- cl.createArgument().setValue( "-F" );
- cl.createArgument().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "-F" );
+ cl.createArg().setValue( messageFile.getAbsolutePath() );
// Note: this currently assumes you have the tag base checked out too
- cl.createArgument().setValue( tag );
+ cl.createArg().setValue( tag );
return cl;
}
@@ -151,8 +151,8 @@
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" );
- cl.createArgument().setValue( "origin" );
- cl.createArgument().setValue( tag );
+ cl.createArg().setValue( "origin" );
+ cl.createArg().setValue( tag );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java Mon Sep 1 08:29:28 2008
@@ -80,9 +80,9 @@
cl.setExecutable( "cygpath" );
- cl.createArgument().setValue( "--unix" );
+ cl.createArg().setValue( "--unix" );
- cl.createArgument().setValue( repositoryRoot );
+ cl.createArg().setValue( repositoryRoot );
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java Mon Sep 1 08:29:28 2008
@@ -67,8 +67,8 @@
out.flush();
out.close();
- cl.createArgument().setValue( "--targets" );
- cl.createArgument().setValue( targets.getAbsolutePath() );
+ cl.createArg().setValue( "--targets" );
+ cl.createArg().setValue( targets.getAbsolutePath() );
targets.deleteOnExit();
}
@@ -92,31 +92,31 @@
if ( !StringUtils.isEmpty( System.getProperty( "maven.scm.svn.config_directory" ) ) )
{
- cl.createArgument().setValue( "--config-dir" );
- cl.createArgument().setValue( System.getProperty( "maven.scm.svn.config_directory" ) );
+ cl.createArg().setValue( "--config-dir" );
+ cl.createArg().setValue( System.getProperty( "maven.scm.svn.config_directory" ) );
}
else if ( !StringUtils.isEmpty( SvnUtil.getSettings().getConfigDirectory() ) )
{
- cl.createArgument().setValue( "--config-dir" );
- cl.createArgument().setValue( SvnUtil.getSettings().getConfigDirectory() );
+ cl.createArg().setValue( "--config-dir" );
+ cl.createArg().setValue( SvnUtil.getSettings().getConfigDirectory() );
}
if ( repository != null && !StringUtils.isEmpty( repository.getUser() ) )
{
- cl.createArgument().setValue( "--username" );
+ cl.createArg().setValue( "--username" );
- cl.createArgument().setValue( repository.getUser() );
+ cl.createArg().setValue( repository.getUser() );
}
if ( repository != null && !StringUtils.isEmpty( repository.getPassword() ) )
{
- cl.createArgument().setValue( "--password" );
+ cl.createArg().setValue( "--password" );
- cl.createArgument().setValue( repository.getPassword() );
+ cl.createArg().setValue( repository.getPassword() );
}
if ( SvnUtil.getSettings().isUseNonInteractive() ) {
- cl.createArgument().setValue( "--non-interactive" );
+ cl.createArg().setValue( "--non-interactive" );
}
return cl;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java Mon Sep 1 08:29:28 2008
@@ -98,9 +98,9 @@
cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
- cl.createArgument().setValue( "add" );
+ cl.createArg().setValue( "add" );
- cl.createArgument().setValue( "--non-recursive" );
+ cl.createArg().setValue( "--non-recursive" );
try
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java Mon Sep 1 08:29:28 2008
@@ -151,17 +151,17 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( workingDirectory, repository );
- cl.createArgument().setValue( "copy" );
+ cl.createArg().setValue( "copy" );
- cl.createArgument().setValue( "--file" );
+ cl.createArg().setValue( "--file" );
- cl.createArgument().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( messageFile.getAbsolutePath() );
- cl.createArgument().setValue( "." );
+ cl.createArg().setValue( "." );
// Note: this currently assumes you have the branch base checked out too
String branchUrl = SvnTagBranchUtils.resolveBranchUrl( repository, new ScmBranch( branch ) );
- cl.createArgument().setValue( SvnCommandUtils.fixUrl( branchUrl, repository.getUser() ) );
+ cl.createArg().setValue( SvnCommandUtils.fixUrl( branchUrl, repository.getUser() ) );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java Mon Sep 1 08:29:28 2008
@@ -122,45 +122,45 @@
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( workingDirectory, repository );
- cl.createArgument().setValue( "log" );
+ cl.createArg().setValue( "log" );
- cl.createArgument().setValue( "-v" );
+ cl.createArg().setValue( "-v" );
// TODO: May want to add some kind of support for --stop-on-copy and --limit NUM
if ( startDate != null )
{
- cl.createArgument().setValue( "-r" );
+ cl.createArg().setValue( "-r" );
if ( endDate != null )
{
- cl.createArgument().setValue(
+ cl.createArg().setValue(
"{" + dateFormat.format( startDate ) + "}" + ":" + "{" + dateFormat.format( endDate ) + "}" );
}
else
{
- cl.createArgument().setValue( "{" + dateFormat.format( startDate ) + "}:HEAD" );
+ cl.createArg().setValue( "{" + dateFormat.format( startDate ) + "}:HEAD" );
}
}
if ( startVersion != null )
{
- cl.createArgument().setValue( "-r" );
+ cl.createArg().setValue( "-r" );
if ( endVersion != null )
{
if ( startVersion.getName().equals( endVersion.getName() ) )
{
- cl.createArgument().setValue( startVersion.getName() );
+ cl.createArg().setValue( startVersion.getName() );
}
else
{
- cl.createArgument().setValue( startVersion.getName() + ":" + endVersion.getName() );
+ cl.createArg().setValue( startVersion.getName() + ":" + endVersion.getName() );
}
}
else
{
- cl.createArgument().setValue( startVersion.getName() + ":HEAD" );
+ cl.createArg().setValue( startVersion.getName() + ":HEAD" );
}
}
@@ -170,15 +170,15 @@
// the changelog of that branch, but limit it to paths that also occur in this repository.
if ( branch instanceof ScmTag )
{
- cl.createArgument().setValue( SvnTagBranchUtils.resolveTagUrl( repository, (ScmTag) branch ) );
+ cl.createArg().setValue( SvnTagBranchUtils.resolveTagUrl( repository, (ScmTag) branch ) );
}
else
{
- cl.createArgument().setValue( SvnTagBranchUtils.resolveBranchUrl( repository, branch ) );
+ cl.createArg().setValue( SvnTagBranchUtils.resolveBranchUrl( repository, branch ) );
}
}
- cl.createArgument().setValue( repository.getUrl() );
+ cl.createArg().setValue( repository.getUrl() );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java Mon Sep 1 08:29:28 2008
@@ -116,11 +116,11 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( fileSet.getBasedir(), repository );
- cl.createArgument().setValue( "commit" );
+ cl.createArg().setValue( "commit" );
- cl.createArgument().setValue( "--file" );
+ cl.createArg().setValue( "--file" );
- cl.createArgument().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( messageFile.getAbsolutePath() );
try
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/diff/SvnDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/diff/SvnDiffCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/diff/SvnDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/diff/SvnDiffCommand.java Mon Sep 1 08:29:28 2008
@@ -88,19 +88,19 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( workingDirectory, repository );
- cl.createArgument().setValue( "diff" );
+ cl.createArg().setValue( "diff" );
if ( startVersion != null && StringUtils.isNotEmpty( startVersion.getName() ) )
{
- cl.createArgument().setValue( "-r" );
+ cl.createArg().setValue( "-r" );
if ( endVersion != null && StringUtils.isNotEmpty( endVersion.getName() ) )
{
- cl.createArgument().setValue( startVersion.getName() + ":" + endVersion.getName() );
+ cl.createArg().setValue( startVersion.getName() + ":" + endVersion.getName() );
}
else
{
- cl.createArgument().setValue( startVersion.getName() );
+ cl.createArg().setValue( startVersion.getName() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExeExportCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExeExportCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExeExportCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExeExportCommand.java Mon Sep 1 08:29:28 2008
@@ -117,23 +117,23 @@
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( workingDirectory, repository );
- cl.createArgument().setValue( "export" );
+ cl.createArg().setValue( "export" );
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
if ( version instanceof ScmRevision )
{
- cl.createArgument().setValue( "-r" );
+ cl.createArg().setValue( "-r" );
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( version.getName() );
}
}
- cl.createArgument().setValue( url );
+ cl.createArg().setValue( url );
if ( StringUtils.isNotEmpty( outputSirectory ) )
{
- cl.createArgument().setValue( outputSirectory );
+ cl.createArg().setValue( outputSirectory );
}
return cl;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java Mon Sep 1 08:29:28 2008
@@ -92,18 +92,18 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( TMP_DIR, repository );
- cl.createArgument().setValue( "info" );
+ cl.createArg().setValue( "info" );
if ( recursive )
{
- cl.createArgument().setValue( "--recursive" );
+ cl.createArg().setValue( "--recursive" );
}
if ( StringUtils.isNotEmpty( revision ) )
{
- cl.createArgument().setValue( "-r" );
+ cl.createArg().setValue( "-r" );
- cl.createArgument().setValue( revision );
+ cl.createArg().setValue( revision );
}
Iterator it = fileSet.getFileList().iterator();
@@ -114,11 +114,11 @@
if ( repository == null )
{
- cl.createArgument().setValue( file.getPath() );
+ cl.createArg().setValue( file.getPath() );
}
else
{
- cl.createArgument().setValue( repository.getUrl() + "/" + file.getPath().replace( '\\', '/' ) );
+ cl.createArg().setValue( repository.getUrl() + "/" + file.getPath().replace( '\\', '/' ) );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommand.java Mon Sep 1 08:29:28 2008
@@ -87,20 +87,20 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( TMP_DIR, repository );
- cl.createArgument().setValue( "list" );
+ cl.createArg().setValue( "list" );
if ( recursive )
{
- cl.createArgument().setValue( "--recursive" );
+ cl.createArg().setValue( "--recursive" );
}
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
if ( version instanceof ScmRevision )
{
- cl.createArgument().setValue( "-r" );
+ cl.createArg().setValue( "-r" );
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( version.getName() );
}
}
@@ -110,7 +110,7 @@
{
File file = (File) it.next();
- cl.createArgument().setValue( repository.getUrl() + "/" + file.getPath().replace( '\\', '/' ) );
+ cl.createArg().setValue( repository.getUrl() + "/" + file.getPath().replace( '\\', '/' ) );
}
return cl;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveCommand.java Mon Sep 1 08:29:28 2008
@@ -91,7 +91,7 @@
cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
- cl.createArgument().setValue( "remove" );
+ cl.createArg().setValue( "remove" );
try
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusCommand.java Mon Sep 1 08:29:28 2008
@@ -79,7 +79,7 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( fileSet.getBasedir(), repository );
- cl.createArgument().setValue( "status" );
+ cl.createArg().setValue( "status" );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java Mon Sep 1 08:29:28 2008
@@ -166,17 +166,17 @@
{
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( workingDirectory, repository );
- cl.createArgument().setValue( "copy" );
+ cl.createArg().setValue( "copy" );
- cl.createArgument().setValue( "--file" );
+ cl.createArg().setValue( "--file" );
- cl.createArgument().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( messageFile.getAbsolutePath() );
- cl.createArgument().setValue( "." );
+ cl.createArg().setValue( "." );
// Note: this currently assumes you have the tag base checked out too
String tagUrl = SvnTagBranchUtils.resolveTagUrl( repository, new ScmTag( tag ) );
- cl.createArgument().setValue( SvnCommandUtils.fixUrl( tagUrl, repository.getUser() ) );
+ cl.createArg().setValue( SvnCommandUtils.fixUrl( tagUrl, repository.getUser() ) );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java Mon Sep 1 08:29:28 2008
@@ -111,15 +111,15 @@
if ( version == null || SvnTagBranchUtils.isRevisionSpecifier( version ) )
{
- cl.createArgument().setValue( "update" );
+ cl.createArg().setValue( "update" );
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( version.getName() );
}
- cl.createArgument().setValue( workingDir );
+ cl.createArg().setValue( workingDir );
}
else
{
@@ -127,17 +127,17 @@
{
// The tag specified does not appear to be numeric, so assume it refers
// to a branch/tag url and perform a switch operation rather than update
- cl.createArgument().setValue( "switch" );
+ cl.createArg().setValue( "switch" );
if ( version instanceof ScmTag )
{
- cl.createArgument().setValue( SvnTagBranchUtils.resolveTagUrl( repository, (ScmTag) version ) );
+ cl.createArg().setValue( SvnTagBranchUtils.resolveTagUrl( repository, (ScmTag) version ) );
}
else
{
- cl.createArgument().setValue(
+ cl.createArg().setValue(
SvnTagBranchUtils.resolveBranchUrl( repository, (ScmBranch) version ) );
}
- cl.createArgument().setValue( workingDir );
+ cl.createArg().setValue( workingDir );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java Mon Sep 1 08:29:28 2008
@@ -91,9 +91,9 @@
cl.setWorkingDirectory( repositoryRoot.getParentFile().getAbsolutePath() );
- cl.createArgument().setValue( "load" );
+ cl.createArg().setValue( "load" );
- cl.createArgument().setValue( repositoryRoot.getAbsolutePath() );
+ cl.createArg().setValue( repositoryRoot.getAbsolutePath() );
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -137,9 +137,9 @@
cl.setExecutable( "cygpath" );
- cl.createArgument().setValue( "--unix" );
+ cl.createArg().setValue( "--unix" );
- cl.createArgument().setValue( repositoryRoot );
+ cl.createArg().setValue( repositoryRoot );
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();