You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2009/12/17 22:29:26 UTC
svn commit: r891919 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src:
main/java/org/apache/maven/scm/provider/synergy/util/
test/java/org/apache/maven/scm/provider/synergy/util/
Author: olamy
Date: Thu Dec 17 21:29:25 2009
New Revision: 891919
URL: http://svn.apache.org/viewvc?rev=891919&view=rev
Log:
[SCM-505] Linux Synergy client fails to execute scm:update command
apply formatting
Submitted by subir.sasikumar@wipro.com
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
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=891919&r1=891918&r2=891919&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 Thu Dec 17 21:29:25 2009
@@ -819,7 +819,7 @@
cl.createArg().setValue( "-nogui" );
cl.createArg().setValue( "-m" ); // Multissesion
cl.createArg().setValue( "-q" ); // Quiet (return only CCM_ADDR)
- cl.createArg().setValue( "-rc" );//Remote client
+ cl.createArg().setValue( "-rc" ); //Remote client
cl.createArg().setValue( "-n" );
cl.createArg().setValue( username );
cl.createArg().setValue( "-pw" );
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=891919&r1=891918&r2=891919&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 Thu Dec 17 21:29:25 2009
@@ -719,22 +719,22 @@
//executeSynergyCommand( logger, cl, stderr, stdout, true );
- int exitCode = executeSynergyCommand( logger, cl, stderr, stdout, false );
+ int exitCode = executeSynergyCommand( logger, cl, stderr, stdout, false );
- if ( logger.isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
logger.debug( "Synergy : start returns with error code " + exitCode );
}
- if ( exitCode != 0 )
- {
- cl = SynergyCCM.startRemote( username, password, role );
+ if ( exitCode != 0 )
+ {
+ cl = SynergyCCM.startRemote( username, password, role );
- stderr = new CommandLineUtils.StringStreamConsumer();
+ stderr = new CommandLineUtils.StringStreamConsumer();
stdout = new CommandLineUtils.StringStreamConsumer();
-
- executeSynergyCommand( logger, cl, stderr, stdout, true );
- }
+
+ executeSynergyCommand( logger, cl, stderr, stdout, true );
+ }
return stdout.getOutput();
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java?rev=891919&r1=891918&r2=891919&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java Thu Dec 17 21:29:25 2009
@@ -394,7 +394,7 @@
assertCommandLine( "ccm start -nogui -m -q -n user -pw pass -r build_mgr", null, cl );
}
- public void testStartRemote()
+ public void testStartRemote()
throws ScmException
{
Commandline cl = SynergyCCM.startRemote( "user", "pass", SynergyRole.BUILD_MGR );