Author: evenisse
Date: Tue Mar 28 04:43:45 2006
New Revision: 389491
URL: http://svn.apache.org/viewcvs?rev=389491&view=rev
Log:
Formatting
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
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/BazaarUtils.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/changelog/BazaarChangeLogConsumer.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/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
Tue Mar 28 04:43:45 2006
@@ -23,7 +23,7 @@
/**
* Result of adding files to the SCM
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id$
*/
@@ -65,7 +65,7 @@
/**
* List with all the added files in the SCM operation
- *
+ *
* @return non null list of added files
*/
public List getAddedFiles()
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Tue Mar 28 04:43:45 2006
@@ -141,7 +141,8 @@
{
return connectionUrl;
}
- else if ( StringUtils.isNotEmpty( developerConnectionUrl ) &&
"developerconnection".equals( connectionType.toLowerCase() ) )
+ else if ( StringUtils.isNotEmpty( developerConnectionUrl ) &&
+ "developerconnection".equals( connectionType.toLowerCase() ) )
{
return developerConnectionUrl;
}
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java?rev=389491&r1=389490&r2=389491&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
Tue Mar 28 04:43:45 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.DefaultLog;
@@ -25,6 +23,8 @@
import org.apache.maven.scm.provider.bazaar.command.BazaarConsumer;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+
/**
* Check bazaar installation.
*
@@ -34,27 +34,37 @@
{
//Minimum version for the Bazaar SCM
private static final float BAZAAR_REQ = 0.7f;
+
private static final float PYTHON_REQ = 2.4f;
//Bazaar spesific
private static final String BAZAAR_VERSION_TAG = "bzr (bazaar-ng) ";
+
private static final String BAZAAR_INSTALL_URL =
"'http://bazaar-vcs.org/Installation'";
//Python spesific
private static final String PYTHON_EXEC = "python";
+
private static final String PYTHON_VERSION = "-V";
+
private static final String PYTHON_VERSION_TAG = "Python ";
//Python modules
private static final String PARAMIKO = "\"import paramiko\"";
+
private static final String CCRYPT = "\"import Crypto\"";
+
private static final String CELEMENTREE = "\"import cElementTree\"";
//Configuration to check with default values (not installed)
- private VersionConsumer bazaarVersion = new VersionConsumer(null);
- private VersionConsumer pythonVersion = new VersionConsumer(null);
+ private VersionConsumer bazaarVersion = new VersionConsumer( null );
+
+ private VersionConsumer pythonVersion = new VersionConsumer( null );
+
private boolean cElementTree = false;
+
private boolean paramiko = false;
+
private boolean cCrypt = false;
BazaarConfig( File workingDir )
@@ -81,7 +91,7 @@
int exitCode;
try
{
- Commandline cmdLine = buildPythonCmd( workingDir, new String[] {
"-c", cmd } );
+ Commandline cmdLine = buildPythonCmd( workingDir, new
String[]{"-c", cmd} );
exitCode = BazaarUtils.executeCmd( consumer, cmdLine );
}
catch ( ScmException e )
@@ -99,8 +109,7 @@
*/
private boolean isInstalled()
{
- return pythonVersion.isVersionOk(PYTHON_REQ)
- && bazaarVersion.isVersionOk(BAZAAR_REQ);
+ return pythonVersion.isVersionOk( PYTHON_REQ ) &&
bazaarVersion.isVersionOk( BAZAAR_REQ );
}
/**
@@ -114,7 +123,7 @@
public static VersionConsumer getBazaarVersion( File workingDir )
throws ScmException
{
- String[] versionCmd = new String[] { BazaarCommand.VERSION };
+ String[] versionCmd = new String[]{BazaarCommand.VERSION};
VersionConsumer consumer = new VersionConsumer( BAZAAR_VERSION_TAG );
Commandline cmd = BazaarUtils.buildCmd( workingDir, versionCmd );
@@ -128,7 +137,7 @@
public static VersionConsumer getPythonVersion( File workingDir )
throws ScmException
{
- String[] versionCmd = new String[] { PYTHON_VERSION };
+ String[] versionCmd = new String[]{PYTHON_VERSION};
VersionConsumer consumer = new VersionConsumer( PYTHON_VERSION_TAG );
Commandline cmd = buildPythonCmd( workingDir, versionCmd );
@@ -152,8 +161,7 @@
boolean success = workingDir.mkdirs();
if ( !success )
{
- String msg = "Working directory did not exist"
- + " and it couldn't be created: " + workingDir;
+ String msg = "Working directory did not exist" + " and it
couldn't be created: " + workingDir;
throw new ScmException( msg );
}
}
@@ -168,10 +176,12 @@
extends BazaarConsumer
{
private final String version_tag;
+
private String versionStr = "NA";
+
private float version = -1;
- VersionConsumer(String version_tag)
+ VersionConsumer( String version_tag )
{
super( new DefaultLog() );
this.version_tag = version_tag;
@@ -190,7 +200,7 @@
return versionStr;
}
- boolean isVersionOk(float min)
+ boolean isVersionOk( float min )
{
return true; //min <= version;
}
@@ -220,23 +230,23 @@
}
}
- private String getInstalledStr() {
- if (isComplete()) {
+ private String getInstalledStr()
+ {
+ if ( isComplete() )
+ {
return "valid and complete.";
}
- return (isInstalled() ? "incomplete. " : "invalid. ") + "Consult " +
BAZAAR_INSTALL_URL;
+ return ( isInstalled() ? "incomplete. " : "invalid. " ) + "Consult " +
BAZAAR_INSTALL_URL;
}
public String toString( File workingDir )
{
- boolean bzrOk = bazaarVersion.isVersionOk(BAZAAR_REQ);
- boolean pyOk = bazaarVersion.isVersionOk(PYTHON_REQ);
- return "\n Your Bazaar installation seems to be " + getInstalledStr()
- + "\n Python version: " + pythonVersion.getVersion() + (pyOk ? "
(OK)" : " (TOO OLD!)")
- + "\n Bazaar version: " + bazaarVersion.getVersion() + (bzrOk ? "
(OK)" : " (TOO OLD!)")
- + "\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";
+ boolean bzrOk = bazaarVersion.isVersionOk( BAZAAR_REQ );
+ boolean pyOk = bazaarVersion.isVersionOk( PYTHON_REQ );
+ return "\n Your Bazaar installation seems to be " + getInstalledStr()
+ "\n Python version: " +
+ pythonVersion.getVersion() + ( pyOk ? " (OK)" : " (TOO OLD!)" ) +
"\n Bazaar version: " +
+ bazaarVersion.getVersion() + ( bzrOk ? " (OK)" : " (TOO OLD!)" ) +
"\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";
}
}
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java?rev=389491&r1=389490&r2=389491&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
Tue Mar 28 04:43:45 2006
@@ -16,12 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
@@ -34,6 +28,12 @@
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Common code for executing bazaar commands.
*
@@ -64,8 +64,7 @@
exitCodeMap.put( BazaarCommand.DIFF_CMD, diffExitCodes );
}
- public static ScmResult execute( BazaarConsumer consumer, ScmLogger logger,
- File workingDir, String[] cmdAndArgs )
+ public static ScmResult execute( BazaarConsumer consumer, ScmLogger
logger, File workingDir, String[] cmdAndArgs )
throws ScmException
{
try
@@ -79,7 +78,8 @@
//Return result
List exitCodes = defaultExitCodes;
- if (exitCodeMap.containsKey( cmdAndArgs[0] )) {
+ if ( exitCodeMap.containsKey( cmdAndArgs[0] ) )
+ {
exitCodes = (List) exitCodeMap.get( cmdAndArgs[0] );
}
boolean success = exitCodes.contains( new Integer( exitCode ) );
@@ -88,25 +88,19 @@
String providerMsg = "Execution of bazaar command succeded";
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";
+ 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";
logger.error( providerMsg );
}
-
return new ScmResult( cmd.toString(), providerMsg,
consumer.getStdErr(), success );
}
catch ( ScmException se )
{
- String msg = "EXECUTION FAILED"
- + "\n Execution failed before invoking the Bazaar command.
Last exception:"
- + "\n " + se.getMessage();
+ String msg = "EXECUTION FAILED" +
+ "\n Execution failed before invoking the Bazaar command. Last
exception:" + "\n " + se.getMessage();
//Add nested cause if any
if ( se.getCause() != null )
@@ -133,8 +127,7 @@
boolean success = workingDir.mkdirs();
if ( !success )
{
- String msg = "Working directory did not exist"
- + " and it couldn't be created: " + workingDir;
+ String msg = "Working directory did not exist" + " and it
couldn't be created: " + workingDir;
throw new ScmException( msg );
}
}
@@ -185,7 +178,7 @@
throws ScmException
{
- String[] revCmd = new String[] { BazaarCommand.REVNO_CMD };
+ String[] revCmd = new String[]{BazaarCommand.REVNO_CMD};
BazaarRevNoConsumer consumer = new BazaarRevNoConsumer( logger );
BazaarUtils.execute( consumer, logger, workingDir, revCmd );
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java?rev=389491&r1=389490&r2=389491&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
Tue Mar 28 04:43:45 2006
@@ -45,8 +45,7 @@
throws ScmException
{
String[] cmd = new String[]{LOG_CMD, VERBOSE_OPTION};
- BazaarChangeLogConsumer consumer =
- new BazaarChangeLogConsumer( getLogger(), datePattern );
+ BazaarChangeLogConsumer consumer = new BazaarChangeLogConsumer(
getLogger(), datePattern );
ScmResult result = BazaarUtils.execute( consumer, getLogger(),
fileSet.getBasedir(), cmd );
List logEntries = consumer.getModifications();
@@ -57,7 +56,7 @@
for ( Iterator it = logEntries.iterator(); it.hasNext(); )
{
ChangeSet change = (ChangeSet) it.next();
- if ( change.getFiles().size() > 0)
+ if ( change.getFiles().size() > 0 )
{
if ( !change.getDate().before( startDate ) &&
!change.getDate().after( endDate ) )
{
@@ -67,6 +66,6 @@
}
ChangeLogSet changeLogSet = new ChangeLogSet( inRangeAndValid,
startDate, endDate );
- return new ChangeLogScmResult(changeLogSet, result );
+ return new ChangeLogScmResult( changeLogSet, result );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java
Tue Mar 28 04:43:45 2006
@@ -88,17 +88,18 @@
if ( line.startsWith( START_LOG_TAG ) )
{
//If last entry was part a merged entry
- if (isMergeEntry && lastChange != null) {
+ if ( isMergeEntry && lastChange != null )
+ {
String comment = lastChange.getComment();
comment += "\n[MAVEN]: Merged from " +
currentChange.getAuthor();
comment += "\n[MAVEN]: " + currentChange.getDateFormatted();
comment += "\n[MAVEN]: " + currentChange.getComment();
- lastChange.setComment(comment);
+ lastChange.setComment( comment );
}
//Init a new changeset
currentChange = new ChangeSet();
- currentChange.setFiles(new ArrayList());
+ currentChange.setFiles( new ArrayList() );
logEntries.add( currentChange );
//Reset memeber vars
@@ -111,11 +112,14 @@
{
//This is part of lastChange and is not a separate log entry
isMergeEntry = true;
- logEntries.remove(currentChange);
- if (logEntries.size() > 0) {
- lastChange = (ChangeSet)logEntries.get(logEntries.size() - 1);
- } else {
- getLogger().warn("First entry was unexpectedly a merged
entry");
+ logEntries.remove( currentChange );
+ if ( logEntries.size() > 0 )
+ {
+ lastChange = (ChangeSet) logEntries.get( logEntries.size() - 1
);
+ }
+ else
+ {
+ getLogger().warn( "First entry was unexpectedly a merged
entry" );
lastChange = null;
}
}
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/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffConsumer.java?rev=389491&r1=389490&r2=389491&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
Tue Mar 28 04:43:45 2006
@@ -119,8 +119,8 @@
* - Bazaar 0.7 format: dir/dir/myfile <br>
* - Bazaar 0.8 format: a/dir/dir/myfile <br>
*
- * @param status Eg. modified or added
- * @param line The original bazaar output to process (for logging)
+ * @param status Eg. modified or added
+ * @param line The original bazaar output to process (for logging)
* @param tmpLine The bazaar output to process
*/
private void addChangedFile( ScmFileStatus status, String line, String
tmpLine )
@@ -128,20 +128,25 @@
tmpLine = tmpLine.substring( 1, tmpLine.length() - 1 );
boolean ok = addChangedFile( status, tmpLine );
- if (!ok) {
- int index = tmpLine.indexOf("/");
- if (index > -1) {
- tmpLine = tmpLine.substring(index + 1);
+ if ( !ok )
+ {
+ int index = tmpLine.indexOf( "/" );
+ if ( index > -1 )
+ {
+ tmpLine = tmpLine.substring( index + 1 );
ok = addChangedFile( status, tmpLine );
}
}
- if (!ok) {
+ if ( !ok )
+ {
logger.warn( "Could not figure out of line: " + line );
}
}
- /** @return True if tmpLine was a valid file and thus added to the
changeset */
+ /**
+ * @return True if tmpLine was a valid file and thus added to the changeset
+ */
private boolean addChangedFile( ScmFileStatus status, String tmpLine )
{
File tmpFile = new File( workingDirectory, tmpLine );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/BazaarTestUtils.java
Tue Mar 28 04:43:45 2006
@@ -103,19 +103,18 @@
ScmResult result = BazaarUtils.execute( WORKING_DIR, add_cmd );
if ( !result.isSuccess() )
{
- String message = "Provider message: " + result.getProviderMessage()
- + "\n" + "Output: " + result.getCommandOutput();
+ String message =
+ "Provider message: " + result.getProviderMessage() + "\n" +
"Output: " + result.getCommandOutput();
throw new Exception( message );
}
// Commit the initial repository
- String[] commit_cmd = new String[]{BazaarCommand.COMMIT_CMD,
- BazaarCommand.MESSAGE_OPTION, COMMIT_MESSAGE};
+ String[] commit_cmd = new String[]{BazaarCommand.COMMIT_CMD,
BazaarCommand.MESSAGE_OPTION, COMMIT_MESSAGE};
result = BazaarUtils.execute( WORKING_DIR, commit_cmd );
if ( !result.isSuccess() )
{
- String message = "Provider message: " + result.getProviderMessage()
- + "\n" + "Output: " + result.getCommandOutput();
+ String message =
+ "Provider message: " + result.getProviderMessage() + "\n" +
"Output: " + result.getCommandOutput();
throw new Exception( message );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumerTest.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumerTest.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumerTest.java
Tue Mar 28 04:43:45 2006
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmTestCase;
+import org.apache.maven.scm.log.DefaultLog;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -23,17 +26,15 @@
import java.io.InputStreamReader;
import java.util.List;
-import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.log.DefaultLog;
-
public class BazaarChangeLogConsumerTest
extends ScmTestCase
{
- public void testChanglogWithMergeEntries() throws IOException
+ public void testChanglogWithMergeEntries()
+ throws IOException
{
File testFile = getTestFile(
"src/test/resources/bazaar/changeLogWithMerge.txt" );
- BazaarChangeLogConsumer consumer = new BazaarChangeLogConsumer( new
DefaultLog(), null);
+ BazaarChangeLogConsumer consumer = new BazaarChangeLogConsumer( new
DefaultLog(), null );
FileInputStream fis = new FileInputStream( testFile );
BufferedReader in = new BufferedReader( new InputStreamReader( fis ) );
@@ -45,6 +46,6 @@
}
List mods = consumer.getModifications();
- assertEquals(4, mods.size());
+ assertEquals( 4, mods.size() );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
Tue Mar 28 04:43:45 2006
@@ -35,19 +35,22 @@
ClearCaseCheckOutCommand.setIsClearCaseLT( false );
Commandline commandLine =
ClearCaseCheckOutCommand.createCreateViewCommandLine(
getWorkingDirectory(), "testView" );
-System.out.println( "==>cleartool mkview -snapshot -tag testView -vws " +
ClearCaseCheckOutCommand.getViewStore() + "testView.vws " +
getWorkingDirectory() );
-System.out.println( "==>" + commandLine.toString());
+ System.out.println( "==>cleartool mkview -snapshot -tag testView -vws
" +
+ ClearCaseCheckOutCommand.getViewStore() + "testView.vws " +
getWorkingDirectory() );
+ System.out.println( "==>" + commandLine.toString() );
assertEquals( "cleartool mkview -snapshot -tag testView -vws " +
ClearCaseCheckOutCommand.getViewStore() +
"testView.vws " + getWorkingDirectory().getCanonicalPath(),
commandLine.toString() );
ClearCaseCheckOutCommand.setUseVWS( false );
commandLine = ClearCaseCheckOutCommand.createCreateViewCommandLine(
getWorkingDirectory(), "testView" );
- assertEquals( "cleartool mkview -snapshot -tag testView " +
getWorkingDirectory().getCanonicalPath(), commandLine.toString() );
+ assertEquals( "cleartool mkview -snapshot -tag testView " +
getWorkingDirectory().getCanonicalPath(),
+ commandLine.toString() );
ClearCaseCheckOutCommand.setIsClearCaseLT( true );
ClearCaseCheckOutCommand.setUseVWS( true );
commandLine = ClearCaseCheckOutCommand.createCreateViewCommandLine(
getWorkingDirectory(), "testView" );
- assertEquals( "cleartool mkview -snapshot -tag testView " +
getWorkingDirectory().getCanonicalPath(), commandLine.toString() );
+ assertEquals( "cleartool mkview -snapshot -tag testView " +
getWorkingDirectory().getCanonicalPath(),
+ commandLine.toString() );
}
public void testUpdateConfigSpec()
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
Tue Mar 28 04:43:45 2006
@@ -42,8 +42,7 @@
private String workingDirectory;
private String currentDir = "";
-
-
+
// state machine constants for reading Starteam output
/**
@@ -66,18 +65,18 @@
*/
private static final int GET_REVISION = 4;
-
+
/**
* Marks current directory data
*/
private static final String DIR_MARKER = "(working dir: ";
-
+
/**
* Marks start of file data
*/
private static final String START_FILE = "History for: ";
-
+
/**
* Marks end of file
*/
@@ -135,12 +134,13 @@
//
// ----------------------------------------------------------------------
- public StarteamChangeLogConsumer( File workingDirectory, ScmLogger logger,
Date startDate, Date endDate, String userDateFormat )
+ public StarteamChangeLogConsumer( File workingDirectory, ScmLogger logger,
Date startDate, Date endDate,
+ String userDateFormat )
{
super( logger );
this.workingDirectory = workingDirectory.getPath().replace( '\\', '/'
);
-
+
this.startDate = startDate;
this.endDate = endDate;
@@ -173,15 +173,14 @@
public void consumeLine( String line )
{
getLogger().debug( line );
-
+
int pos = 0;
-
+
if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
{
processDirectory( line, pos );
return;
}
-
// current state transitions in the state machine - starts with Get
File
// Get File -> Get Revision
@@ -249,7 +248,7 @@
String dirPath = line.substring( pos + DIR_MARKER.length(),
line.length() - 1 ).replace( '\\', '/' );
try
{
- this.currentDir =
StarteamCommandLineUtils.getRelativeChildDirectory( this.workingDirectory,
dirPath );
+ this.currentDir =
StarteamCommandLineUtils.getRelativeChildDirectory( this.workingDirectory,
dirPath );
}
catch ( IllegalStateException e )
{
@@ -264,7 +263,7 @@
throw new IllegalStateException( error );
}
}
-
+
/**
* Process the current input line in the Get File state.
*
@@ -276,7 +275,8 @@
{
setCurrentChange( new ChangeSet() );
- setCurrentFile( new ChangeFile( this.currentDir + "/" +
line.substring( START_FILE.length(), line.length() ) ) );
+ setCurrentFile(
+ new ChangeFile( this.currentDir + "/" + line.substring(
START_FILE.length(), line.length() ) ) );
setStatus( GET_REVISION );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java
Tue Mar 28 04:43:45 2006
@@ -24,7 +24,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -66,7 +65,8 @@
String s = in.readLine();
- StarteamChangeLogConsumer consumer = new StarteamChangeLogConsumer(
basedir, new DefaultLog(), null, null, null );
+ StarteamChangeLogConsumer consumer =
+ new StarteamChangeLogConsumer( basedir, new DefaultLog(), null,
null, null );
while ( s != null )
{
@@ -76,8 +76,8 @@
}
return consumer.getModifications();
- }
-
+ }
+
public void testNumberOfModifications()
throws Exception
{
@@ -90,21 +90,21 @@
for ( Iterator i = entries.iterator(); i.hasNext(); )
{
entry = (ChangeSet) i.next();
-
+
assertTrue( "ChangeLogEntry erroneously picked up",
entry.toString().indexOf( "ChangeLogEntry.java" ) ==
-1 );
- }
+ }
}
-
+
public void testRelativeFilePath()
throws Exception
{
List entries = parseTestFile();
-
+
//ensure the filename in the first ChangeSet has correct relative path
- ChangeSet entry = (ChangeSet) entries.get( 1 );
-
- assertTrue( entry.containsFilename( "./maven/src/File2.java", null )
);
+ ChangeSet entry = (ChangeSet) entries.get( 1 );
+
+ assertTrue( entry.containsFilename( "./maven/src/File2.java", null ) );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
Tue Mar 28 04:43:45 2006
@@ -26,11 +26,11 @@
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.command.login.LoginScmResult;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.command.login.LoginScmResult;
import org.apache.maven.scm.provider.AbstractScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
import
org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepository.java
Tue Mar 28 04:43:45 2006
@@ -137,7 +137,6 @@
}
/**
- *
* @param user user name
* @return
*/
@@ -147,7 +146,7 @@
int indexOfUsername = getTransport().length() + 2;
int indexOfAt = cvsroot.indexOf( "@" );
-
+
String userString = user == null ? "" : ":" + user;
if ( indexOfAt > 0 )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/repository/CvsScmProviderRepositoryTest.java
Tue Mar 28 04:43:45 2006
@@ -189,7 +189,8 @@
{
String url = "pserver:anoncvs:[EMAIL
PROTECTED]:2401:/home/cvspublic:maven";
- CvsScmProviderRepository repo = testUrl( url, url.replaceFirst(
":mypassword", "" ).replaceFirst( ":2401", "" ) );
+ CvsScmProviderRepository repo =
+ testUrl( url, url.replaceFirst( ":mypassword", "" ).replaceFirst(
":2401", "" ) );
assertEquals( "pserver", repo.getTransport() );
@@ -259,7 +260,7 @@
// ----------------------------------------------------------------------
/**
- * @param expectedUrl url that should be printed in the toString method
+ * @param expectedUrl url that should be printed in the toString method
*/
private CvsScmProviderRepository testUrl( String url, String expectedUrl,
char delimiter, int nbErrorMessages )
throws Exception
@@ -274,7 +275,7 @@
assertTrue( "The SCM Repository isn't a " +
CvsScmProviderRepository.class.getName() + ".", repository
.getProviderRepository() instanceof CvsScmProviderRepository );
-
+
assertEquals( "cvs:" + expectedUrl, repository.toString() );
return (CvsScmProviderRepository) repository.getProviderRepository();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
URL:
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java?rev=389491&r1=389490&r2=389491&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtilsTest.java
Tue Mar 28 04:43:45 2006
@@ -1,10 +1,5 @@
package org.apache.maven.scm.provider.svn.svnexe.command;
-import junit.framework.TestCase;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
-
-import java.io.File;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -20,6 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import junit.framework.TestCase;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+
+import java.io.File;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
