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 vs...@apache.org on 2008/08/15 21:57:03 UTC
svn commit: r686352 [2/2] - in /maven/scm/trunk/maven-scm-providers:
maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/
maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/
mave...
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java Fri Aug 15 12:57:01 2008
@@ -80,17 +80,17 @@
*
* @param taskNumber Task number.
* @param format Output format.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the commandl ine.
* @throws ScmException
*/
- public static Commandline showTaskObjects( int taskNumber, String format, String CCM_ADDR )
+ public static Commandline showTaskObjects( int taskNumber, String format, String ccmAddr )
throws ScmException
{
// Construct the CM Synergy command
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
@@ -115,18 +115,18 @@
*
* @param query query.
* @param format Output format
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the command line.
* @throws ScmException
*/
- public static Commandline query( String query, String format, String CCM_ADDR )
+ public static Commandline query( String query, String format, String ccmAddr )
throws ScmException
{
// Construct the CM Synergy command
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( QUERY );
@@ -152,17 +152,17 @@
* @param name Name of the baseline
* @param release the release.
* @param purpose the purpose.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the command line.
* @throws ScmException
*/
public static Commandline createBaseline( String projectSpec, String name, String release, String purpose,
- String CCM_ADDR )
+ String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( BASELINE );
@@ -188,16 +188,16 @@
*
* @param files fileset.
* @param message message log, or null if none.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the command line.
* @throws ScmException
*/
- public static Commandline create( List files, String message, String CCM_ADDR )
+ public static Commandline create( List files, String message, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( CREATE );
@@ -234,16 +234,16 @@
* @param synopsis synopsis.
* @param release release.
* @param defaultTask default.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the command line.
* @throws ScmException
*/
- public static Commandline createTask( String synopsis, String release, boolean defaultTask, String CCM_ADDR )
+ public static Commandline createTask( String synopsis, String release, boolean defaultTask, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( TASK );
@@ -277,16 +277,16 @@
*
* @param task_specs task_specs or default
* @param comment comment.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline checkinTask( String task_specs, String comment, String CCM_ADDR )
+ public static Commandline checkinTask( String task_specs, String comment, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( TASK );
@@ -306,17 +306,17 @@
* Create command line for deleting file(s).
*
* @param files fileset.
- * @param CCM_ADDR
+ * @param ccmAddr
* @param replace replace with previous version of file ?
* @return
* @throws ScmException
*/
- public static Commandline delete( List files, String CCM_ADDR, boolean replace )
+ public static Commandline delete( List files, String ccmAddr, boolean replace )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( DELETE );
@@ -347,16 +347,16 @@
* Create commandline to reconfigure a project.
*
* @param project_spec
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the command line.
* @throws ScmException
*/
- public static Commandline reconfigure( String project_spec, String CCM_ADDR )
+ public static Commandline reconfigure( String project_spec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( RECONFIGURE );
@@ -377,16 +377,16 @@
* Create commandline to reconfigure properties of a project.
*
* @param project_spec
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline reconfigureProperties( String project_spec, String CCM_ADDR )
+ public static Commandline reconfigureProperties( String project_spec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( RECONFIGURE_PROPERTIES );
@@ -402,16 +402,16 @@
* Create command line to reconcile a project with uwa option.
*
* @param project_spec
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline reconcileUwa( String project_spec, String CCM_ADDR )
+ public static Commandline reconcileUwa( String project_spec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( RECONCILE );
@@ -433,16 +433,16 @@
* Create command line to reconcile a project with udb option.
*
* @param project_spec
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline reconcileUdb( String project_spec, String CCM_ADDR )
+ public static Commandline reconcileUdb( String project_spec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( RECONCILE );
@@ -465,16 +465,16 @@
*
* @param directory
* @param format Output format.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline dir( File directory, String format, String CCM_ADDR )
+ public static Commandline dir( File directory, String format, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
try
{
@@ -504,16 +504,16 @@
* Create commandline to checkout a fileset.
*
* @param files fileset.
- * @param CCM_ADDR
+ * @param ccmAddr
* @return the command line.
* @throws ScmException
*/
- public static Commandline checkoutFiles( List files, String CCM_ADDR )
+ public static Commandline checkoutFiles( List files, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( CO );
@@ -541,17 +541,17 @@
* @param project_spec
* @param version new version of the project, or null if using default Synergy
* mecanism
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
public static Commandline checkoutProject( File directory, String project_spec, ScmVersion version, String purpose,
- String release, String CCM_ADDR )
+ String release, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( CO );
@@ -599,16 +599,16 @@
*
* @param project_spec
* @param comment
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline checkinProject( String project_spec, String comment, String CCM_ADDR )
+ public static Commandline checkinProject( String project_spec, String comment, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( CI );
@@ -628,16 +628,16 @@
*
* @param files fileset.
* @param comment
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline checkinFiles( List files, String comment, String CCM_ADDR )
+ public static Commandline checkinFiles( List files, String comment, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( CI );
@@ -669,16 +669,16 @@
* Create commandline to synchronize a project
*
* @param project_spec
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline synchronize( String project_spec, String CCM_ADDR )
+ public static Commandline synchronize( String project_spec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( SYNC );
@@ -693,16 +693,16 @@
* Create commandline to get workarea informations for a given project.
*
* @param project_spec
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline showWorkArea( String project_spec, String CCM_ADDR )
+ public static Commandline showWorkArea( String project_spec, String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( WA );
@@ -715,16 +715,16 @@
/**
* Create commandline to stop a Synergy session
*
- * @param CCM_ADDR
+ * @param ccmAddr
* @return
* @throws ScmException
*/
- public static Commandline stop( String CCM_ADDR )
+ public static Commandline stop( String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( STOP );
@@ -736,10 +736,10 @@
* Configure a commandline to use environement variables ($PATH)
*
* @param cl
- * @param CCM_ADDR
+ * @param ccmAddr
* @throws ScmException
*/
- private static void configureEnvironment( Commandline cl, String CCM_ADDR )
+ private static void configureEnvironment( Commandline cl, String ccmAddr )
throws ScmException
{
// We need PATH to be set for using CCM
@@ -751,7 +751,7 @@
{
String key = (String) i.next();
- if ( !key.toUpperCase().equals( "CCM_ADDR" ) )
+ if ( !key.toUpperCase().equals( "ccmAddr" ) )
{
cl.addEnvironment( key, envVars.getProperty( key ) );
@@ -764,7 +764,7 @@
throw new ScmException( "Fail to add PATH environment variable.", e1 );
}
- cl.addEnvironment( "CCM_ADDR", CCM_ADDR );
+ cl.addEnvironment( "ccmAddr", ccmAddr );
}
@@ -786,7 +786,7 @@
cl.createArgument().setValue( START );
cl.createArgument().setValue( "-nogui" );
cl.createArgument().setValue( "-m" ); // Multissesion
- cl.createArgument().setValue( "-q" ); // Quiet (return only CCM_ADDR)
+ cl.createArgument().setValue( "-q" ); // Quiet (return only ccmAddr)
cl.createArgument().setValue( "-n" );
cl.createArgument().setValue( username );
cl.createArgument().setValue( "-pw" );
@@ -806,12 +806,12 @@
* @return
* @throws ScmException
*/
- public static Commandline delimiter( String CCM_ADDR )
+ public static Commandline delimiter( String ccmAddr )
throws ScmException
{
Commandline cl = new Commandline();
- configureEnvironment( cl, CCM_ADDR );
+ configureEnvironment( cl, ccmAddr );
cl.setExecutable( CCM );
cl.createArgument().setValue( DELIMITER );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java Fri Aug 15 12:57:01 2008
@@ -89,18 +89,19 @@
* Get a working project whose predecessor is given.
*
* @param logger a logger.
- * @param project_spec predecessor (prep project)
+ * @param projectSpec predecessor (prep project)
* @param username owner of working project
* @param ccmAddr Synergy session ID.
- * @return project_spec of the working checkout, or null if none
+ * @return projectSpec of the working checkout, or null if none
*/
- public static String getWorkingProject( ScmLogger logger, String project_spec, String username, String ccmAddr )
+ public static String getWorkingProject( ScmLogger logger, String projectSpec, String username, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering getWorkingProject method" );
- String query = "owner='" + username + "' and status='working' and type='project' and has_predecessor('" +
- project_spec + ":project:1')";
+ String query =
+ "owner='" + username + "' and status='working' and type='project' and has_predecessor('" + projectSpec
+ + ":project:1')";
Commandline cl = SynergyCCM.query( query, "%displayname", ccmAddr );
@@ -118,17 +119,17 @@
* Get working file(s) in a given project.
*
* @param logger a logger.
- * @param project_spec (project)
+ * @param projectSpec (project)
* @param release release
* @param ccmAddr Synergy session ID.
* @return list of working files.
*/
- public static List getWorkingFiles( ScmLogger logger, String project_spec, String release, String ccmAddr )
+ public static List getWorkingFiles( ScmLogger logger, String projectSpec, String release, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering getWorkingFiles method" );
- String query = "status='working' and release='" + release + "' and is_member_of('" + project_spec + "')";
+ String query = "status='working' and release='" + release + "' and is_member_of('" + projectSpec + "')";
Commandline cl = SynergyCCM.query( query, SynergyGetWorkingFilesConsumer.OUTPUT_FORMAT, ccmAddr );
@@ -176,7 +177,7 @@
* startDate and before endDate.
*
* @param logger a logger.
- * @param projectSpec project_spec.
+ * @param projectSpec projectSpec.
* @param startDate start date.
* @param endDate end date.
* @param ccmAddr Synergy session ID.
@@ -220,7 +221,7 @@
* Create a baseline.
*
* @param logger a logger.
- * @param projectSpec the project_spec.
+ * @param projectSpec the projectSpec.
* @param name name of the baseline.
* @param release the release.
* @param purpose the purpose.
@@ -370,15 +371,15 @@
* Reconfigure a project.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @throws ScmException
*/
- public static void reconfigure( ScmLogger logger, String project_spec, String ccmAddr )
+ public static void reconfigure( ScmLogger logger, String projectSpec, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering reconfigure method" );
- Commandline cl = SynergyCCM.reconfigure( project_spec, ccmAddr );
+ Commandline cl = SynergyCCM.reconfigure( projectSpec, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -390,15 +391,15 @@
* Reconfigure properties of a project.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @throws ScmException
*/
- public static void reconfigureProperties( ScmLogger logger, String project_spec, String ccmAddr )
+ public static void reconfigureProperties( ScmLogger logger, String projectSpec, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering reconfigureProperties method" );
- Commandline cl = SynergyCCM.reconfigureProperties( project_spec, ccmAddr );
+ Commandline cl = SynergyCCM.reconfigureProperties( projectSpec, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -410,15 +411,15 @@
* Reconcile a project with -uwa option.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @throws ScmException
*/
- public static void reconcileUwa( ScmLogger logger, String project_spec, String ccmAddr )
+ public static void reconcileUwa( ScmLogger logger, String projectSpec, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering reconcileUwa method" );
- Commandline cl = SynergyCCM.reconcileUwa( project_spec, ccmAddr );
+ Commandline cl = SynergyCCM.reconcileUwa( projectSpec, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -430,15 +431,15 @@
* Reconcile a project with -udb option.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @throws ScmException
*/
- public static void reconcileUdb( ScmLogger logger, String project_spec, String ccmAddr )
+ public static void reconcileUdb( ScmLogger logger, String projectSpec, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering reconcileUdb method" );
- Commandline cl = SynergyCCM.reconcileUdb( project_spec, ccmAddr );
+ Commandline cl = SynergyCCM.reconcileUdb( projectSpec, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -472,18 +473,18 @@
*
* @param logger a logger.
* @param directory new project work area, or null if you want to use default wa.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @return checkout directory (directory + new project spec)
* @throws ScmException
*/
- public static void checkoutProject( ScmLogger logger, File directory, String project_spec, ScmVersion version,
+ public static void checkoutProject( ScmLogger logger, File directory, String projectSpec, ScmVersion version,
String purpose, String release, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering checkoutProject project method" );
- Commandline cl = SynergyCCM.checkoutProject( directory, project_spec, version, purpose, release, ccmAddr );
+ Commandline cl = SynergyCCM.checkoutProject( directory, projectSpec, version, purpose, release, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -496,18 +497,18 @@
* Checkin a given project.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param comment message.
* @param ccmAddr used to run in multi-session.
* @return checkout directory (directory + new project spec)
* @throws ScmException
*/
- public static void checkinProject( ScmLogger logger, String project_spec, String comment, String ccmAddr )
+ public static void checkinProject( ScmLogger logger, String projectSpec, String comment, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering checkinProject project method" );
- Commandline cl = SynergyCCM.checkinProject( project_spec, comment, ccmAddr );
+ Commandline cl = SynergyCCM.checkinProject( projectSpec, comment, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -542,16 +543,16 @@
* Synchronize a given project.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @throws ScmException
*/
- public static void synchronize( ScmLogger logger, String project_spec, String ccmAddr )
+ public static void synchronize( ScmLogger logger, String projectSpec, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering synchronize method" );
- Commandline cl = SynergyCCM.synchronize( project_spec, ccmAddr );
+ Commandline cl = SynergyCCM.synchronize( projectSpec, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -563,16 +564,16 @@
* Get the work area of a given project.
*
* @param logger a logger.
- * @param project_spec project_spec (i.e. myProject~1).
+ * @param projectSpec projectSpec (i.e. myProject~1).
* @param ccmAddr used to run in multi-session.
* @throws ScmException
*/
- public static File getWorkArea( ScmLogger logger, String project_spec, String ccmAddr )
+ public static File getWorkArea( ScmLogger logger, String projectSpec, String ccmAddr )
throws ScmException
{
logger.debug( "Synergy : Entering getWorkArea method" );
- Commandline cl = SynergyCCM.showWorkArea( project_spec, ccmAddr );
+ Commandline cl = SynergyCCM.showWorkArea( projectSpec, ccmAddr );
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
SynergyWorkareaConsumer stdout = new SynergyWorkareaConsumer( logger );
@@ -701,13 +702,13 @@
{
if ( stdout instanceof StringStreamConsumer )
{
- throw new ScmException( "Commandeline = " + cl.toString() + "\nSTDOUT = " +
- ( (StringStreamConsumer) stdout ).getOutput() + "\nSTDERR = " + stderr.getOutput() + "\n" );
+ throw new ScmException( "Commandeline = " + cl.toString() + "\nSTDOUT = "
+ + ( (StringStreamConsumer) stdout ).getOutput() + "\nSTDERR = " + stderr.getOutput() + "\n" );
}
else
{
- throw new ScmException( "Commandeline = " + cl.toString() + "\nSTDOUT = unavailable" + "\nSTDERR = " +
- stderr.getOutput() + "\n" );
+ throw new ScmException( "Commandeline = " + cl.toString() + "\nSTDOUT = unavailable" + "\nSTDERR = "
+ + stderr.getOutput() + "\n" );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/VssScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/VssScmProvider.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/VssScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/VssScmProvider.java Fri Aug 15 12:57:01 2008
@@ -43,7 +43,6 @@
/**
* @author <a href="mailto:george@neogrid.com.br">George Gastaldi</a>
* @version $Id$
- * @link http://msdn.microsoft.com/library/default.asp?url=/library/en-us/guides/html/vstskuse_command_line_commands_and_options.asp
* @plexus.component role="org.apache.maven.scm.provider.ScmProvider" role-hint="vss"
*/
public class VssScmProvider
@@ -188,11 +187,7 @@
return (UpdateScmResult) command.execute( repository, fileSet, parameters );
}
- /**
- * @see org.apache.maven.scm.provider.AbstractScmProvider#status(org.apache.maven.scm.provider.ScmProviderRepository,
- *org.apache.maven.scm.ScmFileSet,
- *org.apache.maven.scm.CommandParameters)
- */
+ /** {@inheritDoc} */
public StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -203,11 +198,7 @@
return (StatusScmResult) command.execute( repository, fileSet, parameters );
}
- /**
- * @see org.apache.maven.scm.provider.AbstractScmProvider#edit(org.apache.maven.scm.provider.ScmProviderRepository,
- *org.apache.maven.scm.ScmFileSet,
- *org.apache.maven.scm.CommandParameters)
- */
+ /** {@inheritDoc} */
public EditScmResult edit( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -218,13 +209,9 @@
return (EditScmResult) command.execute( repository, fileSet, parameters );
}
- /**
- * @see org.apache.maven.scm.provider.AbstractScmProvider#unedit(org.apache.maven.scm.provider.ScmProviderRepository,
- *org.apache.maven.scm.ScmFileSet,
- *org.apache.maven.scm.CommandParameters)
- */
/*
- public UnEditScmResult unedit( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ public UnEditScmResult unedit( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
VssUnEditCommand command = new VssUnEditCommand();
@@ -236,7 +223,8 @@
*/
/*
- protected RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ protected RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
VssRemoveCommand command = new VssRemoveCommand();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java Fri Aug 15 12:57:01 2008
@@ -119,9 +119,11 @@
}
catch ( FileNotFoundException e )
{
+ // nop
}
catch ( IOException e )
{
+ // nop
}
catch ( XmlPullParserException e )
{
@@ -159,11 +161,11 @@
String ssDir = "";
if ( VssCommandLineUtils.getSettings() != null )
{
- String _ssDir = VssCommandLineUtils.getSettings().getVssDirectory();
+ String ssDir2 = VssCommandLineUtils.getSettings().getVssDirectory();
- if ( _ssDir != null )
+ if ( ssDir2 != null )
{
- ssDir = StringUtils.replace( _ssDir, "\\", "/" );
+ ssDir = StringUtils.replace( ssDir2, "\\", "/" );
if ( !ssDir.endsWith( "/" ) )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java Fri Aug 15 12:57:01 2008
@@ -115,7 +115,7 @@
autoResponse = System.getProperty( "maven.scm.autoResponse" );
this.ssDir = repo.getVssdir();
this.user = repo.getUser();
-// this.vssLogin = this.user + (repos.getPassword() == null ? "" : ","+repos.getPassword());
+// this.vssLogin = this.user + (repos.getPassword() == null ? "" : ","+repos.getPassword());
}
/**
@@ -188,7 +188,7 @@
String msg = "Directory " + localPath + " creation was not " + "successful for an unknown reason";
throw new ScmException( msg );
}
-// getLogger().info("Created dir: " + dir.getAbsolutePath());
+// getLogger().info("Created dir: " + dir.getAbsolutePath());
}
lclPath = FLAG_OVERRIDE_WORKING_DIR + localPath;
}
@@ -262,9 +262,9 @@
if ( label != null && label.length() > 31 )
{
shortLabel = this.label.substring( 0, 30 );
-// getLogger().warn(
-// "Label is longer than 31 characters, truncated to: "
-// + shortLabel);
+// getLogger().warn(
+// "Label is longer than 31 characters, truncated to: "
+// + shortLabel);
}
else
{
@@ -324,16 +324,16 @@
if ( fromLabel.length() > 31 )
{
fromLabel = fromLabel.substring( 0, 30 );
-// getLogger().warn(
-// "FromLabel is longer than 31 characters, truncated to: "
-// + fromLabel);
+// getLogger().warn(
+// "FromLabel is longer than 31 characters, truncated to: "
+// + fromLabel);
}
if ( toLabel.length() > 31 )
{
toLabel = toLabel.substring( 0, 30 );
-// getLogger().warn(
-// "ToLabel is longer than 31 characters, truncated to: "
-// + toLabel);
+// getLogger().warn(
+// "ToLabel is longer than 31 characters, truncated to: "
+// + toLabel);
}
return FLAG_VERSION_LABEL + toLabel + VALUE_FROMLABEL + fromLabel;
}
@@ -342,9 +342,9 @@
if ( fromLabel.length() > 31 )
{
fromLabel = fromLabel.substring( 0, 30 );
-// getLogger().warn(
-// "FromLabel is longer than 31 characters, truncated to: "
-// + fromLabel);
+// getLogger().warn(
+// "FromLabel is longer than 31 characters, truncated to: "
+// + fromLabel);
}
return FLAG_VERSION + VALUE_FROMLABEL + fromLabel;
}
@@ -353,9 +353,9 @@
if ( toLabel.length() > 31 )
{
toLabel = toLabel.substring( 0, 30 );
-// getLogger().warn(
-// "ToLabel is longer than 31 characters, truncated to: "
-// + toLabel);
+// getLogger().warn(
+// "ToLabel is longer than 31 characters, truncated to: "
+// + toLabel);
}
return FLAG_VERSION_LABEL + toLabel;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java Fri Aug 15 12:57:01 2008
@@ -86,7 +86,7 @@
/**
* Marks start of file data
*/
- private static String START_FILE_PATH = "$/";
+ private static final String START_FILE_PATH = "$/";
/**
* Marks start of revision
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java Fri Aug 15 12:57:01 2008
@@ -72,7 +72,7 @@
/**
* Marks start of file data
*/
- private static String START_FILE_PATH = "$/";
+ private static final String START_FILE_PATH = "$/";
/**
* Marks getting a new File
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java Fri Aug 15 12:57:01 2008
@@ -120,7 +120,7 @@
}
/**
- * @see org.apache.maven.scm.command.checkout.AbstractCheckOutCommand#getChangeLogCommand()
+ * @return
*/
protected ChangeLogCommand getChangeLogCommand()
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditConsumer.java Fri Aug 15 12:57:01 2008
@@ -72,7 +72,7 @@
/**
* Marks start of file data
*/
- private static String START_FILE_PATH = "$/";
+ private static final String START_FILE_PATH = "$/";
/**
* Marks getting a new File
@@ -152,7 +152,8 @@
*/
private void processReplaceFile( String line )
{
-// updatedFiles.add( new ScmFile( currentPath + "/" + line.substring(START_CURRENTLY_CHECKED_OUT.length()), ScmFileStatus.UPDATED ) );
+// updatedFiles.add( new ScmFile( currentPath + "/" + line.substring(START_CURRENTLY_CHECKED_OUT.length()),
+// ScmFileStatus.UPDATED ) );
getLogger().info(
START_CURRENTLY_CHECKED_OUT + currentPath + "/" + line.substring( START_CURRENTLY_CHECKED_OUT.length() ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java Fri Aug 15 12:57:01 2008
@@ -120,7 +120,7 @@
}
/**
- * @see org.apache.maven.scm.command.update.AbstractUpdateCommand#getChangeLogCommand()
+ * @return
*/
protected ChangeLogCommand getChangeLogCommand()
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java Fri Aug 15 12:57:01 2008
@@ -1,23 +1,24 @@
package org.apache.maven.scm.provider.vss.commands.update;
/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.java Fri Aug 15 12:57:01 2008
@@ -72,7 +72,7 @@
/**
* Marks start of file data
*/
- private static String START_FILE_PATH = "$/";
+ private static final String START_FILE_PATH = "$/";
/**
* Marks getting a new File
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/command/diff/CvsDiffConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java?rev=686352&r1=686351&r2=686352&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/command/diff/CvsDiffConsumer.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/command/diff/CvsDiffConsumer.java Fri Aug 15 12:57:01 2008
@@ -41,7 +41,8 @@
//
// Index: plugin.jelly
// ===================================================================
- // RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/resources/META-INF/plexus/components.xml,v
+ // RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/
+ // src/main/resources/META-INF/plexus/components.xml,v
// retrieving revision 1.2
// diff -u -r1.2 components.xml
// --- plugin.jelly (revision 124799)
@@ -152,9 +153,9 @@
{
// skip, though could parse to verify command
}
- else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) ||
- line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN ) ||
- line.equals( NO_NEWLINE_TOKEN ) )
+ else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
+ || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN )
+ || line.equals( NO_NEWLINE_TOKEN ) )
{
// add to buffer
currentDifference.append( line ).append( "\n" );
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/command/login/CvsPass.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java?rev=686352&r1=686351&r2=686352&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/command/login/CvsPass.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/command/login/CvsPass.java Fri Aug 15 12:57:01 2008
@@ -133,8 +133,8 @@
if ( password == null )
{
- throw new ScmException( "password is required. You must run a 'cvs -d " + cvsRoot +
- " login' first or provide it in the connection url." );
+ throw new ScmException( "password is required. You must run a 'cvs -d " + cvsRoot
+ + " login' first or provide it in the connection url." );
}
//logger.debug( "password: " + password );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java Fri Aug 15 12:57:01 2008
@@ -41,7 +41,8 @@
super();
}
- public SvnChangeSet( String strDate, String userDatePattern, String comment, String author, List/*<ChangeFile>*/ files )
+ public SvnChangeSet( String strDate, String userDatePattern, String comment, String author,
+ List/*<ChangeFile>*/files )
{
super( strDate, userDatePattern, comment, author, files );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java Fri Aug 15 12:57:01 2008
@@ -219,8 +219,8 @@
}
// User has a tagBase specified so just return the name appended to the tagBase
- if ( StringUtils.isNotEmpty( tagBase ) && !tagBase.equals( resolveTagBase( repositoryUrl ) ) &&
- !tagBase.equals( resolveBranchBase( repositoryUrl ) ) )
+ if ( StringUtils.isNotEmpty( tagBase ) && !tagBase.equals( resolveTagBase( repositoryUrl ) )
+ && !tagBase.equals( resolveBranchBase( repositoryUrl ) ) )
{
return appendPath( tagBase, branchTagName );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java Fri Aug 15 12:57:01 2008
@@ -128,9 +128,9 @@
// skip, though could parse to verify filename, end revision
patch.append( line ).append( "\n" );
}
- else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) ||
- line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN ) ||
- line.equals( NO_NEWLINE_TOKEN ) )
+ else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
+ || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN )
+ || line.equals( NO_NEWLINE_TOKEN ) )
{
// add to buffer
currentDifference.append( line ).append( "\n" );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java Fri Aug 15 12:57:01 2008
@@ -137,8 +137,8 @@
if ( result.getInfoItems().size() != 1 )
{
- throw new ScmRepositoryException( "Cannot find URL: " +
- ( result.getInfoItems().size() == 0 ? "no" : "multiple" ) + " items returned by the info command" );
+ throw new ScmRepositoryException( "Cannot find URL: "
+ + ( result.getInfoItems().size() == 0 ? "no" : "multiple" ) + " items returned by the info command" );
}
return ( (SvnInfoItem) result.getInfoItems().get( 0 ) ).getURL();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java Fri Aug 15 12:57:01 2008
@@ -75,7 +75,8 @@
{
ScmFile file = (ScmFile) it.next();
- if ( !file.getStatus().equals( ScmFileStatus.DELETED ) && !new File( workingDirectory, file.getPath() ).isFile() )
+ if ( !file.getStatus().equals( ScmFileStatus.DELETED )
+ && !new File( workingDirectory, file.getPath() ).isFile() )
{
it.remove();
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java Fri Aug 15 12:57:01 2008
@@ -146,8 +146,8 @@
CommandLineUtils.StringStreamConsumer stderr, ScmLogger logger )
throws CommandLineException
{
- if ( exitCode != 0 && stderr.getOutput() != null && stderr.getOutput().indexOf( "'svn cleanup'" ) > 0 &&
- stderr.getOutput().indexOf( "'svn help cleanup'" ) > 0 )
+ if ( exitCode != 0 && stderr.getOutput() != null && stderr.getOutput().indexOf( "'svn cleanup'" ) > 0
+ && stderr.getOutput().indexOf( "'svn help cleanup'" ) > 0 )
{
logger.info( "Svn command failed due to some locks in working copy. We try to run a 'svn cleanup'." );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java Fri Aug 15 12:57:01 2008
@@ -79,8 +79,8 @@
}
catch ( IOException ex )
{
- return new BranchScmResult( null, "Error while making a temporary file for the commit message: " +
- ex.getMessage(), null, false );
+ return new BranchScmResult( null, "Error while making a temporary file for the commit message: "
+ + ex.getMessage(), null, false );
}
Commandline cl = createCommandLine( repository, fileSet.getBasedir(), branch, messageFile );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java Fri Aug 15 12:57:01 2008
@@ -81,13 +81,13 @@
/**
* The pattern used to match svn header lines
*/
- private static final String pattern = "^rev (\\d+):\\s+" + // revision number
+ private static final String PATTERN = "^rev (\\d+):\\s+" + // revision number
"(\\w+)\\s+\\|\\s+" + // author username
"(\\d+-\\d+-\\d+ " + // date 2002-08-24
"\\d+:\\d+:\\d+) " + // time 16:01:00
"([\\-+])(\\d\\d)(\\d\\d)"; // gmt offset -0400
- private static final String pattern2 = "^r(\\d+)\\s+\\|\\s+" + // revision number
+ private static final String PATTERN2 = "^r(\\d+)\\s+\\|\\s+" + // revision number
"(\\(\\S+\\s+\\S+\\)|\\S+)\\s+\\|\\s+" + // author username
"(\\d+-\\d+-\\d+ " + // date 2002-08-24
"\\d+:\\d+:\\d+) " + // time 16:01:00
@@ -138,14 +138,14 @@
try
{
- headerRegexp = new RE( pattern );
- headerRegexp2 = new RE( pattern2 );
+ headerRegexp = new RE( PATTERN );
+ headerRegexp2 = new RE( PATTERN2 );
}
catch ( RESyntaxException ex )
{
throw new RuntimeException(
- "INTERNAL ERROR: Could not create regexp to parse svn log file. This shouldn't happen. Something is probably wrong with the oro installation.",
- ex );
+ "INTERNAL ERROR: Could not create regexp to parse svn log file. This shouldn't happen. Something is probably wrong with the oro installation.",
+ ex );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java Fri Aug 15 12:57:01 2008
@@ -63,8 +63,8 @@
}
catch ( IOException ex )
{
- return new CheckInScmResult( null, "Error while making a temporary file for the commit message: " +
- ex.getMessage(), null, false );
+ return new CheckInScmResult( null, "Error while making a temporary file for the commit message: "
+ + ex.getMessage(), null, false );
}
Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, fileSet, messageFile );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java Fri Aug 15 12:57:01 2008
@@ -144,9 +144,7 @@
return cl;
}
- /**
- * @see org.apache.maven.scm.command.update.AbstractUpdateCommand#getChangeLogCommand()
- */
+ /** {@inheritDoc} */
protected ChangeLogCommand getChangeLogCommand()
{
SvnChangeLogCommand command = new SvnChangeLogCommand();