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 ev...@apache.org on 2005/11/24 21:01:41 UTC
svn commit: r348794 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase:
./ command/add/ command/checkin/ command/edit/ command/remove/
command/status/ command/tag/
Author: evenisse
Date: Thu Nov 24 12:01:32 2005
New Revision: 348794
URL: http://svn.apache.org/viewcvs?rev=348794&view=rev
Log:
PR: SCM-80
Submitted by: Wim Deblauwe
o Change log levels
o Fix tag command
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.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/edit/ClearCaseEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.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/tag/ClearCaseTagConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java Thu Nov 24 12:01:32 2005
@@ -121,12 +121,10 @@
protected StatusScmResult status( ScmRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException
{
- getLogger().info( "creating status command..." );
ClearCaseStatusCommand command = new ClearCaseStatusCommand();
command.setLogger( getLogger() );
- getLogger().info( "executing status command..." );
return (StatusScmResult)command.execute( repository.getProviderRepository(), fileSet, parameters );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddConsumer.java Thu Nov 24 12:01:32 2005
@@ -49,7 +49,7 @@
public void consumeLine( String line )
{
- logger.info( line );
+ logger.debug( line );
int beginIndex = line.indexOf( '"' );
String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );
addedFiles.add( new ScmFile( fileName, ScmFileStatus.ADDED ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkin/ClearCaseCheckInConsumer.java Thu Nov 24 12:01:32 2005
@@ -49,7 +49,7 @@
public void consumeLine( String line )
{
- logger.info( line );
+ logger.debug( line );
int beginIndex = line.indexOf( '"' );
String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );
checkedInFiles.add( new ScmFile( fileName, ScmFileStatus.CHECKED_IN ) );
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditCommand.java?rev=348794&r1=348793&r2=348794&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 Thu Nov 24 12:01:32 2005
@@ -20,7 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.edit.AbstractEditCommand;
-import org.apache.maven.scm.command.status.StatusScmResult;
+import org.apache.maven.scm.command.edit.EditScmResult;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.clearcase.command.ClearCaseCommand;
@@ -39,7 +39,7 @@
{
protected ScmResult executeEditCommand( ScmProviderRepository repository, ScmFileSet fileSet ) throws ScmException
{
- getLogger().error( "executing edit command..." );
+ getLogger().debug( "executing edit command..." );
Commandline cl = createCommandLine( getLogger(), fileSet );
ClearCaseEditConsumer consumer = new ClearCaseEditConsumer( getLogger() );
@@ -59,10 +59,10 @@
if (exitCode != 0)
{
- return new StatusScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
+ return new EditScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
}
- return new StatusScmResult( cl.toString(), consumer.getEditFiles() );
+ return new EditScmResult( cl.toString(), consumer.getEditFiles() );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/edit/ClearCaseEditConsumer.java Thu Nov 24 12:01:32 2005
@@ -49,7 +49,7 @@
public void consumeLine( String line )
{
- logger.info( line );
+ logger.debug( line );
int beginIndex = line.indexOf( '"' );
String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );
editFiles.add( new ScmFile( fileName, ScmFileStatus.UNKNOWN ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveConsumer.java Thu Nov 24 12:01:32 2005
@@ -49,7 +49,7 @@
public void consumeLine( String line )
{
- logger.info( line );
+ logger.debug( line );
int beginIndex = line.indexOf( '"' );
String fileName = line.substring( beginIndex + 1, line.indexOf( '"', beginIndex + 1 ) );
removedFiles.add( new ScmFile( fileName, ScmFileStatus.DELETED ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumer.java Thu Nov 24 12:01:32 2005
@@ -53,7 +53,7 @@
public void consumeLine( String line )
{
- logger.info( line );
+ logger.debug( line );
checkedOutFiles.add( new ScmFile( workingDirectory.getAbsolutePath() + line.substring( 1 ), ScmFileStatus.CHECKED_OUT ) );
}
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java?rev=348794&r1=348793&r2=348794&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 Thu Nov 24 12:01:32 2005
@@ -19,7 +19,6 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
@@ -33,90 +32,102 @@
/**
* @author <a href="mailto:wim.deblauwe@gmail.com">Wim Deblauwe</a>
- * @version
*/
public class ClearCaseTagCommand
- extends AbstractTagCommand
- implements ClearCaseCommand
+ extends AbstractTagCommand
+ implements ClearCaseCommand
{
- protected ScmResult executeTagCommand( ScmProviderRepository scmProviderRepository,
- ScmFileSet fileSet,
- String tag ) throws ScmException
- {
- Commandline cl = createCommandLine( fileSet, tag );
+ protected ScmResult executeTagCommand( ScmProviderRepository scmProviderRepository,
+ ScmFileSet fileSet,
+ String tag ) throws ScmException
+ {
+ Commandline cl = createCommandLine( fileSet, tag );
+
+ ClearCaseCheckInConsumer consumer = new ClearCaseCheckInConsumer( getLogger() );
+
+ CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+
+ int exitCode;
+
+ try
+ {
+ getLogger().debug( "Creating label: " + tag );
+ Commandline newLabelCommandLine = createNewLabelCommandLine( fileSet, tag );
+ getLogger().debug( newLabelCommandLine.toString() );
+ exitCode = CommandLineUtils.executeCommandLine( newLabelCommandLine, new CommandLineUtils.StringStreamConsumer(), stderr );
+
+ if (exitCode == 0)
+ {
+ getLogger().debug( cl.toString() );
+ exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
+ }
+ }
+ catch (CommandLineException ex)
+ {
+ throw new ScmException( "Error while executing clearcase command.", ex );
+ }
+
+ if (exitCode != 0)
+ {
+ return new TagScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
+ }
+
+ return new TagScmResult( cl.toString(), consumer.getCheckedInFiles() );
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ public static Commandline createCommandLine( ScmFileSet scmFileSet, String tag )
+ {
+ Commandline command = new Commandline();
+
+ File workingDirectory = scmFileSet.getBasedir();
+
+ command.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+
+ command.setExecutable( "cleartool" );
+
+ command.createArgument().setValue( "mklabel" );
+ if (scmFileSet.getFiles().length == 0)
+ {
+ command.createArgument().setValue( "-recurse" );
+ }
+ command.createArgument().setValue( tag );
+
+ File[] files = scmFileSet.getFiles();
+ if (files.length == 0)
+ {
+ command.createArgument().setValue( "." );
+ }
+ else
+ {
+ for (int i = 0; i < files.length; i++)
+ {
+ File file = files[i];
+ command.createArgument().setValue( file.getName() );
+ }
+ }
+
+ return command;
+ }
+
+ private static Commandline createNewLabelCommandLine( ScmFileSet scmFileSet, String tag )
+ {
+ Commandline command = new Commandline();
+
+ File workingDirectory = scmFileSet.getBasedir();
+
+ command.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+
+ command.setExecutable( "cleartool" );
+
+ command.createArgument().setValue( "mklbtype" );
+ command.createArgument().setValue( "-nc" );
+ command.createArgument().setValue( tag );
- ClearCaseCheckInConsumer consumer = new ClearCaseCheckInConsumer( getLogger() );
-
- CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-
- int exitCode;
-
- try
- {
- Commandline newLabelCommandLine = createNewLabelCommandLine( fileSet, tag );
- exitCode = CommandLineUtils.executeCommandLine( newLabelCommandLine, new CommandLineUtils.StringStreamConsumer(), stderr );
-
- if( exitCode == 0 )
- {
- exitCode = CommandLineUtils.executeCommandLine( cl, consumer, stderr );
- }
- }
- catch ( CommandLineException ex )
- {
- throw new ScmException( "Error while executing clearcase command.", ex );
- }
-
- if ( exitCode != 0 )
- {
- return new CheckInScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
- }
-
- return new TagScmResult( cl.toString(), consumer.getCheckedInFiles() );
- }
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- public static Commandline createCommandLine( ScmFileSet scmFileSet, String tag )
- {
- Commandline command = new Commandline();
-
- File workingDirectory = scmFileSet.getBasedir();
-
- command.setWorkingDirectory( workingDirectory.getAbsolutePath() );
-
- command.setExecutable( "cleartool" );
-
- command.createArgument().setValue( "mklabel" );
- command.createArgument().setValue( tag );
-
- File[] files = scmFileSet.getFiles();
- for (int i = 0; i < files.length; i++)
- {
- File file = files[i];
- command.createArgument().setValue( file.getName() );
- }
-
-
- return command;
- }
-
- private static Commandline createNewLabelCommandLine( ScmFileSet scmFileSet, String tag )
- {
- Commandline command = new Commandline();
-
- File workingDirectory = scmFileSet.getBasedir();
-
- command.setWorkingDirectory( workingDirectory.getAbsolutePath() );
-
- command.setExecutable( "cleartool" );
-
- command.createArgument().setValue( "mklbtype" );
- command.createArgument().setValue( "-nc" );
- command.createArgument().setValue( tag );
-
- return command;
- }
+ return command;
+ }
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java?rev=348794&r1=348793&r2=348794&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumer.java Thu Nov 24 12:01:32 2005
@@ -50,7 +50,7 @@
public void consumeLine( String line )
{
- logger.info( line );
+ logger.debug( line );
int beginIndexTag = line.indexOf( '"' );
int endIndexTag = line.indexOf( '"', beginIndexTag + 1 );
int beginIndex = line.indexOf( '"', endIndexTag + 1 );