Index: D:/java/workspace/maven-scm/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java =================================================================== --- D:/java/workspace/maven-scm/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java (revision 405408) +++ D:/java/workspace/maven-scm/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommandTest.java (working copy) @@ -25,6 +25,7 @@ /** * @author Emmanuel Venisse * @author Trygve Laugstøl + * @author Mark Holster * @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" ); } // ---------------------------------------------------------------------- @@ -99,23 +92,8 @@ { 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 ); - - assertEquals( commandLine, cl.toString() ); - } } Index: D:/java/workspace/maven-scm/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java =================================================================== --- D:/java/workspace/maven-scm/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java (revision 405408) +++ D:/java/workspace/maven-scm/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java (working copy) @@ -38,6 +38,7 @@ * @author Emmanuel Venisse * @author Trygve Laugstøl * @author Frederic Mura + * @author Mark Holster * @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 ); @@ -139,24 +137,4 @@ 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 ); - } }