Author: evenisse
Date: Mon Sep 25 00:30:34 2006
New Revision: 449590
URL: http://svn.apache.org/viewvc?view=rev&rev=449590
Log:
[SCM-199] Fix startDate parameter for ClearcaseLT
Modified:
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/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
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?view=diff&rev=449590&r1=449589&r2=449590
==============================================================================
---
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 25 00:30:34 2006
@@ -38,6 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Frederic Mura</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Holster</a>
* @version $Id$
*/
public class ClearCaseChangeLogCommand
@@ -109,15 +110,12 @@
format.append( "COMM:%-12.12o - %o - %c - Activity: %[activity]p\\n" );
format.append( "USER:%-8.8u\\n" );
- if ( !isClearCaseLT() )
- {
- command.createArgument().setValue( "-fmt" );
- command.createArgument().setValue( format.toString() );
- }
+ command.createArgument().setValue( "-fmt" );
+ command.createArgument().setValue( format.toString() );
command.createArgument().setValue( "-recurse" );
command.createArgument().setValue( "-nco" );
- if ( startDate != null && !isClearCaseLT() )
+ if ( startDate != null)
{
SimpleDateFormat sdf = new SimpleDateFormat( "dd-MMM-yyyy",
Locale.ENGLISH );
@@ -138,25 +136,5 @@
}
return command;
- }
-
- /**
- * @return the value of the setting property 'clearcaseLT'
- */
- protected static boolean isClearCaseLT()
- {
- return settings.isClearcaseLT();
- }
-
- /**
- * Frederic Mura
- * Only use for test case
- *
- * @param isClearCaseLT
- * @deprecated
- */
- protected static void setIsClearCaseLT( boolean isClearCaseLT )
- {
- settings.setClearcaseLT( isClearCaseLT );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java?view=diff&rev=449590&r1=449589&r2=449590
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java
Mon Sep 25 00:30:34 2006
@@ -25,6 +25,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Holster</a>
* @version $Id$
*/
public class ClearCaseChangeLogCommandTest
@@ -41,8 +42,6 @@
testCommandLine( tag, startDate, endDate,
"cleartool lshistory -fmt
\"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o - %o - %c - Activity:
%[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco" );
-
- testClearCaseLTCommandLine( tag, startDate, endDate, "cleartool
lshistory -recurse -nco" );
}
public void testGetCommandLineWithTag()
@@ -56,8 +55,6 @@
testCommandLine( tag, startDate, endDate,
"cleartool lshistory -fmt
\"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o - %o - %c - Activity:
%[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco -branch myBranch" );
-
- testClearCaseLTCommandLine( tag, startDate, endDate, "cleartool
lshistory -recurse -nco -branch myBranch" );
}
public void testGetCommandLineWithStartDate()
@@ -71,8 +68,6 @@
testCommandLine( tag, startDate, endDate,
"cleartool lshistory -fmt
\"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o - %o - %c - Activity:
%[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco -since 10-Sep-2003" );
-
- testClearCaseLTCommandLine( tag, startDate, endDate, "cleartool
lshistory -recurse -nco" );
}
public void testGetCommandLineWithTagAndStartDate()
@@ -86,8 +81,6 @@
testCommandLine( tag, startDate, endDate,
"cleartool lshistory -fmt
\"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o - %o - %c - Activity:
%[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco -since 10-Sep-2003 -branch
myBranch" );
-
- testClearCaseLTCommandLine( tag, startDate, endDate, "cleartool
lshistory -recurse -nco -branch myBranch" );
}
// ----------------------------------------------------------------------
@@ -98,21 +91,6 @@
throws Exception
{
File workingDirectory = getTestFile(
"target/clearcare-changelog-command-test" );
-
- ClearCaseChangeLogCommand.setIsClearCaseLT( false );
-
- Commandline cl = ClearCaseChangeLogCommand.createCommandLine(
workingDirectory, tag, startDate );
-
- assertEquals( commandLine, cl.toString() );
- }
-
- private void testClearCaseLTCommandLine( String tag, Date startDate, Date
endDate, String commandLine )
- throws Exception
- {
-
- File workingDirectory = getTestFile(
"target/clearcare-changelog-command-test" );
-
- ClearCaseChangeLogCommand.setIsClearCaseLT( true );
Commandline cl = ClearCaseChangeLogCommand.createCommandLine(
workingDirectory, tag, startDate );
