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 ol...@apache.org on 2008/08/14 00:57:18 UTC
svn commit: r685721 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src:
main/java/org/apache/maven/scm/provider/bazaar/
main/java/org/apache/maven/scm/provider/bazaar/command/
main/java/org/apache/maven/scm/provider/bazaar/command/...
Author: olamy
Date: Wed Aug 13 15:57:17 2008
New Revision: 685721
URL: http://svn.apache.org/viewvc?rev=685721&view=rev
Log:
fix checkstyle issues
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java (contents, props changed)
- copied, changed from r685675, maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarCommand.java
Removed:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java Wed Aug 13 15:57:17 2008
@@ -22,7 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.DefaultLog;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer;
import org.codehaus.plexus.util.cli.Commandline;
@@ -128,7 +128,7 @@
public static VersionConsumer getBazaarVersion( File workingDir )
throws ScmException
{
- String[] versionCmd = new String[]{BazaarCommand.VERSION};
+ String[] versionCmd = new String[]{BazaarConstants.VERSION};
VersionConsumer consumer = new VersionConsumer( BAZAAR_VERSION_TAG );
Commandline cmd = BazaarUtils.buildCmd( workingDir, versionCmd );
@@ -181,9 +181,9 @@
extends BazaarConsumer
{
- private static Pattern VERSION_PATTERN = Pattern.compile( "[\\d]+.?[\\d]*" );
+ private static final Pattern VERSION_PATTERN = Pattern.compile( "[\\d]+.?[\\d]*" );
- private final String version_tag;
+ private final String versionTag;
private String versionStr = "NA";
@@ -192,14 +192,14 @@
VersionConsumer( String version_tag )
{
super( new DefaultLog() );
- this.version_tag = version_tag;
+ this.versionTag = version_tag;
}
public void doConsume( ScmFileStatus status, String line )
{
- if ( line.startsWith( version_tag ) )
+ if ( line.startsWith( versionTag ) )
{
- versionStr = line.substring( version_tag.length() );
+ versionStr = line.substring( versionTag.length() );
}
}
@@ -267,11 +267,11 @@
{
boolean bzrOk = bazaarVersion.isVersionOk( BAZAAR_REQ );
boolean pyOk = pythonVersion.isVersionOk( PYTHON_REQ );
- return "\n Your Bazaar installation seems to be " + getInstalledStr() + "\n Python version: " +
- pythonVersion.getVersion() + ( pyOk ? " (OK)" : " (May be INVALID)" ) + "\n Bazaar version: " +
- bazaarVersion.getVersion() + ( bzrOk ? " (OK)" : " (May be INVALID)" ) + "\n Paramiko installed: " +
- paramiko + " (For remote access eg. sftp) " + "\n cCrypt installed: " + cCrypt +
- " (For remote access eg. sftp) " + "\n cElementTree installed: " + cElementTree + " (Not mandatory) " +
- "\n";
+ return "\n Your Bazaar installation seems to be " + getInstalledStr() + "\n Python version: "
+ + pythonVersion.getVersion() + ( pyOk ? " (OK)" : " (May be INVALID)" ) + "\n Bazaar version: "
+ + bazaarVersion.getVersion() + ( bzrOk ? " (OK)" : " (May be INVALID)" ) + "\n Paramiko installed: "
+ + paramiko + " (For remote access eg. sftp) " + "\n cCrypt installed: " + cCrypt
+ + " (For remote access eg. sftp) " + "\n cElementTree installed: " + cElementTree + " (Not mandatory) "
+ + "\n";
}
}
\ No newline at end of file
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java Wed Aug 13 15:57:17 2008
@@ -33,7 +33,7 @@
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.provider.AbstractScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.apache.maven.scm.provider.bazaar.command.add.BazaarAddCommand;
import org.apache.maven.scm.provider.bazaar.command.changelog.BazaarChangeLogCommand;
import org.apache.maven.scm.provider.bazaar.command.checkin.BazaarCheckInCommand;
@@ -98,7 +98,7 @@
List errorMessages = new ArrayList();
- String[] checkCmd = new String[]{BazaarCommand.CHECK, scmSpecificUrl};
+ String[] checkCmd = new String[]{BazaarConstants.CHECK, scmSpecificUrl};
ScmResult result;
try
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java Wed Aug 13 15:57:17 2008
@@ -25,7 +25,7 @@
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.log.DefaultLog;
import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -48,24 +48,24 @@
/**
* Map between command and its valid exit codes
*/
- private static final Map exitCodeMap = new HashMap();
+ private static final Map EXITCODEMAP = new HashMap();
/**
* Default exit codes for entries not in exitCodeMap
*/
- private static final List defaultExitCodes = new ArrayList();
+ private static final List DEFAULTEEXITCODES = new ArrayList();
/** Setup exit codes*/
static
{
- defaultExitCodes.add( new Integer( 0 ) );
+ DEFAULTEEXITCODES.add( new Integer( 0 ) );
//Diff is different
List diffExitCodes = new ArrayList();
diffExitCodes.add( new Integer( 0 ) ); //No difference
diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or changes in diff-like
diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes
- exitCodeMap.put( BazaarCommand.DIFF_CMD, diffExitCodes );
+ EXITCODEMAP.put( BazaarConstants.DIFF_CMD, diffExitCodes );
}
public static ScmResult execute( BazaarConsumer consumer, ScmLogger logger, File workingDir, String[] cmdAndArgs )
@@ -81,10 +81,10 @@
int exitCode = executeCmd( consumer, cmd );
//Return result
- List exitCodes = defaultExitCodes;
- if ( exitCodeMap.containsKey( cmdAndArgs[0] ) )
+ List exitCodes = DEFAULTEEXITCODES;
+ if ( EXITCODEMAP.containsKey( cmdAndArgs[0] ) )
{
- exitCodes = (List) exitCodeMap.get( cmdAndArgs[0] );
+ exitCodes = (List) EXITCODEMAP.get( cmdAndArgs[0] );
}
boolean success = exitCodes.contains( new Integer( exitCode ) );
@@ -93,9 +93,9 @@
if ( !success )
{
BazaarConfig config = new BazaarConfig( workingDir );
- providerMsg = "\nEXECUTION FAILED" + "\n Execution of cmd : " + cmdAndArgs[0] +
- " failed with exit code: " + exitCode + "." + "\n Working directory was: " + "\n " +
- workingDir.getAbsolutePath() + config.toString( workingDir ) + "\n";
+ providerMsg = "\nEXECUTION FAILED" + "\n Execution of cmd : " + cmdAndArgs[0]
+ + " failed with exit code: " + exitCode + "." + "\n Working directory was: " + "\n "
+ + workingDir.getAbsolutePath() + config.toString( workingDir ) + "\n";
logger.error( providerMsg );
}
@@ -122,7 +122,7 @@
throws ScmException
{
Commandline cmd = new Commandline();
- cmd.setExecutable( BazaarCommand.EXEC );
+ cmd.setExecutable( BazaarConstants.EXEC );
cmd.setWorkingDirectory( workingDir.getAbsolutePath() );
cmd.addArguments( cmdAndArgs );
@@ -182,7 +182,7 @@
throws ScmException
{
- String[] revCmd = new String[]{BazaarCommand.REVNO_CMD};
+ String[] revCmd = new String[]{BazaarConstants.REVNO_CMD};
BazaarRevNoConsumer consumer = new BazaarRevNoConsumer( logger );
BazaarUtils.execute( consumer, logger, workingDir, revCmd );
Copied: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java (from r685675, maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarCommand.java)
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java?p2=maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java&p1=maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarCommand.java&r1=685675&r2=685721&rev=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java Wed Aug 13 15:57:17 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.scm.command.Command;
/**
* Available/Used bazaar commands.
@@ -30,8 +29,7 @@
* @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
* @version $Id$
*/
-public interface BazaarCommand
- extends Command
+public class BazaarConstants
{
/**
* Executable for Bazaar
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java Wed Aug 13 15:57:17 2008
@@ -45,12 +45,12 @@
/**
* A list of known keywords from bazaar
*/
- private static final Map identifiers = new HashMap();
+ private static final Map IDENTIFIERS = new HashMap();
/**
* A list of known message prefixes from bazaar
*/
- private static final Map messages = new HashMap();
+ private static final Map MESSAGES = new HashMap();
/**
* Number of lines to keep from Std.Err
@@ -66,14 +66,14 @@
static
{
- identifiers.put( "added", ScmFileStatus.ADDED );
- identifiers.put( "unknown", ScmFileStatus.UNKNOWN );
- identifiers.put( "modified", ScmFileStatus.MODIFIED );
- identifiers.put( "removed", ScmFileStatus.DELETED );
- identifiers.put( "renamed", ScmFileStatus.MODIFIED );
- messages.put( "bzr: WARNING:", "WARNING" );
- messages.put( "bzr: ERROR:", "ERROR" );
- messages.put( "'bzr' ", "ERROR" ); // bzr isn't found in windows path
+ IDENTIFIERS.put( "added", ScmFileStatus.ADDED );
+ IDENTIFIERS.put( "unknown", ScmFileStatus.UNKNOWN );
+ IDENTIFIERS.put( "modified", ScmFileStatus.MODIFIED );
+ IDENTIFIERS.put( "removed", ScmFileStatus.DELETED );
+ IDENTIFIERS.put( "renamed", ScmFileStatus.MODIFIED );
+ MESSAGES.put( "bzr: WARNING:", "WARNING" );
+ MESSAGES.put( "bzr: ERROR:", "ERROR" );
+ MESSAGES.put( "'bzr' ", "ERROR" ); // bzr isn't found in windows path
}
public BazaarConsumer( ScmLogger logger )
@@ -111,7 +111,7 @@
trimmedLine = trimmedLine.trim(); //one or more spaces
}
- ScmFileStatus status = statusStr != null ? ( (ScmFileStatus) identifiers.get( statusStr.intern() ) ) : null;
+ ScmFileStatus status = statusStr != null ? ( (ScmFileStatus) IDENTIFIERS.get( statusStr.intern() ) ) : null;
doConsume( status, trimmedLine );
}
@@ -133,7 +133,7 @@
private static String processInputForKnownIdentifiers( String line )
{
- for ( Iterator it = identifiers.keySet().iterator(); it.hasNext(); )
+ for ( Iterator it = IDENTIFIERS.keySet().iterator(); it.hasNext(); )
{
String id = (String) it.next();
if ( line.startsWith( id ) )
@@ -146,7 +146,7 @@
private boolean processInputForKnownMessages( String line )
{
- for ( Iterator it = messages.keySet().iterator(); it.hasNext(); )
+ for ( Iterator it = MESSAGES.keySet().iterator(); it.hasNext(); )
{
String prefix = (String) it.next();
if ( line.startsWith( prefix ) )
@@ -157,7 +157,7 @@
stderr.remove( 0 ); //Rotate list
}
String message = line.substring( prefix.length() );
- if ( messages.get( prefix ).equals( "WARNING" ) )
+ if ( MESSAGES.get( prefix ).equals( "WARNING" ) )
{
getLogger().warn( message );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/add/BazaarAddCommand.java Wed Aug 13 15:57:17 2008
@@ -19,16 +19,17 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.add.AbstractAddCommand;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
-
-import java.io.File;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
/**
* Add no recursive.
@@ -38,14 +39,14 @@
*/
public class BazaarAddCommand
extends AbstractAddCommand
- implements BazaarCommand
+ implements Command
{
/** {@inheritDoc} */
protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
boolean binary )
throws ScmException
{
- String[] addCmd = new String[]{ADD_CMD, NO_RECURSE_OPTION};
+ String[] addCmd = new String[]{BazaarConstants.ADD_CMD, BazaarConstants.NO_RECURSE_OPTION};
addCmd = BazaarUtils.expandCommandLine( addCmd, fileSet );
File workingDir = fileSet.getBasedir();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java Wed Aug 13 15:57:17 2008
@@ -24,12 +24,13 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmBranch;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import java.util.ArrayList;
import java.util.Date;
@@ -42,7 +43,7 @@
*/
public class BazaarChangeLogCommand
extends AbstractChangeLogCommand
- implements BazaarCommand
+ implements Command
{
/** {@inheritDoc} */
protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
@@ -50,7 +51,7 @@
String datePattern )
throws ScmException
{
- String[] cmd = new String[]{LOG_CMD, VERBOSE_OPTION};
+ String[] cmd = new String[]{BazaarConstants.LOG_CMD, BazaarConstants.VERBOSE_OPTION};
BazaarChangeLogConsumer consumer = new BazaarChangeLogConsumer( getLogger(), datePattern );
ScmResult result = BazaarUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java Wed Aug 13 15:57:17 2008
@@ -30,7 +30,7 @@
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer;
import org.apache.maven.scm.provider.bazaar.command.status.BazaarStatusCommand;
import org.apache.maven.scm.provider.bazaar.repository.BazaarScmProviderRepository;
@@ -71,8 +71,8 @@
for ( Iterator it = statusFiles.iterator(); it.hasNext(); )
{
ScmFile file = (ScmFile) it.next();
- if ( file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED ||
- file.getStatus() == ScmFileStatus.MODIFIED )
+ if ( file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED
+ || file.getStatus() == ScmFileStatus.MODIFIED )
{
commitedFiles.add( new ScmFile( file.getPath(), ScmFileStatus.CHECKED_IN ) );
}
@@ -88,7 +88,7 @@
}
// Commit to local branch
- String[] commitCmd = new String[]{BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, message};
+ String[] commitCmd = new String[]{BazaarConstants.COMMIT_CMD, BazaarConstants.MESSAGE_OPTION, message};
commitCmd = BazaarUtils.expandCommandLine( commitCmd, fileSet );
ScmResult result =
BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), commitCmd );
@@ -97,9 +97,9 @@
BazaarScmProviderRepository repository = (BazaarScmProviderRepository) repo;
if ( !repository.getURI().equals( fileSet.getBasedir().getAbsolutePath() ) )
{
- String[] push_cmd = new String[]{BazaarCommand.PUSH_CMD, repository.getURI()};
+ String[] pushCmd = new String[] { BazaarConstants.PUSH_CMD, repository.getURI() };
result =
- BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), push_cmd );
+ BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), pushCmd );
}
return new CheckInScmResult( commitedFiles, result );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkout/BazaarCheckOutCommand.java Wed Aug 13 15:57:17 2008
@@ -23,11 +23,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.checkout.AbstractCheckOutCommand;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer;
import org.apache.maven.scm.provider.bazaar.repository.BazaarScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
@@ -42,7 +43,7 @@
*/
public class BazaarCheckOutCommand
extends AbstractCheckOutCommand
- implements BazaarCommand
+ implements Command
{
/** {@inheritDoc} */
protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet,
@@ -70,14 +71,14 @@
}
// Do the actual checkout
- String[] checkout_cmd = new String[]{BRANCH_CMD, url, checkoutDir.getAbsolutePath()};
- BazaarConsumer checkout_consumer = new BazaarConsumer( getLogger() );
- BazaarUtils.execute( checkout_consumer, getLogger(), checkoutDir.getParentFile(), checkout_cmd );
+ String[] checkoutCmd = new String[]{BazaarConstants.BRANCH_CMD, url, checkoutDir.getAbsolutePath()};
+ BazaarConsumer checkoutConsumer = new BazaarConsumer( getLogger() );
+ BazaarUtils.execute( checkoutConsumer, getLogger(), checkoutDir.getParentFile(), checkoutCmd );
// Do inventory to find list of checkedout files
- String[] inventory_cmd = new String[]{INVENTORY_CMD};
+ String[] inventoryCmd = new String[]{BazaarConstants.INVENTORY_CMD};
BazaarCheckOutConsumer consumer = new BazaarCheckOutConsumer( getLogger(), checkoutDir );
- ScmResult result = BazaarUtils.execute( consumer, getLogger(), checkoutDir, inventory_cmd );
+ ScmResult result = BazaarUtils.execute( consumer, getLogger(), checkoutDir, inventoryCmd );
return new CheckOutScmResult( consumer.getCheckedOutFiles(), result );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java Wed Aug 13 15:57:17 2008
@@ -23,11 +23,12 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.diff.AbstractDiffCommand;
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -36,7 +37,7 @@
*/
public class BazaarDiffCommand
extends AbstractDiffCommand
- implements BazaarCommand
+ implements Command
{
/** {@inheritDoc} */
protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet,
@@ -52,11 +53,11 @@
{
revArg += ".." + endRevision.getName();
}
- diffCmd = new String[]{DIFF_CMD, REVISION_OPTION, revArg};
+ diffCmd = new String[]{BazaarConstants.DIFF_CMD, BazaarConstants.REVISION_OPTION, revArg};
}
else
{
- diffCmd = new String[]{DIFF_CMD};
+ diffCmd = new String[]{BazaarConstants.DIFF_CMD};
}
diffCmd = BazaarUtils.expandCommandLine( diffCmd, fileSet );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java Wed Aug 13 15:57:17 2008
@@ -111,9 +111,9 @@
{
// ignore (to avoid conflicts with add and remove tokens)
}
- else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) ||
- line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( RANGE_TOKEN ) ||
- line.startsWith( NO_NEWLINE_TOKEN ) )
+ else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
+ || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( RANGE_TOKEN )
+ || line.startsWith( NO_NEWLINE_TOKEN ) )
{
currentDifference.append( line ).append( "\n" );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/remove/BazaarRemoveCommand.java Wed Aug 13 15:57:17 2008
@@ -19,16 +19,17 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.remove.AbstractRemoveCommand;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
-
-import java.io.File;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
/**
* @author <a href="mailto:torbjorn@smorgrav.org">Torbj�rn Eikli Sm�rgrav</a>
@@ -36,14 +37,14 @@
*/
public class BazaarRemoveCommand
extends AbstractRemoveCommand
- implements BazaarCommand
+ implements Command
{
/** {@inheritDoc} */
protected ScmResult executeRemoveCommand( ScmProviderRepository repository, ScmFileSet fileSet, String message )
throws ScmException
{
- String[] command = new String[]{REMOVE_CMD};
+ String[] command = new String[] { BazaarConstants.REMOVE_CMD };
BazaarUtils.expandCommandLine( command, fileSet );
File workingDir = fileSet.getBasedir();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/status/BazaarStatusCommand.java Wed Aug 13 15:57:17 2008
@@ -22,11 +22,12 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.status.AbstractStatusCommand;
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import java.io.File;
@@ -36,7 +37,7 @@
*/
public class BazaarStatusCommand
extends AbstractStatusCommand
- implements BazaarCommand
+ implements Command
{
public BazaarStatusCommand()
@@ -51,7 +52,7 @@
File workingDir = fileSet.getBasedir();
BazaarStatusConsumer consumer = new BazaarStatusConsumer( getLogger(), workingDir );
- String[] statusCmd = new String[]{STATUS_CMD};
+ String[] statusCmd = new String[] { BazaarConstants.STATUS_CMD };
ScmResult result = BazaarUtils.execute( consumer, getLogger(), workingDir, statusCmd );
return new StatusScmResult( consumer.getStatus(), result );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java Wed Aug 13 15:57:17 2008
@@ -25,13 +25,14 @@
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.Command;
import org.apache.maven.scm.command.changelog.ChangeLogCommand;
import org.apache.maven.scm.command.update.AbstractUpdateCommand;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer;
import org.apache.maven.scm.provider.bazaar.command.changelog.BazaarChangeLogCommand;
import org.apache.maven.scm.provider.bazaar.command.diff.BazaarDiffConsumer;
@@ -49,7 +50,7 @@
*/
public class BazaarUpdateCommand
extends AbstractUpdateCommand
- implements BazaarCommand
+ implements Command
{
/** {@inheritDoc} */
@@ -65,9 +66,9 @@
File workingDir = fileSet.getBasedir();
// Update branch
- String[] update_cmd = new String[]{BazaarCommand.PULL_CMD};
- ScmResult updateResult =
- BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), workingDir, update_cmd );
+ String[] updateCmd = new String[] { BazaarConstants.PULL_CMD };
+ ScmResult updateResult = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), workingDir,
+ updateCmd );
if ( !updateResult.isSuccess() )
{
@@ -77,7 +78,7 @@
// Find changes from last revision
int currentRevision = BazaarUtils.getCurrentRevisionNumber( getLogger(), workingDir );
int previousRevision = currentRevision - 1;
- String[] diffCmd = new String[]{DIFF_CMD, REVISION_OPTION, "" + previousRevision};
+ String[] diffCmd = new String[] { BazaarConstants.DIFF_CMD, BazaarConstants.REVISION_OPTION, "" + previousRevision };
BazaarDiffConsumer diffConsumer = new BazaarDiffConsumer( getLogger(), workingDir );
ScmResult diffResult = BazaarUtils.execute( diffConsumer, getLogger(), workingDir, diffCmd );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/repository/BazaarScmProviderRepository.java Wed Aug 13 15:57:17 2008
@@ -67,8 +67,8 @@
}
else
{
- return protocol + ( needsAuthentication() ? addUser() + addPassword() + addAt() : "" ) + addHost() +
- addPort() + addPath();
+ return protocol + ( needsAuthentication() ? addUser() + addPassword() + addAt() : "" ) + addHost()
+ + addPort() + addPath();
}
}
@@ -107,8 +107,8 @@
if ( msg != null )
{
- msg = "Something could be wrong about the repository URL: " + orgUrl + "\nReason: " + msg +
- "\nCheck http://maven.apache.org/scm for usage and hints.";
+ msg = "Something could be wrong about the repository URL: " + orgUrl + "\nReason: " + msg
+ + "\nCheck http://maven.apache.org/scm for usage and hints.";
}
return msg;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java?rev=685721&r1=685720&r2=685721&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarRepoUtils.java Wed Aug 13 15:57:17 2008
@@ -21,7 +21,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+import org.apache.maven.scm.provider.bazaar.command.BazaarConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -78,7 +78,7 @@
}
// Init repository
- String[] init_cmd = new String[]{BazaarCommand.INIT_CMD};
+ String[] init_cmd = new String[]{BazaarConstants.INIT_CMD};
BazaarUtils.execute( WORKING_DIR, init_cmd );
// Create and add files to repository
@@ -102,7 +102,7 @@
}
//Add to repository
- String[] add_cmd = new String[] { BazaarCommand.ADD_CMD };
+ String[] add_cmd = new String[] { BazaarConstants.ADD_CMD };
ScmFileSet filesToAdd = new ScmFileSet( new File( "" ), files );
add_cmd = BazaarUtils.expandCommandLine( add_cmd, filesToAdd );
ScmResult result = BazaarUtils.execute( WORKING_DIR, add_cmd );
@@ -114,7 +114,7 @@
}
// Commit the initial repository
- String[] commit_cmd = new String[]{BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, COMMIT_MESSAGE};
+ String[] commit_cmd = new String[]{BazaarConstants.COMMIT_CMD, BazaarConstants.MESSAGE_OPTION, COMMIT_MESSAGE};
result = BazaarUtils.execute( WORKING_DIR, commit_cmd );
if ( !result.isSuccess() )
{