You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/04/23 10:29:41 UTC
svn commit: r1329120 [2/4] - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz: ./
src/main/java/org/apache/maven/scm/provider/jazz/
src/main/java/org/apache/maven/scm/provider/jazz/command/
src/main/java/org/apache/maven/scm/provider/jaz...
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/AbstractRepositoryConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/AbstractRepositoryConsumer.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/AbstractRepositoryConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/AbstractRepositoryConsumer.java Mon Apr 23 08:29:39 2012
@@ -31,7 +31,7 @@ public abstract class AbstractRepository
{
// The repository that we are working with.
private ScmProviderRepository repository = null;
-
+
// Have we processed input?
protected boolean fed = false;
@@ -80,6 +80,7 @@ public abstract class AbstractRepository
/**
* Process one line of output from the execution of the "scm xxxx" command.
+ *
* @param line The line of output from the external command that has been pumped to us.
* @see org.codehaus.plexus.util.cli.StreamConsumer#consumeLine(java.lang.String)
*/
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumer.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/DebugLoggerConsumer.java Mon Apr 23 08:29:39 2012
@@ -24,14 +24,14 @@ import org.apache.maven.scm.log.ScmLogge
/**
* This class exists only to consume output that is normally not needed,
* though it may be of interest when in debug mode.
- *
+ * <p/>
* For example, "scm lock acquire" produces:
* "Locks successfully acquired."
* and "scm lock release" produces:
* "Locks successfully released."
- *
+ * <p/>
* So, basically nothing of real interest to parse and pass back.
- *
+ *
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class DebugLoggerConsumer
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumer.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/consumer/ErrorConsumer.java Mon Apr 23 08:29:39 2012
@@ -31,8 +31,8 @@ public class ErrorConsumer
private boolean fFed = false;
private ScmLogger logger;
-
- public ErrorConsumer(ScmLogger logger)
+
+ public ErrorConsumer( ScmLogger logger )
{
this.logger = logger;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java Mon Apr 23 08:29:39 2012
@@ -19,12 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -40,6 +34,12 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
import org.apache.maven.scm.provider.jazz.command.status.JazzStatusCommand;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
// The Maven SCM plugin "diff" goal may have different interpretations in RTC depending on how
// the user is using RTC. In one instance, the user may expect the diff to report back on the differences between
// the local 'sandbox' and their connected repository workspace (ie. What files are 'unresolved').
@@ -118,7 +118,7 @@ public class JazzDiffCommand
// sum all output into on.
JazzScmCommand diffCmd = null;
StringBuilder patch = new StringBuilder();
- Map<String,CharSequence> differences = new HashMap<String,CharSequence>();
+ Map<String, CharSequence> differences = new HashMap<String, CharSequence>();
// Now lets iterate through them
for ( Iterator<ScmFile> it = statusScmFiles.iterator(); it.hasNext(); )
@@ -132,7 +132,7 @@ public class JazzDiffCommand
String relativePath = fullPath.toString().substring( baseDir.toString().length() );
getLogger().debug( "Full Path : '" + fullPath + "'" );
getLogger().debug( "Relative Path : '" + relativePath + "'" );
-
+
// Now call "scm diff on it"
// In this case, we use the DebugLoggerConsumer's ability to store captured output
DebugLoggerConsumer diffConsumer = new DebugLoggerConsumer( getLogger() );
@@ -142,7 +142,8 @@ public class JazzDiffCommand
if ( status != 0 || errConsumer.hasBeenFed() )
{
// Return a false result (not the usual SCMResult)
- return new DiffScmResult( diffCmd.toString(), "The scm diff command failed.", errConsumer.getOutput(), false );
+ return new DiffScmResult( diffCmd.toString(), "The scm diff command failed.",
+ errConsumer.getOutput(), false );
}
// Append to patch (all combined)
patch.append( diffConsumer.getOutput() );
@@ -151,7 +152,8 @@ public class JazzDiffCommand
}
}
- return new DiffScmResult( diffCmd.toString(), statusCmdResult.getChangedFiles(), differences, patch.toString() );
+ return new DiffScmResult( diffCmd.toString(), statusCmdResult.getChangedFiles(), differences,
+ patch.toString() );
}
public JazzScmCommand createDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, String relativePath )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java Mon Apr 23 08:29:39 2012
@@ -19,10 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -34,6 +30,10 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.consumer.DebugLoggerConsumer;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
// In RTC the need to 'edit' or 'lock' a file is not required. It is actually encouraged to not
// lock 'text' based files and to only lock binary file types.
//
@@ -81,17 +81,18 @@ public class JazzEditCommand
if ( status != 0 || errConsumer.hasBeenFed() )
{
- return new EditScmResult( editCmd.getCommandString(),
- "Error code for Jazz SCM edit command - " + status,
+ return new EditScmResult( editCmd.getCommandString(), "Error code for Jazz SCM edit command - " + status,
errConsumer.getOutput(), false );
}
- return new EditScmResult( editCmd.getCommandString(), "Successfully Completed.", editConsumer.getOutput(), true );
+ return new EditScmResult( editCmd.getCommandString(), "Successfully Completed.", editConsumer.getOutput(),
+ true );
}
protected JazzScmCommand createEditCommand( ScmProviderRepository repo, ScmFileSet fileSet )
{
- JazzScmCommand command = new JazzScmCommand( JazzConstants.CMD_LOCK, JazzConstants.CMD_SUB_ACQUIRE, repo, fileSet, getLogger() );
+ JazzScmCommand command =
+ new JazzScmCommand( JazzConstants.CMD_LOCK, JazzConstants.CMD_SUB_ACQUIRE, repo, fileSet, getLogger() );
List<File> files = fileSet.getFileList();
if ( files != null && !files.isEmpty() )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java Mon Apr 23 08:29:39 2012
@@ -59,7 +59,7 @@ public class JazzListCommand
}
JazzScmProviderRepository jazzRepo = (JazzScmProviderRepository) repo;
-
+
JazzListConsumer listConsumer = new JazzListConsumer( repo, getLogger() );
ErrorConsumer errConsumer = new ErrorConsumer( getLogger() );
@@ -67,8 +67,7 @@ public class JazzListCommand
int status = listCmd.execute( listConsumer, errConsumer );
if ( status != 0 || errConsumer.hasBeenFed() )
{
- return new ListScmResult( listCmd.getCommandString(),
- "Error code for Jazz SCM list command - " + status,
+ return new ListScmResult( listCmd.getCommandString(), "Error code for Jazz SCM list command - " + status,
errConsumer.getOutput(), false );
}
@@ -80,7 +79,8 @@ public class JazzListCommand
{
// recursive is implicit in the command, so it is ignored.
// version is meaningless, so it is ignored.
- JazzScmCommand command = new JazzScmCommand( JazzConstants.CMD_LIST, JazzConstants.CMD_SUB_REMOTEFILES, repo, fileSet, getLogger() );
+ JazzScmCommand command =
+ new JazzScmCommand( JazzConstants.CMD_LIST, JazzConstants.CMD_SUB_REMOTEFILES, repo, fileSet, getLogger() );
command.addArgument( repo.getRepositoryWorkspace() );
command.addArgument( repo.getComponent() );
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListConsumer.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListConsumer.java Mon Apr 23 08:29:39 2012
@@ -19,18 +19,18 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Consume the output of the scm command for the "list" operation.
- *
+ *
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class JazzListConsumer
@@ -40,8 +40,9 @@ public class JazzListConsumer
/**
* Construct the JazzListCommand consumer.
+ *
* @param repository The repository we are working with.
- * @param logger The logger to use.
+ * @param logger The logger to use.
*/
public JazzListConsumer( ScmProviderRepository repository, ScmLogger logger )
{
@@ -50,6 +51,7 @@ public class JazzListConsumer
/**
* Process one line of output from the execution of the "scm list" command.
+ *
* @param line The line of output from the external command that has been pumped to us.
* @see org.codehaus.plexus.util.cli.StreamConsumer#consumeLine(java.lang.String)
*/
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java Mon Apr 23 08:29:39 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.Iterator;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -31,6 +29,8 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.JazzScmCommand;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
+import java.util.Iterator;
+
//
// See the following links for additional information on the RTC "status" command:
// RTC 2.0.0.2:
@@ -66,8 +66,8 @@ public class JazzStatusCommand
if ( status != 0 || errConsumer.hasBeenFed() )
{
return new StatusScmResult( statusCmd.getCommandString(),
- "Error code for Jazz SCM status command - " + status,
- errConsumer.getOutput(), false );
+ "Error code for Jazz SCM status command - " + status, errConsumer.getOutput(),
+ false );
}
if ( getLogger().isDebugEnabled() )
@@ -93,7 +93,8 @@ public class JazzStatusCommand
public JazzScmCommand createStatusCommand( ScmProviderRepository repo, ScmFileSet fileSet )
{
- JazzScmCommand command = new JazzScmCommand( JazzConstants.CMD_STATUS, null, repo, false, fileSet, getLogger() );
+ JazzScmCommand command =
+ new JazzScmCommand( JazzConstants.CMD_STATUS, null, repo, false, fileSet, getLogger() );
command.addArgument( JazzConstants.ARG_STATUS_WIDE_PRINT_OUT );
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java Mon Apr 23 08:29:39 2012
@@ -19,9 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
@@ -31,16 +28,19 @@ import org.apache.maven.scm.provider.jaz
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Consume the output of the scm command for the "status" operation.
- *
+ * <p/>
* It is normally just used to build up a list of ScmFile objects that have
* their ScmFileStatus set.
* This class has been expanded so that the Workspace, Component and Baseline
* are also collected and set back in the JazzScmProviderRepository.
* The Workspace and Component names are needed for some other commands (list,
* for example), so we can easily get this information here.
- *
+ *
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class JazzStatusConsumer
@@ -69,7 +69,7 @@ public class JazzStatusConsumer
// Workspace: (1000) "BogusRepositoryWorkspace" <-> (1000) "BogusRepositoryWorkspace"
// Workspace: (1156) "GPDBWorkspace" <-> (1157) "GPDBStream"
private static final String WORKSPACE_PATTERN = "\\((\\d+)\\) \"(.*)\" <-> \\((\\d+)\\) \"(.*)\"";
-
+
/**
* @see #WORKSPACE_PATTERN
*/
@@ -94,30 +94,31 @@ public class JazzStatusConsumer
// Baseline: (1128) 27 "BogusTestJazz-3.0.0.40"
private static final String BASELINE_PATTERN = "\\((\\d+)\\) (\\d+) \"(.*)\"";
-
+
/**
* @see #BASELINE_PATTERN
*/
private RE baselineRegExp;
-
// Additional data we collect. (eye catchers)
+
/**
* The "Status" command output line that contains the "Workspace" name.
*/
public static final String STATUS_CMD_WORKSPACE = "Workspace:";
-
+
/**
* The "Status" command output line that contains the "Component" name.
*/
public static final String STATUS_CMD_COMPONENT = "Component:";
-
+
/**
* The "Status" command output line that contains the "Workspace" name.
*/
public static final String STATUS_CMD_BASELINE = "Baseline:";
-
+
// File Status Commands (eye catchers)
+
/**
* The "Status" command status flag for a resource that has been added.
*/
@@ -146,13 +147,14 @@ public class JazzStatusConsumer
/**
* Constructor for our "scm status" consumer.
- * @param repo The JazzScmProviderRepository being used.
+ *
+ * @param repo The JazzScmProviderRepository being used.
* @param logger The ScmLogger to use.
*/
public JazzStatusConsumer( ScmProviderRepository repo, ScmLogger logger )
{
super( repo, logger );
-
+
try
{
workspaceRegExp = new RE( WORKSPACE_PATTERN );
@@ -165,11 +167,12 @@ public class JazzStatusConsumer
throw new RuntimeException(
"INTERNAL ERROR: Could not create regexp to parse jazz scm status output. This shouldn't happen. Something is probably wrong with the oro installation.",
ex );
- }
+ }
}
/**
* Process one line of output from the execution of the "scm status" command.
+ *
* @param line The line of output from the external command that has been pumped to us.
* @see org.codehaus.plexus.util.cli.StreamConsumer#consumeLine(java.lang.String)
*/
@@ -205,7 +208,7 @@ public class JazzStatusConsumer
// Workspace: (1000) "BogusRepositoryWorkspace" <-> (1000) "BogusRepositoryWorkspace"
// With a stream:
// Workspace: (1156) "GPDBWorkspace" <-> (1157) "GPDBStream"
-
+
if ( workspaceRegExp.match( line ) )
{
JazzScmProviderRepository jazzRepository = (JazzScmProviderRepository) getRepository();
@@ -256,7 +259,7 @@ public class JazzStatusConsumer
getLogger().debug( " component = " + component );
}
jazzRepository.setComponent( component );
- }
+ }
if ( componentRegExp2.match( line ) )
{
@@ -271,7 +274,7 @@ public class JazzStatusConsumer
getLogger().debug( " component = " + component );
}
jazzRepository.setComponent( component );
- }
+ }
}
private boolean containsBaseline( String line )
@@ -309,8 +312,8 @@ public class JazzStatusConsumer
{
String flag = line.trim().substring( 0, 2 );
if ( STATUS_CMD_ADD_FLAG.equals( flag ) ||
- STATUS_CMD_CHANGE_FLAG.equals( flag ) ||
- STATUS_CMD_DELETE_FLAG.equals( flag ) )
+ STATUS_CMD_CHANGE_FLAG.equals( flag ) ||
+ STATUS_CMD_DELETE_FLAG.equals( flag ) )
{
containsStatusFlag = true;
}
@@ -341,10 +344,10 @@ public class JazzStatusConsumer
if ( getLogger().isDebugEnabled() )
{
- getLogger().debug(" Line : '" + line +"'" );
- getLogger().debug(" Extracted filePath : '" + filePath +"'" );
- getLogger().debug(" Extracted flag : '" + flag + "'");
- getLogger().debug(" Extracted status : '" + status + "'");
+ getLogger().debug( " Line : '" + line + "'" );
+ getLogger().debug( " Extracted filePath : '" + filePath + "'" );
+ getLogger().debug( " Extracted flag : '" + flag + "'" );
+ getLogger().debug( " Extracted status : '" + status + "'" );
}
fChangedFiles.add( new ScmFile( filePath, status ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java Mon Apr 23 08:29:39 2012
@@ -19,10 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -39,6 +35,10 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
// The Maven SCM Plugin "tag" goal is equivalent to the RTC "create snapshot" command.
//
// Once the tag (snapshot in RTC terms) has been created, a repository workspace is then created
@@ -82,9 +82,11 @@ public class JazzTagCommand
JazzScmProviderRepository jazzRepo = (JazzScmProviderRepository) repo;
getLogger().debug( "Creating Snapshot..." );
- StreamConsumer tagConsumer = new DebugLoggerConsumer( getLogger() ); // No need for a dedicated consumer for this
+ StreamConsumer tagConsumer =
+ new DebugLoggerConsumer( getLogger() ); // No need for a dedicated consumer for this
ErrorConsumer errConsumer = new ErrorConsumer( getLogger() );
- JazzScmCommand tagCreateSnapshotCmd = createTagCreateSnapshotCommand( jazzRepo, fileSet, tag, scmTagParameters );
+ JazzScmCommand tagCreateSnapshotCmd =
+ createTagCreateSnapshotCommand( jazzRepo, fileSet, tag, scmTagParameters );
int status = tagCreateSnapshotCmd.execute( tagConsumer, errConsumer );
if ( status != 0 || errConsumer.hasBeenFed() )
@@ -110,26 +112,26 @@ public class JazzTagCommand
}
// ------------------------------------------------------------------
- if (jazzRepo.isPushChangesAndHaveFlowTargets())
+ if ( jazzRepo.isPushChangesAndHaveFlowTargets() )
{
// isPushChanges = true, and we have something to deliver and promote to.
getLogger().debug( "Promoting and delivering..." );
-
+
// So we deliver the code to the target stream (or workspace)
getLogger().debug( "Delivering..." );
- JazzScmCommand tagDeliverCommand = createTagDeliverCommand( jazzRepo, fileSet, tag);
+ JazzScmCommand tagDeliverCommand = createTagDeliverCommand( jazzRepo, fileSet, tag );
errConsumer = new ErrorConsumer( getLogger() );
status = tagDeliverCommand.execute( tagConsumer, errConsumer );
if ( status != 0 || errConsumer.hasBeenFed() )
{
return new TagScmResult( tagDeliverCommand.getCommandString(),
- "Error code for Jazz SCM deliver command - " + status,
- errConsumer.getOutput(), false );
+ "Error code for Jazz SCM deliver command - " + status, errConsumer.getOutput(),
+ false );
}
-
+
// And now we promote the snapshot to the target stream (or workspace)
getLogger().debug( "Promoting snapshot..." );
- JazzScmCommand tagSnapshotPromoteCommand = createTagSnapshotPromoteCommand( jazzRepo, fileSet, tag);
+ JazzScmCommand tagSnapshotPromoteCommand = createTagSnapshotPromoteCommand( jazzRepo, fileSet, tag );
errConsumer = new ErrorConsumer( getLogger() );
status = tagSnapshotPromoteCommand.execute( tagConsumer, errConsumer );
if ( status != 0 || errConsumer.hasBeenFed() )
@@ -155,8 +157,8 @@ public class JazzTagCommand
// Create the JazzScmCommand to execute the "scm create snapshot ..." command
// This will create a snapshot of the remote repository
- public JazzScmCommand createTagCreateSnapshotCommand( JazzScmProviderRepository repo, ScmFileSet fileSet, String tag,
- ScmTagParameters scmTagParameters )
+ public JazzScmCommand createTagCreateSnapshotCommand( JazzScmProviderRepository repo, ScmFileSet fileSet,
+ String tag, ScmTagParameters scmTagParameters )
{
JazzScmCommand command =
new JazzScmCommand( JazzConstants.CMD_CREATE, JazzConstants.CMD_SUB_SNAPSHOT, repo, fileSet, getLogger() );
@@ -181,14 +183,15 @@ public class JazzTagCommand
// Create the JazzScmCommand to execute the "scm snapshot promote ..." command
// This will promote the snapshot to the flow target (the stream or other workspace).
- public JazzScmCommand createTagSnapshotPromoteCommand( JazzScmProviderRepository repo, ScmFileSet fileSet, String tag)
+ public JazzScmCommand createTagSnapshotPromoteCommand( JazzScmProviderRepository repo, ScmFileSet fileSet,
+ String tag )
{
JazzScmCommand command =
new JazzScmCommand( JazzConstants.CMD_SNAPSHOT, JazzConstants.CMD_SUB_PROMOTE, repo, fileSet, getLogger() );
- if ( repo.getFlowTarget() != null && !repo.getFlowTarget().equals( "" ))
+ if ( repo.getFlowTarget() != null && !repo.getFlowTarget().equals( "" ) )
{
- command.addArgument( repo.getFlowTarget() );
+ command.addArgument( repo.getFlowTarget() );
}
if ( tag != null && !tag.trim().equals( "" ) )
{
@@ -200,23 +203,22 @@ public class JazzTagCommand
// Create the JazzScmCommand to execute the "scm deliver ..." command
// This will deliver the changes to the flow target (stream or other workspace).
- public JazzScmCommand createTagDeliverCommand( JazzScmProviderRepository repo, ScmFileSet fileSet, String tag)
+ public JazzScmCommand createTagDeliverCommand( JazzScmProviderRepository repo, ScmFileSet fileSet, String tag )
{
- JazzScmCommand command =
- new JazzScmCommand( JazzConstants.CMD_DELIVER, repo, fileSet, getLogger() );
+ JazzScmCommand command = new JazzScmCommand( JazzConstants.CMD_DELIVER, repo, fileSet, getLogger() );
- if ( repo.getWorkspace() != null && !repo.getWorkspace().equals( "" ))
+ if ( repo.getWorkspace() != null && !repo.getWorkspace().equals( "" ) )
{
// Don't deliver from the workspace, as it has the release.properties etc files in it
// and jazz will choke on them, so use the workspace that we just created (tag) instead.
command.addArgument( JazzConstants.ARG_DELIVER_SOURCE );
- command.addArgument( tag );
+ command.addArgument( tag );
}
-
- if ( repo.getFlowTarget() != null && !repo.getFlowTarget().equals( "" ))
+
+ if ( repo.getFlowTarget() != null && !repo.getFlowTarget().equals( "" ) )
{
command.addArgument( JazzConstants.ARG_DELIVER_TARGET );
- command.addArgument( repo.getFlowTarget() );
+ command.addArgument( repo.getFlowTarget() );
}
return command;
@@ -224,7 +226,8 @@ public class JazzTagCommand
// Create the JazzScmCommand to execute the "scm create workspace ..." command
// This will create a workspace of the same name as the tag.
- public JazzScmCommand createTagCreateWorkspaceCommand( JazzScmProviderRepository repo, ScmFileSet fileSet, String tag)
+ public JazzScmCommand createTagCreateWorkspaceCommand( JazzScmProviderRepository repo, ScmFileSet fileSet,
+ String tag )
{
JazzScmCommand command =
new JazzScmCommand( JazzConstants.CMD_CREATE, JazzConstants.CMD_SUB_WORKSPACE, repo, fileSet, getLogger() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java Mon Apr 23 08:29:39 2012
@@ -19,10 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -34,6 +30,10 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.consumer.DebugLoggerConsumer;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
// In RTC the need to 'edit' or 'lock' a file is not required. It is actually encouraged to not
// lock 'text' based files and to only lock binary file types.
//
@@ -82,16 +82,18 @@ public class JazzUnEditCommand
if ( status != 0 || errConsumer.hasBeenFed() )
{
return new UnEditScmResult( uneditCmd.getCommandString(),
- "Error code for Jazz SCM unedit command - " + status,
- errConsumer.getOutput(), false );
+ "Error code for Jazz SCM unedit command - " + status, errConsumer.getOutput(),
+ false );
}
- return new UnEditScmResult( uneditCmd.getCommandString(), "Successfully Completed.", uneditConsumer.getOutput(), true );
+ return new UnEditScmResult( uneditCmd.getCommandString(), "Successfully Completed.", uneditConsumer.getOutput(),
+ true );
}
public JazzScmCommand createUneditCommand( ScmProviderRepository repo, ScmFileSet fileSet )
{
- JazzScmCommand command = new JazzScmCommand( JazzConstants.CMD_LOCK, JazzConstants.CMD_SUB_RELEASE, repo, fileSet, getLogger() );
+ JazzScmCommand command =
+ new JazzScmCommand( JazzConstants.CMD_LOCK, JazzConstants.CMD_SUB_RELEASE, repo, fileSet, getLogger() );
List<File> files = fileSet.getFileList();
if ( files != null && !files.isEmpty() )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java Mon Apr 23 08:29:39 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.Iterator;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -34,6 +32,8 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.changelog.JazzChangeLogCommand;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
+import java.util.Iterator;
+
//
// The Maven SCM Plugin "update" goal is equivalent to the RTC "accept" command.
//
@@ -79,8 +79,7 @@ public class JazzUpdateCommand
if ( status != 0 || err.hasBeenFed() )
{
return new UpdateScmResult( updateCmd.getCommandString(),
- "Error code for Jazz SCM update command - " + status,
- err.getOutput(), false );
+ "Error code for Jazz SCM update command - " + status, err.getOutput(), false );
}
if ( getLogger().isDebugEnabled() )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateConsumer.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateConsumer.java Mon Apr 23 08:29:39 2012
@@ -19,20 +19,20 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* Consume the output of the scm command for the "acept" operation.
- *
+ *
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class JazzUpdateConsumer
@@ -63,8 +63,9 @@ public class JazzUpdateConsumer
/**
* Construct the JazzUpdateCommand consumer.
+ *
* @param repository The repository we are working with.
- * @param logger The logger to use.
+ * @param logger The logger to use.
*/
public JazzUpdateConsumer( ScmProviderRepository repository, ScmLogger logger )
{
@@ -73,6 +74,7 @@ public class JazzUpdateConsumer
/**
* Process one line of output from the execution of the "scm xxxx" command.
+ *
* @param line The line of output from the external command that has been pumped to us.
* @see org.codehaus.plexus.util.cli.StreamConsumer#consumeLine(java.lang.String)
*/
@@ -93,9 +95,9 @@ public class JazzUpdateConsumer
{
String flag = line.trim().substring( 0, 3 );
if ( UPDATE_CMD_ADD_FLAG.equals( flag ) ||
- UPDATE_CMD_CHANGE_FLAG.equals( flag ) ||
- UPDATE_CMD_DELETE_FLAG.equals( flag ) ||
- UPDATE_CMD_MOVED_FLAG.equals( flag ) )
+ UPDATE_CMD_CHANGE_FLAG.equals( flag ) ||
+ UPDATE_CMD_DELETE_FLAG.equals( flag ) ||
+ UPDATE_CMD_MOVED_FLAG.equals( flag ) )
{
containsStatusFlag = true;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/repository/JazzScmProviderRepository.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/repository/JazzScmProviderRepository.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/repository/JazzScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/repository/JazzScmProviderRepository.java Mon Apr 23 08:29:39 2012
@@ -28,12 +28,12 @@ import org.codehaus.plexus.util.StringUt
public class JazzScmProviderRepository
extends ScmProviderRepositoryWithHost
{
- /**
- * The URI of the repository server.
- * Of the form <protocol>://<server>:<port>/<path>
- * For example:
- * https://rtc:9444/jazz
- */
+ /**
+ * The URI of the repository server.
+ * Of the form <protocol>://<server>:<port>/<path>
+ * For example:
+ * https://rtc:9444/jazz
+ */
private String fRepositoryURI;
/**
@@ -50,15 +50,15 @@ public class JazzScmProviderRepository
* The alias of the repository workspace, as returned from the "scm status" command.
*/
private int fWorkspaceAlias;
-
+
/**
* The name of the repository workspace, as returned from the "scm status" command.
*/
private String fWorkspace;
-
+
// Note: If there are no flow targets defined, then the repository workspace points to itself,
// so fWorkspaceAlias = fStreamAlias and fWorkspace = fStream
-
+
// TODO: Change to enable multiple flow targets, via a List (?).
// NOTE: We are not parsing the Component Alias nor the Baseline Alias, as they are not currently needed.
@@ -72,22 +72,23 @@ public class JazzScmProviderRepository
* The name of the flow target, as returned from the "scm status" command.
*/
private String fFlowTarget; // Can also be a repository workspace, possibly the same as fWorkspace
-
+
/**
* The name of the component, as returned from the "scm status" command.
*/
private String fComponent;
-
+
/**
* The name of the baseline, as returned from the "scm status" command.
*/
private String fBaseline;
-
+
// TODO In the future we might expand the details of this repository.
// For example we might extend the scm url to include a stream (as well as the repository workspace)
// This stream could represent the desired flow target of the repository workspace.
// We would also need to cater for multiple streams/flow targets.
- public JazzScmProviderRepository( String repositoryURI, String userName, String password, String hostName, int port, String repositoryWorkspace )
+ public JazzScmProviderRepository( String repositoryURI, String userName, String password, String hostName, int port,
+ String repositoryWorkspace )
{
this.fRepositoryURI = repositoryURI;
setUser( userName );
@@ -102,7 +103,7 @@ public class JazzScmProviderRepository
*/
public boolean isPushChangesAndHaveFlowTargets()
{
- if (!isPushChanges())
+ if ( !isPushChanges() )
{
return isPushChanges();
}
@@ -131,9 +132,10 @@ public class JazzScmProviderRepository
return false;
}
}
-
+
/**
* Return the URI of the repository server, as parsed from the URL.
+ *
* @return The URI of the repository server, as parsed from the URL.
*/
public String getRepositoryURI()
@@ -143,6 +145,7 @@ public class JazzScmProviderRepository
/**
* Return the name of the remote repository workspace, as parsed from the URL.
+ *
* @return The name of the remote repository workspace, as parsed from the URL.
*/
public String getRepositoryWorkspace()
@@ -249,8 +252,10 @@ public class JazzScmProviderRepository
{
this.fBaseline = baseline;
}
-
- /** {@inheritDoc} */
+
+ /**
+ * {@inheritDoc}
+ */
public String toString()
{
return getRepositoryURI() + ":" + getRepositoryWorkspace();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java Mon Apr 23 08:29:39 2012
@@ -36,15 +36,17 @@ public class JazzScmCommandTest
{
JazzScmCommand listCommand = new JazzScmCommand( "list", getScmProviderRepository(), null, null );
String actual = listCommand.getCommandline().toString();
- String expected = "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword\"";
+ String expected =
+ "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword\"";
assertEquals( "Constructing command line failed!", expected, actual );
}
-
+
public void testCryptPassword()
{
JazzScmCommand listCommand = new JazzScmCommand( "list", getScmProviderRepository(), null, null );
- String actual = JazzScmCommand.cryptPassword(listCommand.getCommandline());
- String expected = "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password *****\"";
+ String actual = JazzScmCommand.cryptPassword( listCommand.getCommandline() );
+ String expected =
+ "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password *****\"";
assertEquals( "cryptPassword failed!", expected, actual );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java Mon Apr 23 08:29:39 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -37,9 +35,11 @@ import org.codehaus.plexus.util.StringUt
import org.codehaus.plexus.util.cli.StreamConsumer;
import org.junit.Assert;
+import java.io.File;
+
/**
* Common utilities for Jazz TCK tests.
- *
+ *
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class JazzTckUtil
@@ -48,15 +48,16 @@ public class JazzTckUtil
private long currentSystemTimeMillis = System.currentTimeMillis();
private String tckBaseDir;
-
+
private String scmUrl;
private String snapshotName;
-
+
/**
* Get the specified system property. Borrowed from AccuRevTckUtil.
* TODO: Refactor to a common usage.
- * @param name The name of the property to get.
+ *
+ * @param name The name of the property to get.
* @param defaultValue A default value if not found.
* @return
*/
@@ -70,10 +71,10 @@ public class JazzTckUtil
}
return result;
}
-
+
/* (non-Javadoc)
- * @see org.apache.maven.scm.command.AbstractCommand#executeCommand(org.apache.maven.scm.provider.ScmProviderRepository, org.apache.maven.scm.ScmFileSet, org.apache.maven.scm.CommandParameters)
- */
+ * @see org.apache.maven.scm.command.AbstractCommand#executeCommand(org.apache.maven.scm.provider.ScmProviderRepository, org.apache.maven.scm.ScmFileSet, org.apache.maven.scm.CommandParameters)
+ */
@Override
protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
@@ -81,13 +82,14 @@ public class JazzTckUtil
{
JazzScmProviderRepository jazzRepo = (JazzScmProviderRepository) repository;
-
- StreamConsumer tckConsumer = new DebugLoggerConsumer( getLogger() ); // No need for a dedicated consumer for this
+ StreamConsumer tckConsumer =
+ new DebugLoggerConsumer( getLogger() ); // No need for a dedicated consumer for this
ErrorConsumer errConsumer = new ErrorConsumer( getLogger() );
String nameWorkspace = jazzRepo.getRepositoryWorkspace();
//String nameSnapshot = "MavenSCMTestSnapshot";
String nameSnapshot = getSnapshotName();
- JazzScmCommand tckCreateWorkspaceFromSnapshotCmd = createCreateWorkspaceFromSnapshotCommand( jazzRepo, fileSet, nameWorkspace, nameSnapshot );
+ JazzScmCommand tckCreateWorkspaceFromSnapshotCmd =
+ createCreateWorkspaceFromSnapshotCommand( jazzRepo, fileSet, nameWorkspace, nameSnapshot );
int status = tckCreateWorkspaceFromSnapshotCmd.execute( tckConsumer, errConsumer );
if ( status != 0 || errConsumer.hasBeenFed() )
@@ -96,13 +98,15 @@ public class JazzTckUtil
"Error code for Jazz SCM (create workspace --snapshot) command - " + status,
errConsumer.getOutput(), false );
}
-
- return new ScmResult( tckCreateWorkspaceFromSnapshotCmd.getCommandString(), "All ok", ((DebugLoggerConsumer)tckConsumer).getOutput(), true );
+
+ return new ScmResult( tckCreateWorkspaceFromSnapshotCmd.getCommandString(), "All ok",
+ ( (DebugLoggerConsumer) tckConsumer ).getOutput(), true );
}
// Create the JazzScmCommand to execute the "scm create workspace ..." command
// This will create a workspace of the same name as the tag.
- private JazzScmCommand createCreateWorkspaceFromSnapshotCommand( JazzScmProviderRepository repo, ScmFileSet fileSet, String nameWorkspace, String nameSnapshot)
+ private JazzScmCommand createCreateWorkspaceFromSnapshotCommand( JazzScmProviderRepository repo, ScmFileSet fileSet,
+ String nameWorkspace, String nameSnapshot )
{
JazzScmCommand command =
new JazzScmCommand( JazzConstants.CMD_CREATE, JazzConstants.CMD_SUB_WORKSPACE, repo, fileSet, getLogger() );
@@ -128,7 +132,7 @@ public class JazzTckUtil
* Create a unique repository workspace using the system time, based
* upon a supplied snapshot. The creation of this initial snapshot
* currently can not be scripted, so it needs to be done manually first.
- *
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
public void initRepo( ScmRepository repository )
@@ -137,7 +141,7 @@ public class JazzTckUtil
// Set a default logger. because I cann't get to the ones later on...
setLogger( new DefaultLog() );
// Create the unique workspace based upon a snapshot
- executeCommand( repository.getProviderRepository(), new ScmFileSet( getWorkingCopy() ), null);
+ executeCommand( repository.getProviderRepository(), new ScmFileSet( getWorkingCopy() ), null );
}
/**
@@ -151,11 +155,11 @@ public class JazzTckUtil
{
FileUtils.deleteDirectory( new File( getTckBaseDir() ) );
}
-
+
/**
* Return the URL used for this specific TCK test execution.
* It generates a unique workspace name, based on the system time.
- *
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
public String getScmUrl()
@@ -173,7 +177,7 @@ public class JazzTckUtil
Assert.fail( "Property \"tckUrlPrefix\" is not set." );
}
- scmUrl = tckUrlPrefix + "_" + currentSystemTimeMillis;
+ scmUrl = tckUrlPrefix + "_" + currentSystemTimeMillis;
}
return scmUrl;
@@ -181,8 +185,9 @@ public class JazzTckUtil
/**
* Get the snapshot name, getting it from the system properties if necessary.
+ *
* @return The name of the snapshot used to create a repository workspace,
- * which is then loaded into the tckBaseDir.
+ * which is then loaded into the tckBaseDir.
*/
private String getSnapshotName()
{
@@ -197,9 +202,10 @@ public class JazzTckUtil
return snapshotName;
}
-
+
/**
* Get the base directory used for the tck tests.
+ *
* @return The base directory used for the tck tests, the sandbox.
*/
private String getTckBaseDir()
@@ -215,7 +221,7 @@ public class JazzTckUtil
return tckBaseDir;
}
-
+
/**
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommandTest.java Mon Apr 23 08:29:39 2012
@@ -33,7 +33,7 @@ public class JazzAddCommandTest
private JazzScmProviderRepository repo;
private JazzAddConsumer addConsumer;
-
+
protected void setUp()
throws Exception
{
@@ -56,7 +56,8 @@ public class JazzAddCommandTest
throws Exception
{
addConsumer.consumeLine( "Committing..." );
- addConsumer.consumeLine( "Workspace: (1903) \"MavenSCMTestWorkspace_1332908068770\" <-> (1903) \"MavenSCMTestWorkspace_1332908068770\"" );
+ addConsumer.consumeLine(
+ "Workspace: (1903) \"MavenSCMTestWorkspace_1332908068770\" <-> (1903) \"MavenSCMTestWorkspace_1332908068770\"" );
addConsumer.consumeLine( " Component: (1768) \"MavenSCMTestComponent\"" );
addConsumer.consumeLine( " Outgoing:" );
addConsumer.consumeLine( " Change sets:" );
@@ -65,18 +66,22 @@ public class JazzAddCommandTest
addConsumer.consumeLine( " --a-- \\src\\main\\java\\Me.java" );
addConsumer.consumeLine( " --a-- \\src\\main\\java\\Me1.java" );
addConsumer.consumeLine( " --a-- \\src\\main\\java\\Me2.java" );
-
+
assertEquals( "Wrong number of files parsed!", 3, addConsumer.getFiles().size() );
- assertEquals( "Parsing error for file1!", "src\\main\\java\\Me.java", addConsumer.getFiles().get( 0 ).getPath() );
- assertEquals( "Parsing error for file2!", "src\\main\\java\\Me1.java", addConsumer.getFiles().get( 1 ).getPath() );
- assertEquals( "Parsing error for file3!", "src\\main\\java\\Me2.java", addConsumer.getFiles().get( 2 ).getPath() );
+ assertEquals( "Parsing error for file1!", "src\\main\\java\\Me.java",
+ addConsumer.getFiles().get( 0 ).getPath() );
+ assertEquals( "Parsing error for file2!", "src\\main\\java\\Me1.java",
+ addConsumer.getFiles().get( 1 ).getPath() );
+ assertEquals( "Parsing error for file3!", "src\\main\\java\\Me2.java",
+ addConsumer.getFiles().get( 2 ).getPath() );
}
public void testCheckInConsumerWithOutFiles()
throws Exception
{
addConsumer.consumeLine( "Committing..." );
- addConsumer.consumeLine( "Workspace: (1004) \"Release Repository Workspace\" <-> (1005) \"Maven Release Plugin Stream\"" );
+ addConsumer.consumeLine(
+ "Workspace: (1004) \"Release Repository Workspace\" <-> (1005) \"Maven Release Plugin Stream\"" );
addConsumer.consumeLine( " Component: (1006) \"Release Component\"" );
addConsumer.consumeLine( " Outgoing:" );
addConsumer.consumeLine( " Change sets:" );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,13 +1,13 @@
package org.apache.maven.scm.provider.jazz.command.blame;
-import java.io.File;
-import java.util.List;
-
import org.apache.maven.scm.command.blame.BlameLine;
import org.apache.maven.scm.command.blame.BlameScmResult;
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.blame.BlameCommandTckTest;
+import java.io.File;
+import java.util.List;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -38,6 +38,7 @@ public class JazzBlameCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -50,6 +51,7 @@ public class JazzBlameCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -62,6 +64,7 @@ public class JazzBlameCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -73,6 +76,7 @@ public class JazzBlameCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.tck.command.blame.BlameCommandTckTest#verifyResult(org.apache.maven.scm.command.blame.BlameScmResult)
*/
@Override
@@ -86,6 +90,7 @@ public class JazzBlameCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.tck.command.blame.BlameCommandTckTest#isTestDateTime()
*/
@Override
@@ -97,6 +102,7 @@ public class JazzBlameCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommandTest.java Mon Apr 23 08:29:39 2012
@@ -1,12 +1,12 @@
package org.apache.maven.scm.provider.jazz.command.blame;
-import java.util.Locale;
-
import org.apache.maven.scm.log.DefaultLog;
import org.apache.maven.scm.provider.jazz.JazzScmTestCase;
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
import org.codehaus.plexus.util.cli.Commandline;
+import java.util.Locale;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -33,7 +33,7 @@ public class JazzBlameCommandTest
extends JazzScmTestCase
{
private JazzScmProviderRepository repo;
-
+
private JazzBlameConsumer blameConsumer;
private Locale defaultLocale;
@@ -56,7 +56,8 @@ public class JazzBlameCommandTest
public void testCreateBlameCommand()
throws Exception
{
- Commandline cmd = new JazzBlameCommand().createBlameCommand( repo, getScmFileSet(), "test.txt").getCommandline();
+ Commandline cmd =
+ new JazzBlameCommand().createBlameCommand( repo, getScmFileSet(), "test.txt" ).getCommandline();
String expected = "scm annotate --username myUserName --password myPassword test.txt";
assertCommandLine( expected, getWorkingDirectory(), cmd );
}
@@ -66,7 +67,7 @@ public class JazzBlameCommandTest
// C:\tmp\maven\BogusTest>scm annotate --username Deb --password Deb test.txt
// 1 Deb (1008) 2011-12-14 Test.txt
// 2 Deb (1005) 2011-12-14 59 My commit comment.
-
+
blameConsumer.consumeLine( "1 Deb (1008) 2011-12-14 Test.txt" );
blameConsumer.consumeLine( "2 Deb (1005) 2011-12-14 59 My commit comment." );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/branch/JazzBranchCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/branch/JazzBranchCommandTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/branch/JazzBranchCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/branch/JazzBranchCommandTest.java Mon Apr 23 08:29:39 2012
@@ -23,7 +23,7 @@ import org.apache.maven.scm.provider.jaz
/**
* The branch command is not implemented, so neither is this.
- *
+ *
* @author <a href="mailto:ChrisGWarp@gmail.com">Chris Graham</a>
*/
public class JazzBranchCommandTest
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTckTest.java?rev=1329120&r1=1329119&r2=1329120&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommandTckTest.java Mon Apr 23 08:29:39 2012
@@ -1,10 +1,10 @@
package org.apache.maven.scm.provider.jazz.command.changelog;
-import java.io.File;
-
import org.apache.maven.scm.provider.jazz.command.JazzTckUtil;
import org.apache.maven.scm.tck.command.changelog.ChangeLogCommandTckTest;
+import java.io.File;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +35,7 @@ public class JazzChangeLogCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#initRepo()
*/
@Override
@@ -47,6 +48,7 @@ public class JazzChangeLogCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#removeRepo()
*/
@Override
@@ -59,6 +61,7 @@ public class JazzChangeLogCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTckTestCase#getScmUrl()
*/
@Override
@@ -70,6 +73,7 @@ public class JazzChangeLogCommandTckTest
/**
* {@inheritDoc}
+ *
* @see org.apache.maven.scm.ScmTestCase#getWorkingCopy()
*/
@Override