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 [1/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...
Author: vsiveton
Date: Mon Sep 1 08:29:28 2008
New Revision: 690997
URL: http://svn.apache.org/viewvc?rev=690997&view=rev
Log:
SCM-410: Replace deprecated Commandline#createArgument()
o replaced by Commandline#createArg()
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/CvsCommandUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/AbstractCvsAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/branch/AbstractCvsBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/AbstractCvsCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/AbstractCvsCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/export/AbstractCvsExportCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/AbstractCvsListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/remove/AbstractCvsRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/AbstractCvsStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/command/changelog/CvsJavaChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitCommandUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
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
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/diff/SvnDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/export/SvnExeExportCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/list/SvnListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remove/SvnRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java Mon Sep 1 08:29:28 2008
@@ -115,19 +115,19 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "mkelem" );
+ command.createArg().setValue( "mkelem" );
- command.createArgument().setValue( "-c" );
+ command.createArg().setValue( "-c" );
- command.createArgument().setValue( "new file" );
+ command.createArg().setValue( "new file" );
- command.createArgument().setValue( "-nco" );
+ command.createArg().setValue( "-nco" );
File[] files = scmFileSet.getFiles();
for ( int i = 0; i < files.length; i++ )
{
File file = files[i];
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java Mon Sep 1 08:29:28 2008
@@ -104,7 +104,7 @@
{
Commandline command = new Commandline();
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "lshistory" );
+ command.createArg().setValue( "lshistory" );
command.setWorkingDirectory( workingDirectory.getAbsolutePath() );
@@ -118,10 +118,10 @@
format.append( "COMM:%-12.12o - %o - %c - Activity: %[activity]p\\n" );
format.append( "USER:%" + userFormat + "u\\n" );
- command.createArgument().setValue( "-fmt" );
- command.createArgument().setValue( format.toString() );
- command.createArgument().setValue( "-recurse" );
- command.createArgument().setValue( "-nco" );
+ command.createArg().setValue( "-fmt" );
+ command.createArg().setValue( format.toString() );
+ command.createArg().setValue( "-recurse" );
+ command.createArg().setValue( "-nco" );
if ( startDate != null )
{
@@ -129,18 +129,18 @@
String start = sdf.format( startDate );
- command.createArgument().setValue( "-since" );
+ command.createArg().setValue( "-since" );
- command.createArgument().setValue( start );
+ command.createArg().setValue( start );
}
// TODO: End date?
if ( branch != null && StringUtils.isNotEmpty( branch.getName() ) )
{
- command.createArgument().setValue( "-branch" );
+ command.createArg().setValue( "-branch" );
- command.createArgument().setValue( branch.getName() );
+ command.createArg().setValue( branch.getName() );
}
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInCommand.java Mon Sep 1 08:29:28 2008
@@ -91,16 +91,16 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "ci" );
+ command.createArg().setValue( "ci" );
if ( message != null )
{
- command.createArgument().setValue( "-c" );
- command.createArgument().setLine( "\"" + message + "\"" );
+ command.createArg().setValue( "-c" );
+ command.createArg().setLine( "\"" + message + "\"" );
}
else
{
- command.createArgument().setValue( "-nc" );
+ command.createArg().setValue( "-nc" );
}
File[] files = scmFileSet.getFiles();
@@ -111,7 +111,7 @@
for ( int i = 0; i < files.length; i++ )
{
File file = files[i];
- command.createArgument().setValue( file.getAbsolutePath() );
+ command.createArg().setValue( file.getAbsolutePath() );
}
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java Mon Sep 1 08:29:28 2008
@@ -231,16 +231,16 @@
//
// command.setExecutable( "cleartool" );
//
-// command.createArgument().setValue( "rmview" );
-// command.createArgument().setValue( "-force" );
-// command.createArgument().setValue( "-tag" );
+// command.createArg().setValue( "rmview" );
+// command.createArg().setValue( "-force" );
+// command.createArg().setValue( "-tag" );
// if ( isClearCaseLT() )
// {
-// command.createArgument().setValue( getViewStore() );
+// command.createArg().setValue( getViewStore() );
// }
// else
// {
-// command.createArgument().setValue( getUniqueViewName( repository, workingDirectory.getAbsolutePath() ) );
+// command.createArg().setValue( getUniqueViewName( repository, workingDirectory.getAbsolutePath() ) );
// }
//
// return command;
@@ -256,27 +256,27 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "mkview" );
- command.createArgument().setValue( "-snapshot" );
- command.createArgument().setValue( "-tag" );
- command.createArgument().setValue( viewName );
+ command.createArg().setValue( "mkview" );
+ command.createArg().setValue( "-snapshot" );
+ command.createArg().setValue( "-tag" );
+ command.createArg().setValue( viewName );
if ( isClearCaseUCM() )
{
- command.createArgument().setValue( "-stream" );
- command.createArgument().setValue( streamIdentifier );
+ command.createArg().setValue( "-stream" );
+ command.createArg().setValue( streamIdentifier );
}
if ( !isClearCaseLT() )
{
if ( useVWS() )
{
- command.createArgument().setValue( "-vws" );
- command.createArgument().setValue( getViewStore() + viewName + ".vws" );
+ command.createArg().setValue( "-vws" );
+ command.createArg().setValue( getViewStore() + viewName + ".vws" );
}
}
- command.createArgument().setValue( workingDirectory.getCanonicalPath() );
+ command.createArg().setValue( workingDirectory.getCanonicalPath() );
return command;
}
@@ -305,10 +305,10 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "setcs" );
- command.createArgument().setValue( "-tag" );
- command.createArgument().setValue( viewName );
- command.createArgument().setValue( configSpecLocation.getAbsolutePath() );
+ command.createArg().setValue( "setcs" );
+ command.createArg().setValue( "-tag" );
+ command.createArg().setValue( viewName );
+ command.createArg().setValue( configSpecLocation.getAbsolutePath() );
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java Mon Sep 1 08:29:28 2008
@@ -86,16 +86,16 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "co" );
+ command.createArg().setValue( "co" );
- command.createArgument().setValue( "-nc" );
+ command.createArg().setValue( "-nc" );
File[] files = scmFileSet.getFiles();
for ( int i = 0; i < files.length; i++ )
{
File file = files[i];
logger.info( "Checking out file: " + file.getAbsolutePath() );
- command.createArgument().setValue( file.getAbsolutePath() );
+ command.createArg().setValue( file.getAbsolutePath() );
}
return command;
@@ -111,11 +111,11 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "co" );
+ command.createArg().setValue( "co" );
- command.createArgument().setValue( "-nc" );
+ command.createArg().setValue( "-nc" );
- command.createArgument().setValue( "." );
+ command.createArg().setValue( "." );
return command;
}
@@ -130,11 +130,11 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "ci" );
+ command.createArg().setValue( "ci" );
- command.createArgument().setValue( "-nc" );
+ command.createArg().setValue( "-nc" );
- command.createArgument().setValue( "." );
+ command.createArg().setValue( "." );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java Mon Sep 1 08:29:28 2008
@@ -116,16 +116,16 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "rmname" );
+ command.createArg().setValue( "rmname" );
- command.createArgument().setValue( "-nc" );
+ command.createArg().setValue( "-nc" );
File[] files = scmFileSet.getFiles();
for ( int i = 0; i < files.length; i++ )
{
File file = files[i];
logger.info( "Deleting file: " + file.getAbsolutePath() );
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java Mon Sep 1 08:29:28 2008
@@ -84,11 +84,11 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "lscheckout" );
- command.createArgument().setValue( "-cview" );
- command.createArgument().setValue( "-r" );
- command.createArgument().setValue( "-fmt" );
- command.createArgument().setValue( "%n\\n" );
+ command.createArg().setValue( "lscheckout" );
+ command.createArg().setValue( "-cview" );
+ command.createArg().setValue( "-r" );
+ command.createArg().setValue( "-fmt" );
+ command.createArg().setValue( "%n\\n" );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java Mon Sep 1 08:29:28 2008
@@ -98,25 +98,25 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "mklabel" );
+ command.createArg().setValue( "mklabel" );
File[] files = scmFileSet.getFiles();
if ( files.length == 0 )
{
- command.createArgument().setValue( "-recurse" );
+ command.createArg().setValue( "-recurse" );
}
- command.createArgument().setValue( tag );
+ command.createArg().setValue( tag );
if ( files.length > 0 )
{
for ( int i = 0; i < files.length; i++ )
{
File file = files[i];
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
}
else
{
- command.createArgument().setValue( "." );
+ command.createArg().setValue( "." );
}
return command;
@@ -132,9 +132,9 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "mklbtype" );
- command.createArgument().setValue( "-nc" );
- command.createArgument().setValue( tag );
+ command.createArg().setValue( "mklbtype" );
+ command.createArg().setValue( "-nc" );
+ command.createArg().setValue( tag );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java Mon Sep 1 08:29:28 2008
@@ -86,14 +86,14 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "unco" );
- command.createArgument().setValue( "-keep" );
+ command.createArg().setValue( "unco" );
+ command.createArg().setValue( "-keep" );
File[] files = scmFileSet.getFiles();
for ( int i = 0; i < files.length; i++ )
{
File file = files[i];
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/update/ClearCaseUpdateCommand.java Mon Sep 1 08:29:28 2008
@@ -98,9 +98,9 @@
command.setExecutable( "cleartool" );
- command.createArgument().setValue( "update" );
+ command.createArg().setValue( "update" );
- command.createArgument().setValue( "-f" );
+ command.createArg().setValue( "-f" );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java Mon Sep 1 08:29:28 2008
@@ -251,31 +251,31 @@
if ( workingDir != null )
{
// SCM-209
- command.createArgument().setValue( "-d" );
- command.createArgument().setValue( workingDir.getAbsolutePath() );
+ command.createArg().setValue( "-d" );
+ command.createArg().setValue( workingDir.getAbsolutePath() );
}
if ( repo.getHost() != null )
{
- command.createArgument().setValue( "-p" );
+ command.createArg().setValue( "-p" );
String value = repo.getHost();
if ( repo.getPort() != 0 )
{
value += ":" + Integer.toString( repo.getPort() );
}
- command.createArgument().setValue( value );
+ command.createArg().setValue( value );
}
if ( StringUtils.isNotEmpty( repo.getUser() ) )
{
- command.createArgument().setValue( "-u" );
- command.createArgument().setValue( repo.getUser() );
+ command.createArg().setValue( "-u" );
+ command.createArg().setValue( repo.getUser() );
}
if ( StringUtils.isNotEmpty( repo.getPassword() ) )
{
- command.createArgument().setValue( "-P" );
- command.createArgument().setValue( repo.getPassword() );
+ command.createArg().setValue( "-P" );
+ command.createArg().setValue( repo.getPassword() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java Mon Sep 1 08:29:28 2008
@@ -114,7 +114,7 @@
try
{
Commandline command = PerforceScmProvider.createP4Command( (PerforceScmProviderRepository) repo, null );
- command.createArgument().setValue( "info" );
+ command.createArg().setValue( "info" );
getLogger().debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) );
Process proc = command.execute();
BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java Mon Sep 1 08:29:28 2008
@@ -76,8 +76,8 @@
try
{
Commandline command = PerforceScmProvider.createP4Command( repo, null );
- command.createArgument().setValue( "where" );
- command.createArgument().setValue( filepath );
+ command.createArg().setValue( "where" );
+ command.createArg().setValue( filepath );
logger.debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) );
Process proc = command.execute();
BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java Mon Sep 1 08:29:28 2008
@@ -80,13 +80,13 @@
ScmFileSet files )
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "add" );
+ command.createArg().setValue( "add" );
List fs = files.getFileList();
for ( int i = 0; i < fs.size(); i++ )
{
File file = (File) fs.get( i );
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java Mon Sep 1 08:29:28 2008
@@ -98,13 +98,13 @@
if ( clientspec != null )
{
- command.createArgument().setValue( "-c" );
- command.createArgument().setValue( clientspec );
+ command.createArg().setValue( "-c" );
+ command.createArg().setValue( clientspec );
}
- command.createArgument().setValue( "filelog" );
- command.createArgument().setValue( "-t" );
- command.createArgument().setValue( "-l" );
- command.createArgument().setValue( "..." );
+ command.createArg().setValue( "filelog" );
+ command.createArg().setValue( "-t" );
+ command.createArg().setValue( "-l" );
+ command.createArg().setValue( "..." );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java Mon Sep 1 08:29:28 2008
@@ -103,8 +103,8 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "submit" );
- command.createArgument().setValue( "-i" );
+ command.createArg().setValue( "submit" );
+ command.createArg().setValue( "-i" );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java Mon Sep 1 08:29:28 2008
@@ -82,8 +82,8 @@
// Ahhh, glorious Perforce. Create and update of clientspecs is the exact
// same operation so we don't need to distinguish between the two modes.
cl = PerforceScmProvider.createP4Command( prepo, workingDirectory );
- cl.createArgument().setValue( "client" );
- cl.createArgument().setValue( "-i" );
+ cl.createArg().setValue( "client" );
+ cl.createArg().setValue( "-i" );
getLogger().info( "Executing: " + PerforceScmProvider.clean( cl.toString() ) );
Process proc = cl.execute();
@@ -182,9 +182,9 @@
try
{
cl = PerforceScmProvider.createP4Command( prepo, workingDirectory );
- cl.createArgument().setValue( "client" );
- cl.createArgument().setValue( "-d" );
- cl.createArgument().setValue( specname );
+ cl.createArg().setValue( "client" );
+ cl.createArg().setValue( "-d" );
+ cl.createArg().setValue( specname );
getLogger().info( "Executing: " + PerforceScmProvider.clean( cl.toString() ) );
Process proc = cl.execute();
@@ -227,8 +227,8 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "-c" + specname );
- command.createArgument().setValue( "sync" );
+ command.createArg().setValue( "-c" + specname );
+ command.createArg().setValue( "sync" );
// Use a simple heuristic to determine if we should use the Force flag
// on sync. Forcing sync is a HUGE performance hit but is required in
@@ -241,7 +241,7 @@
if ( files == null || files.length == 0 )
{
// We need to force so checkout to an empty directory will work.
- command.createArgument().setValue( "-f" );
+ command.createArg().setValue( "-f" );
}
// Not sure what to do here. I'm unclear whether we should be
@@ -250,7 +250,7 @@
// latter until the exact semantics are clearer.
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
- command.createArgument().setValue( "@" + version.getName() );
+ command.createArg().setValue( "@" + version.getName() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java Mon Sep 1 08:29:28 2008
@@ -91,11 +91,11 @@
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "diff2" );
- command.createArgument().setValue( "-u" );
+ command.createArg().setValue( "diff2" );
+ command.createArg().setValue( "-u" );
// I'm assuming the "revs" are actually labels
- command.createArgument().setValue( "..." + start );
- command.createArgument().setValue( "...@" + end );
+ command.createArg().setValue( "..." + start );
+ command.createArg().setValue( "...@" + end );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java Mon Sep 1 08:29:28 2008
@@ -96,7 +96,7 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "edit" );
+ command.createArg().setValue( "edit" );
try
{
@@ -115,7 +115,7 @@
{
canfile = canfile.substring( candir.length() + 1 );
}
- command.createArgument().setValue( canfile );
+ command.createArg().setValue( canfile );
}
}
catch ( IOException e )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java Mon Sep 1 08:29:28 2008
@@ -97,10 +97,10 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDir );
- command.createArgument().setValue( "login" );
+ command.createArg().setValue( "login" );
if ( !StringUtils.isEmpty( repo.getUser() ) )
{
- command.createArgument().setValue( repo.getUser() );
+ command.createArg().setValue( repo.getUser() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java Mon Sep 1 08:29:28 2008
@@ -78,13 +78,13 @@
ScmFileSet files )
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "delete" );
+ command.createArg().setValue( "delete" );
List fs = files.getFileList();
for ( int i = 0; i < fs.size(); i++ )
{
File file = (File) fs.get( i );
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java Mon Sep 1 08:29:28 2008
@@ -128,8 +128,8 @@
String location )
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "opened" );
- command.createArgument().setValue( PerforceScmProvider.getCanonicalRepoPath( location ) );
+ command.createArg().setValue( "opened" );
+ command.createArg().setValue( PerforceScmProvider.getCanonicalRepoPath( location ) );
return command;
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java Mon Sep 1 08:29:28 2008
@@ -154,8 +154,8 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "label" );
- command.createArgument().setValue( "-i" );
+ command.createArg().setValue( "label" );
+ command.createArg().setValue( "-i" );
return command;
}
@@ -164,15 +164,15 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "labelsync" );
- command.createArgument().setValue( "-l" );
- command.createArgument().setValue( tag );
+ command.createArg().setValue( "labelsync" );
+ command.createArg().setValue( "-l" );
+ command.createArg().setValue( tag );
List fs = files.getFileList();
for ( int i = 0; i < fs.size(); i++ )
{
File file = (File) fs.get( i );
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java Mon Sep 1 08:29:28 2008
@@ -87,13 +87,13 @@
{
Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );
- command.createArgument().setValue( "revert" );
+ command.createArg().setValue( "revert" );
List fs = files.getFileList();
for ( int i = 0; i < fs.size(); i++ )
{
File file = (File) fs.get( i );
- command.createArgument().setValue( file.getName() );
+ command.createArg().setValue( file.getName() );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java Mon Sep 1 08:29:28 2008
@@ -48,15 +48,15 @@
{
Commandline cl = new Commandline();
- cl.createArgument().setValue( "stcmd" );
+ cl.createArg().setValue( "stcmd" );
- cl.createArgument().setValue( action );
+ cl.createArg().setValue( action );
- cl.createArgument().setValue( "-x" );
+ cl.createArg().setValue( "-x" );
- cl.createArgument().setValue( "-nologo" );
+ cl.createArg().setValue( "-nologo" );
- cl.createArgument().setValue( "-stop" );
+ cl.createArg().setValue( "-stop" );
return cl;
}
@@ -65,7 +65,7 @@
{
for ( int i = 0; args != null && i < args.size(); ++i )
{
- cl.createArgument().setValue( (String) args.get( i ) );
+ cl.createArg().setValue( (String) args.get( i ) );
}
return cl;
}
@@ -79,12 +79,12 @@
if ( scmFileSet.getFileList().size() == 0 )
{
//perform an action on directory
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( repo.getFullUrl() );
- cl.createArgument().setValue( "-fp" );
- cl.createArgument().setValue( scmFileSet.getBasedir().getAbsolutePath().replace( '\\', '/' ) );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( repo.getFullUrl() );
+ cl.createArg().setValue( "-fp" );
+ cl.createArg().setValue( scmFileSet.getBasedir().getAbsolutePath().replace( '\\', '/' ) );
- cl.createArgument().setValue( "-is" );
+ cl.createArg().setValue( "-is" );
addCompressionOption( cl );
@@ -117,17 +117,17 @@
}
}
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( scmUrl );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( scmUrl );
- cl.createArgument().setValue( "-fp" );
- cl.createArgument().setValue( workingDirectory.getPath().replace( '\\', '/' ) );
+ cl.createArg().setValue( "-fp" );
+ cl.createArg().setValue( workingDirectory.getPath().replace( '\\', '/' ) );
cl.setWorkingDirectory( workingDirectory.getPath() );
if ( subFile.isDirectory() )
{
- cl.createArgument().setValue( "-is" );
+ cl.createArg().setValue( "-is" );
}
StarteamCommandLineUtils.addCompressionOption( cl );
@@ -136,7 +136,7 @@
if ( !subFile.isDirectory() )
{
- cl.createArgument().setValue( subFile.getName() );
+ cl.createArg().setValue( subFile.getName() );
}
return cl;
@@ -146,7 +146,7 @@
{
if ( settings.isCompressionEnable() )
{
- cl.createArgument().setValue( "-cmp" );
+ cl.createArg().setValue( "-cmp" );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Mon Sep 1 08:29:28 2008
@@ -111,9 +111,9 @@
{
SimpleDateFormat localFormat = new SimpleDateFormat();
- cl.createArgument().setValue( "-cfgd" );
+ cl.createArg().setValue( "-cfgd" );
- cl.createArgument().setValue( localFormat.format( startDate ).toString() );
+ cl.createArg().setValue( localFormat.format( startDate ).toString() );
}
*/
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java Mon Sep 1 08:29:28 2008
@@ -89,15 +89,15 @@
{
Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "label", repo );
- cl.createArgument().setValue( "-p" );
+ cl.createArg().setValue( "-p" );
- cl.createArgument().setValue( repo.getFullUrl() );
+ cl.createArg().setValue( repo.getFullUrl() );
- cl.createArgument().setValue( "-nl" );
+ cl.createArg().setValue( "-nl" );
- cl.createArgument().setValue( tag );
+ cl.createArg().setValue( tag );
- cl.createArgument().setValue( "-b" );
+ cl.createArg().setValue( "-b" );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java?rev=690997&r1=690996&r2=690997&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java Mon Sep 1 08:29:28 2008
@@ -94,18 +94,18 @@
cl.setExecutable( CCM );
- cl.createArgument().setValue( TASK );
- cl.createArgument().setValue( "-show" );
- cl.createArgument().setValue( "objects" );
+ cl.createArg().setValue( TASK );
+ cl.createArg().setValue( "-show" );
+ cl.createArg().setValue( "objects" );
// Set up the output format
if ( format != null && !format.equals( "" ) )
{
- cl.createArgument().setValue( "-f" );
- cl.createArgument().setValue( format );
+ cl.createArg().setValue( "-f" );
+ cl.createArg().setValue( format );
}
- cl.createArgument().setValue( Integer.toString( taskNumber ) );
+ cl.createArg().setValue( Integer.toString( taskNumber ) );
return cl;
}
@@ -129,18 +129,18 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( QUERY );
+ cl.createArg().setValue( QUERY );
- cl.createArgument().setValue( "-u" );
+ cl.createArg().setValue( "-u" );
// Set up the output format
if ( format != null && !format.equals( "" ) )
{
- cl.createArgument().setValue( "-f" );
- cl.createArgument().setValue( format );
+ cl.createArg().setValue( "-f" );
+ cl.createArg().setValue( format );
}
- cl.createArgument().setValue( query );
+ cl.createArg().setValue( query );
return cl;
}
@@ -165,19 +165,19 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( BASELINE );
+ cl.createArg().setValue( BASELINE );
- cl.createArgument().setValue( "-create" );
- cl.createArgument().setValue( name );
+ cl.createArg().setValue( "-create" );
+ cl.createArg().setValue( name );
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
- cl.createArgument().setValue( "-release" );
- cl.createArgument().setValue( release );
+ cl.createArg().setValue( "-release" );
+ cl.createArg().setValue( release );
- cl.createArgument().setValue( "-purpose" );
- cl.createArgument().setValue( purpose );
+ cl.createArg().setValue( "-purpose" );
+ cl.createArg().setValue( purpose );
return cl;
@@ -200,14 +200,14 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( CREATE );
+ cl.createArg().setValue( CREATE );
if ( message != null && !message.equals( "" ) )
{
- cl.createArgument().setValue( "-c" );
+ cl.createArg().setValue( "-c" );
- cl.createArgument().setValue( message );
+ cl.createArg().setValue( message );
}
@@ -216,7 +216,7 @@
File f = (File) i.next();
try
{
- cl.createArgument().setValue( f.getCanonicalPath() );
+ cl.createArg().setValue( f.getCanonicalPath() );
}
catch ( IOException e )
{
@@ -246,26 +246,26 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( TASK );
+ cl.createArg().setValue( TASK );
- cl.createArgument().setValue( "-create" );
+ cl.createArg().setValue( "-create" );
- cl.createArgument().setValue( "-synopsis" );
- cl.createArgument().setValue( synopsis );
+ cl.createArg().setValue( "-synopsis" );
+ cl.createArg().setValue( synopsis );
if ( release != null && !release.equals( "" ) )
{
- cl.createArgument().setValue( "-release" );
- cl.createArgument().setValue( release );
+ cl.createArg().setValue( "-release" );
+ cl.createArg().setValue( release );
}
if ( defaultTask )
{
- cl.createArgument().setValue( "-default" );
+ cl.createArg().setValue( "-default" );
}
- cl.createArgument().setValue( "-description" );
- cl.createArgument().setValue(
+ cl.createArg().setValue( "-description" );
+ cl.createArg().setValue(
"This task was created by Maven SCM Synergy provider on " + Calendar.getInstance().getTime() );
return cl;
@@ -289,14 +289,14 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( TASK );
+ cl.createArg().setValue( TASK );
- cl.createArgument().setValue( "-checkin" );
+ cl.createArg().setValue( "-checkin" );
- cl.createArgument().setValue( taskSpecs );
+ cl.createArg().setValue( taskSpecs );
- cl.createArgument().setValue( "-comment" );
- cl.createArgument().setValue( comment );
+ cl.createArg().setValue( "-comment" );
+ cl.createArg().setValue( comment );
return cl;
@@ -319,11 +319,11 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( DELETE );
+ cl.createArg().setValue( DELETE );
if ( replace )
{
- cl.createArgument().setValue( "-replace" );
+ cl.createArg().setValue( "-replace" );
}
for ( Iterator i = files.iterator(); i.hasNext(); )
@@ -331,7 +331,7 @@
File f = (File) i.next();
try
{
- cl.createArgument().setValue( f.getCanonicalPath() );
+ cl.createArg().setValue( f.getCanonicalPath() );
}
catch ( IOException e )
{
@@ -359,14 +359,14 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( RECONFIGURE );
+ cl.createArg().setValue( RECONFIGURE );
- cl.createArgument().setValue( "-recurse" );
+ cl.createArg().setValue( "-recurse" );
if ( projectSpec != null )
{
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
}
return cl;
@@ -389,10 +389,10 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( RECONFIGURE_PROPERTIES );
+ cl.createArg().setValue( RECONFIGURE_PROPERTIES );
- cl.createArgument().setValue( "-refresh" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-refresh" );
+ cl.createArg().setValue( projectSpec );
return cl;
@@ -414,15 +414,15 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( RECONCILE );
+ cl.createArg().setValue( RECONCILE );
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( "-uwa" ); // Update wa from database
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( "-uwa" ); // Update wa from database
if ( projectSpec != null )
{
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
}
return cl;
@@ -445,15 +445,15 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( RECONCILE );
+ cl.createArg().setValue( RECONCILE );
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( "-udb" ); // Update database from wa
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( "-udb" ); // Update database from wa
if ( projectSpec != null )
{
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
}
return cl;
@@ -486,14 +486,14 @@
}
cl.setExecutable( CCM );
- cl.createArgument().setValue( DIR );
- cl.createArgument().setValue( "-m" );
+ cl.createArg().setValue( DIR );
+ cl.createArg().setValue( "-m" );
// Set up the output format
if ( format != null && !format.equals( "" ) )
{
- cl.createArgument().setValue( "-f" );
- cl.createArgument().setValue( format );
+ cl.createArg().setValue( "-f" );
+ cl.createArg().setValue( format );
}
return cl;
@@ -516,14 +516,14 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( CO );
+ cl.createArg().setValue( CO );
for ( Iterator i = files.iterator(); i.hasNext(); )
{
File f = (File) i.next();
try
{
- cl.createArgument().setValue( f.getCanonicalPath() );
+ cl.createArg().setValue( f.getCanonicalPath() );
}
catch ( IOException e )
{
@@ -554,42 +554,42 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( CO );
- cl.createArgument().setValue( "-subprojects" ); // Checkout sub-projects
- cl.createArgument().setValue( "-rel" ); // Relative
+ cl.createArg().setValue( CO );
+ cl.createArg().setValue( "-subprojects" ); // Checkout sub-projects
+ cl.createArg().setValue( "-rel" ); // Relative
if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
{
- cl.createArgument().setValue( "-t" ); // Version
- cl.createArgument().setValue( version.getName() );
+ cl.createArg().setValue( "-t" ); // Version
+ cl.createArg().setValue( version.getName() );
}
if ( purpose != null && !purpose.equals( "" ) )
{
- cl.createArgument().setValue( "-purpose" );
- cl.createArgument().setValue( purpose );
+ cl.createArg().setValue( "-purpose" );
+ cl.createArg().setValue( purpose );
}
if ( release != null && !release.equals( "" ) )
{
- cl.createArgument().setValue( "-release" );
- cl.createArgument().setValue( release );
+ cl.createArg().setValue( "-release" );
+ cl.createArg().setValue( release );
}
if ( directory != null )
{
- cl.createArgument().setValue( "-path" );
+ cl.createArg().setValue( "-path" );
try
{
- cl.createArgument().setValue( directory.getCanonicalPath() );
+ cl.createArg().setValue( directory.getCanonicalPath() );
}
catch ( IOException e )
{
throw new ScmException( "Invalid directory", e );
}
}
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
return cl;
}
@@ -611,14 +611,14 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( CI );
+ cl.createArg().setValue( CI );
if ( comment != null && !comment.equals( "" ) )
{
- cl.createArgument().setValue( "-c" );
- cl.createArgument().setValue( comment );
+ cl.createArg().setValue( "-c" );
+ cl.createArg().setValue( comment );
}
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
return cl;
}
@@ -640,11 +640,11 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( CI );
+ cl.createArg().setValue( CI );
if ( comment != null && !comment.equals( "" ) )
{
- cl.createArgument().setValue( "-c" );
- cl.createArgument().setValue( comment );
+ cl.createArg().setValue( "-c" );
+ cl.createArg().setValue( comment );
}
if ( files.size() > 0 )
@@ -654,7 +654,7 @@
File f = (File) i.next();
try
{
- cl.createArgument().setValue( f.getCanonicalPath() );
+ cl.createArg().setValue( f.getCanonicalPath() );
}
catch ( IOException e )
{
@@ -681,10 +681,10 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( SYNC );
- cl.createArgument().setValue( "-r" ); // Recursive
- cl.createArgument().setValue( "-p" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( SYNC );
+ cl.createArg().setValue( "-r" ); // Recursive
+ cl.createArg().setValue( "-p" );
+ cl.createArg().setValue( projectSpec );
return cl;
}
@@ -705,9 +705,9 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( WA );
- cl.createArgument().setValue( "-show" );
- cl.createArgument().setValue( projectSpec );
+ cl.createArg().setValue( WA );
+ cl.createArg().setValue( "-show" );
+ cl.createArg().setValue( projectSpec );
return cl;
}
@@ -727,7 +727,7 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( STOP );
+ cl.createArg().setValue( STOP );
return cl;
}
@@ -783,18 +783,18 @@
Commandline cl = new Commandline();
cl.setExecutable( CCM );
- cl.createArgument().setValue( START );
- cl.createArgument().setValue( "-nogui" );
- cl.createArgument().setValue( "-m" ); // Multissesion
- cl.createArgument().setValue( "-q" ); // Quiet (return only CCM_ADDR)
- cl.createArgument().setValue( "-n" );
- cl.createArgument().setValue( username );
- cl.createArgument().setValue( "-pw" );
- cl.createArgument().setValue( password );
+ cl.createArg().setValue( START );
+ cl.createArg().setValue( "-nogui" );
+ cl.createArg().setValue( "-m" ); // Multissesion
+ cl.createArg().setValue( "-q" ); // Quiet (return only CCM_ADDR)
+ cl.createArg().setValue( "-n" );
+ cl.createArg().setValue( username );
+ cl.createArg().setValue( "-pw" );
+ cl.createArg().setValue( password );
if ( role != null )
{
- cl.createArgument().setValue( "-r" );
- cl.createArgument().setValue( role.toString() );
+ cl.createArg().setValue( "-r" );
+ cl.createArg().setValue( role.toString() );
}
return cl;
@@ -814,7 +814,7 @@
configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
- cl.createArgument().setValue( DELIMITER );
+ cl.createArg().setValue( DELIMITER );
return cl;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java?rev=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/VssCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java Mon Sep 1 08:29:28 2008
@@ -55,7 +55,7 @@
{
File file = (File) it.next();
- cl.createArgument().setValue( file.getPath().replace( '\\', '/' ) );
+ cl.createArg().setValue( file.getPath().replace( '\\', '/' ) );
}
}
@@ -71,14 +71,14 @@
if ( !StringUtils.isEmpty( repository.getUser() ) )
{
- cl.createArgument().setValue( "-Y" );
+ cl.createArg().setValue( "-Y" );
StringBuffer sb = new StringBuffer( repository.getUser() );
if ( !StringUtils.isEmpty( repository.getPassword() ) )
{
sb.append( "," ).append( repository.getPassword() );
}
- cl.createArgument().setValue( sb.toString() );
+ cl.createArg().setValue( sb.toString() );
}
return cl;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.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/add/VssAddCommand.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/add/VssAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/add/VssAddCommand.java Mon Sep 1 08:29:28 2008
@@ -92,20 +92,20 @@
command.setExecutable( ssDir + VssConstants.SS_EXE );
- command.createArgument().setValue( VssConstants.COMMAND_ADD );
+ command.createArg().setValue( VssConstants.COMMAND_ADD );
VssCommandLineUtils.addFiles( command, fileSet );
- // 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() );
}
//Ignore: Do not ask for input under any circumstances.
- command.createArgument().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
+ command.createArg().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
return command;
}
@@ -130,18 +130,18 @@
command.setExecutable( ssDir + VssConstants.SS_EXE );
- command.createArgument().setValue( VssConstants.COMMAND_CP );
+ command.createArg().setValue( VssConstants.COMMAND_CP );
- 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() );
}
//Ignore: Do not ask for input under any circumstances.
- command.createArgument().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
+ command.createArg().setValue( VssConstants.FLAG_AUTORESPONSE_DEF );
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.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/changelog/VssHistoryCommand.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/changelog/VssHistoryCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java Mon Sep 1 08:29:28 2008
@@ -93,21 +93,21 @@
command.setExecutable( ssDir + VssConstants.SS_EXE );
- command.createArgument().setValue( VssConstants.COMMAND_HISTORY );
+ command.createArg().setValue( VssConstants.COMMAND_HISTORY );
- 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 );
//Display only versions that fall within specified data range.
if ( startDate != null )
@@ -119,7 +119,7 @@
SimpleDateFormat sdf = new SimpleDateFormat( "dd/MM/yyyy", Locale.ENGLISH );
String dateRange = sdf.format( endDate ) + "~" + sdf.format( startDate );
- command.createArgument().setValue( VssConstants.FLAG_VERSION_DATE + dateRange );
+ command.createArg().setValue( VssConstants.FLAG_VERSION_DATE + dateRange );
}
return command;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutCommand.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/checkout/VssCheckOutCommand.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/checkout/VssCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutCommand.java Mon Sep 1 08:29:28 2008
@@ -99,27 +99,27 @@
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 );
//Ignore: Do not touch local writable files.
- command.createArgument().setValue( VssConstants.FLAG_REPLACE_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-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.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/edit/VssEditCommand.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/edit/VssEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java Mon Sep 1 08:29:28 2008
@@ -100,21 +100,21 @@
command.setExecutable( ssDir + VssConstants.SS_EXE );
- command.createArgument().setValue( VssConstants.COMMAND_CHECKOUT );
+ command.createArg().setValue( VssConstants.COMMAND_CHECKOUT );
- 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 );
return command;
}