You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/01/19 17:15:49 UTC
[1/2] git commit: Make System properties available as static finals
Make System properties available as static finals
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/91ff5035
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/91ff5035
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/91ff5035
Branch: refs/heads/master
Commit: 91ff503512dbc8994728cb74e53054e23da56d43
Parents: d2ebf9d
Author: rfscholte <rf...@apache.org>
Authored: Sat Jan 19 17:10:15 2013 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sat Jan 19 17:10:15 2013 +0100
----------------------------------------------------------------------
.../consumer/SynergyGetCompletedTasksConsumer.java | 30 +++++++++++----
.../SynergyGetCompletedTasksConsumerTest.java | 12 +++---
2 files changed, 28 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/91ff5035/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java b/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
index 852d7af..cd845d8 100644
--- a/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
@@ -19,11 +19,6 @@ package org.apache.maven.scm.provider.synergy.consumer;
* under the License.
*/
-import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.provider.synergy.util.SynergyTask;
-import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
-import org.apache.maven.scm.util.AbstractConsumer;
-
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -31,6 +26,11 @@ import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
+import org.apache.maven.scm.log.ScmLogger;
+import org.apache.maven.scm.provider.synergy.util.SynergyTask;
+import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
+import org.apache.maven.scm.util.AbstractConsumer;
+
/**
* Mainly inspired from CruiseControl
*
@@ -40,6 +40,20 @@ import java.util.StringTokenizer;
public class SynergyGetCompletedTasksConsumer
extends AbstractConsumer
{
+ /**
+ * Name of the System property to set the ccmDateFormat
+ */
+ static final String CCMDATEFORMAT_PROPERTY = "maven.scm.synergy.ccmDateFormat";
+
+ /**
+ * Name of the System property to set the language
+ */
+ static final String LANGUAGE_PROPERTY = "maven.scm.synergy.language";
+
+ /**
+ * Name of the System property to set the country
+ */
+ static final String COUNTRY_PROPERTY = "maven.scm.synergy.country";
/**
* The date format as returned by your installation of CM Synergy. Fri Dec 3
@@ -67,7 +81,7 @@ public class SynergyGetCompletedTasksConsumer
public SynergyGetCompletedTasksConsumer( ScmLogger logger )
{
super( logger );
- String dateFormat = System.getProperty( "maven.scm.synergy.ccmDateFormat" );
+ String dateFormat = System.getProperty( CCMDATEFORMAT_PROPERTY );
if ( dateFormat != null && !dateFormat.equals( "" ) )
{
this.ccmDateFormat = dateFormat;
@@ -76,7 +90,7 @@ public class SynergyGetCompletedTasksConsumer
{
logger.debug( "dateFormat = " + this.ccmDateFormat );
}
- String language = System.getProperty( "maven.scm.synergy.language" );
+ String language = System.getProperty( LANGUAGE_PROPERTY );
if ( language != null && !language.equals( "" ) )
{
this.language = language;
@@ -85,7 +99,7 @@ public class SynergyGetCompletedTasksConsumer
{
logger.debug( "language = " + this.language );
}
- String country = System.getProperty( "maven.scm.synergy.country" );
+ String country = System.getProperty( COUNTRY_PROPERTY );
if ( country != null && !country.equals( "" ) )
{
this.country = country;
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/91ff5035/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java b/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
index 31127f6..842c42a 100644
--- a/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumerTest.java
@@ -45,9 +45,9 @@ public class SynergyGetCompletedTasksConsumerTest
super.tearDown();
// Be sure System properties are reset, so they don't conflict with other tests
- System.getProperties().remove( "maven.scm.synergy.ccmDateFormat" );
- System.getProperties().remove( "maven.scm.synergy.language" );
- System.getProperties().remove( "maven.scm.synergy.country" );
+ System.clearProperty( SynergyGetCompletedTasksConsumer.CCMDATEFORMAT_PROPERTY );
+ System.clearProperty( SynergyGetCompletedTasksConsumer.LANGUAGE_PROPERTY );
+ System.clearProperty( SynergyGetCompletedTasksConsumer.COUNTRY_PROPERTY );
}
@@ -94,9 +94,9 @@ public class SynergyGetCompletedTasksConsumerTest
String s = in.readLine();
- System.setProperty( "maven.scm.synergy.ccmDateFormat", "EEEE dd MMMM yyyy HH:mm:ss" );
- System.setProperty( "maven.scm.synergy.language", "fr" );
- System.setProperty( "maven.scm.synergy.country", "FR" );
+ System.setProperty( SynergyGetCompletedTasksConsumer.CCMDATEFORMAT_PROPERTY, "EEEE dd MMMM yyyy HH:mm:ss" );
+ System.setProperty( SynergyGetCompletedTasksConsumer.LANGUAGE_PROPERTY, "fr" );
+ System.setProperty( SynergyGetCompletedTasksConsumer.COUNTRY_PROPERTY, "FR" );
SynergyGetCompletedTasksConsumer consumer = new SynergyGetCompletedTasksConsumer( new DefaultLog() );
while ( s != null )