Author: dantran
Date: Mon Dec 18 10:23:06 2006
New Revision: 488383
URL: http://svn.apache.org/viewvc?view=rev&rev=488383
Log:
SCM-266:add ability to configure eol settings to all applicable stcmd commands
Modified:
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/add/StarteamAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
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?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
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 Dec 18 10:23:06 2006
@@ -148,9 +148,16 @@
{
cl.createArgument().setValue( "-cmp" );
}
-
}
+ public static void addEOLOption( List args )
+ {
+ if ( settings.getEol() != null )
+ {
+ args.add( "-eol" );
+ args.add( settings.getEol() );
+ }
+ }
public static String toJavaPath( String path )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.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/add/StarteamAddCommand.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
Mon Dec 18 10:23:06 2006
@@ -84,12 +84,15 @@
static Commandline createCommandLine( StarteamScmProviderRepository repo,
ScmFileSet scmFileSet, String issue )
{
List args = new ArrayList();
+
if ( issue != null && issue.length() != 0 )
{
args.add( "-cr" );
args.add( issue );
}
+ StarteamCommandLineUtils.addEOLOption( args );
+
return StarteamCommandLineUtils.createStarteamCommandLine( "add",
args, scmFileSet, repo );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.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/checkin/StarteamCheckInCommand.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java
Mon Dec 18 10:23:06 2006
@@ -110,8 +110,8 @@
public static Commandline createCommandLine( StarteamScmProviderRepository
repo, ScmFileSet fileSet, String message,
String tag, String issueType,
String issueValue )
{
-
List args = new ArrayList();
+
if ( message != null && message.length() != 0 )
{
args.add( "-r" );
@@ -149,6 +149,8 @@
args.add( "NCI" );
}
+ StarteamCommandLineUtils.addEOLOption( args );
+
return StarteamCommandLineUtils.createStarteamCommandLine( "ci", args,
fileSet, repo );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.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/checkout/StarteamCheckOutCommand.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommand.java
Mon Dec 18 10:23:06 2006
@@ -81,12 +81,15 @@
public static Commandline createCommandLine( StarteamScmProviderRepository
repo, ScmFileSet baseDir, String tag )
{
List args = new ArrayList();
+
if ( tag != null && tag.length() != 0 )
{
args.add( "-vl" );
args.add( tag );
}
+ StarteamCommandLineUtils.addEOLOption( args );
+
return StarteamCommandLineUtils.createStarteamCommandLine( "co", args,
baseDir, repo );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.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/diff/StarteamDiffCommand.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
Mon Dec 18 10:23:06 2006
@@ -108,8 +108,8 @@
throw new ScmException( "Missing start label." );
}
- Commandline cl = StarteamCommandLineUtils.createStarteamCommandLine(
"diff", args, workingDirectory, repo );
-
- return cl;
+ StarteamCommandLineUtils.addEOLOption( args );
+
+ return StarteamCommandLineUtils.createStarteamCommandLine( "diff",
args, workingDirectory, repo );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.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/update/StarteamUpdateCommand.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java
Mon Dec 18 10:23:06 2006
@@ -118,14 +118,18 @@
public static Commandline createCommandLine( StarteamScmProviderRepository
repo, ScmFileSet fileSet, String tag )
{
List args = new ArrayList();
+
args.add( "-merge" );
args.add( "-neverprompt" );
+
if ( tag != null && tag.length() != 0 )
{
args.add( "-vl" );
args.add( tag );
}
+ StarteamCommandLineUtils.addEOLOption( args );
+
return StarteamCommandLineUtils.createStarteamCommandLine( "co", args,
fileSet, repo );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo
Mon Dec 18 10:23:06 2006
@@ -21,6 +21,13 @@
<defaultValue>false</defaultValue>
<description>Enable compression in all stdcmd</description>
</field>
+ <field>
+ <name>eol</name>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <defaultValue>on</defaultValue>
+ <description>EOL setting in all applicable stdcmd</description>
+ </field>
</fields>
</class>
</classes>
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java
Mon Dec 18 10:23:06 2006
@@ -46,7 +46,7 @@
String testFileDirAbsolutePath = StarteamCommandLineUtils.toJavaPath(
testFileDir.getAbsolutePath() );
String expectedCmd = "stcmd add -x -nologo -stop -p myusername:[EMAIL
PROTECTED]:1234/projecturl" + " -fp " +
- testFileDirAbsolutePath + " testfile";
+ testFileDirAbsolutePath + " -eol on testfile";
ScmFileSet fileSet = new ScmFileSet( testFileDir, testFile );
testCommandLine( "scm:starteam:myusername:[EMAIL
PROTECTED]:1234/projecturl", fileSet, "", expectedCmd );
@@ -62,7 +62,7 @@
String testFileDirAbsolutePath = StarteamCommandLineUtils.toJavaPath(
testFileDir.getAbsolutePath() );
String expectedCmd = "stcmd add -x -nologo -stop -p myusername:[EMAIL
PROTECTED]:1234/projecturl" + " -fp " +
- testFileDirAbsolutePath + " -cr view_root/dummycr" + " testfile";
+ testFileDirAbsolutePath + " -cr view_root/dummycr" + " -eol on
testfile";
ScmFileSet fileSet = new ScmFileSet( testFileDir, testFile );
testCommandLine( "scm:starteam:myusername:[EMAIL
PROTECTED]:1234/projecturl", fileSet, "view_root/dummycr",
@@ -82,7 +82,7 @@
StarteamCommandLineUtils.toJavaPath( testFileDir.getAbsolutePath()
) + "/target";
String expectedCmd = "stcmd add -x -nologo -stop -p myusername:[EMAIL
PROTECTED]:1234/projecturl/target" +
- " -fp " + testFileDirAbsolutePath + " testfile";
+ " -fp " + testFileDirAbsolutePath + " -eol on testfile";
ScmFileSet fileSet = new ScmFileSet( testFileDir, testFile );
testCommandLine( "scm:starteam:myusername:[EMAIL
PROTECTED]:1234/projecturl", fileSet, null, expectedCmd );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java
Mon Dec 18 10:23:06 2006
@@ -45,7 +45,7 @@
String starteamUrl = "user:[EMAIL PROTECTED]:1234/project/view";
String mavenUrl = "scm:starteam:" + starteamUrl;
- String expectedCmd = "stcmd ci -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workingCopy + " -is -f NCI";
+ String expectedCmd = "stcmd ci -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workingCopy + " -is -f NCI -eol on";
testCommandLine( mavenUrl, fileSet, "", "", "", "", expectedCmd );
@@ -61,7 +61,7 @@
String starteamUrl = "user:[EMAIL PROTECTED]:1234/project/view";
String mavenUrl = "scm:starteam:" + starteamUrl;
- String expectedCmd = "stcmd ci -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workingCopy + " test.txt";
+ String expectedCmd = "stcmd ci -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workingCopy + " -eol on test.txt";
testCommandLine( mavenUrl, fileSet, "", "", "", "", expectedCmd );
@@ -78,7 +78,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd =
- "stcmd ci -x -nologo -stop" + " -p " + starteamUrl + "/src" + "
-fp " + workingCopy + "/src" + " test.txt";
+ "stcmd ci -x -nologo -stop" + " -p " + starteamUrl + "/src" + "
-fp " + workingCopy + "/src" + " -eol on test.txt";
testCommandLine( mavenUrl, fileSet, "", "", "", "", expectedCmd );
@@ -98,7 +98,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd = "stcmd ci -x -nologo -stop" + " -p " +
starteamUrl + "/src" + " -fp " + workingCopy +
- "/src" + " -is -f NCI";
+ "/src" + " -is -f NCI -eol on";
testCommandLine( mavenUrl, fileSet, "", "", "", "", expectedCmd );
@@ -115,7 +115,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd =
- "stcmd ci -x -nologo -stop" + " -p " + starteamUrl + " -fp " +
workingCopy + " -active test.txt";
+ "stcmd ci -x -nologo -stop" + " -p " + starteamUrl + " -fp " +
workingCopy + " -active -eol on test.txt";
testCommandLine( mavenUrl, fileSet, null, "", "active", " ",
expectedCmd );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
Mon Dec 18 10:23:06 2006
@@ -44,7 +44,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd =
- "stcmd co -x -nologo -stop" + " -p " + starteamUrl + " -fp " +
workDirAbsolutePath + " -is -vl myTag";
+ "stcmd co -x -nologo -stop" + " -p " + starteamUrl + " -fp " +
workDirAbsolutePath + " -is -vl myTag -eol on";
testCommandLine( mavenUrl, workingCopy, "myTag", expectedCmd );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java
Mon Dec 18 10:23:06 2006
@@ -45,7 +45,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd =
- "stcmd diff -x -nologo -stop" + " -p " + starteamUrl + " -fp " +
workingCopy + " -is -filter M";
+ "stcmd diff -x -nologo -stop" + " -p " + starteamUrl + " -fp " +
workingCopy + " -is -filter M -eol on";
testCommandLine( mavenUrl, fileSet, null, null, expectedCmd );
@@ -64,7 +64,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd = "stcmd diff -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workingCopy +
- " -is -filter M" + " -vl label1 -vl label2";
+ " -is -filter M" + " -vl label1 -vl label2 -eol on";
testCommandLine( mavenUrl, fileSet, "label1", "label2", expectedCmd );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java?view=diff&rev=488383&r1=488382&r2=488383
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java
Mon Dec 18 10:23:06 2006
@@ -46,7 +46,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd = "stcmd co -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workDirAbsolutePath +
- " -is -merge -neverprompt -vl myTag";
+ " -is -merge -neverprompt -vl myTag -eol on";
testCommandLine( mavenUrl, workingCopy, "myTag", expectedCmd );
@@ -64,7 +64,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd = "stcmd co -x -nologo -stop" + " -p " +
starteamUrl + " -fp " + workDirAbsolutePath +
- " -merge -neverprompt -vl myTag" + " test.txt";
+ " -merge -neverprompt -vl myTag" + " -eol on test.txt";
testCommandLine( mavenUrl, workingCopy, "myTag", expectedCmd );
}
@@ -80,7 +80,7 @@
String mavenUrl = "scm:starteam:" + starteamUrl;
String expectedCmd = "stcmd co -x -nologo -stop" + " -p " +
starteamUrl + "/subdir" + " -fp " +
- workDirAbsolutePath + "/subdir" + " -merge -neverprompt -vl myTag"
+ " test.txt";
+ workDirAbsolutePath + "/subdir" + " -merge -neverprompt -vl myTag"
+ " -eol on test.txt";
testCommandLine( mavenUrl, workingCopy, "myTag", expectedCmd );
}
