svn commit: r896222 - in /maven/scm/trunk/maven-scm-providers: maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/util/ maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apac...

[olamy]

Author: olamy
Date: Tue Jan  5 21:20:54 2010
New Revision: 896222

URL: http://svn.apache.org/viewvc?rev=896222&view=rev
Log:
[SCM-522] Provide Util.setSettingsDirectory for git and cvs
Submitted by Robert Scholte.

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/util/CvsUtil.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java

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/util/CvsUtil.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/util/CvsUtil.java?rev=896222&r1=896221&r2=896222&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/util/CvsUtil.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/util/CvsUtil.java
 Tue Jan  5 21:20:54 2010
@@ -34,14 +34,20 @@
  */
 public class CvsUtil
 {
+    protected static final String CVS_SETTINGS_FILENAME = "cvs-settings.xml";
+
+    public static final File DEFAULT_SETTINGS_DIRECTORY = new File( 
System.getProperty( "user.home" ), ".scm" );
+
+    private static File settingsDirectory = DEFAULT_SETTINGS_DIRECTORY;
+
     private CvsUtil()
     {
     }
 
     public static Settings getSettings()
     {
-        File scmUserDir = new File( System.getProperty( "user.home" ), ".scm" 
);
-        File settingsFile = new File( scmUserDir, "cvs-settings.xml" );
+        File scmUserDir = settingsDirectory;
+        File settingsFile = new File( scmUserDir, CVS_SETTINGS_FILENAME );
 
         if ( settingsFile.exists() )
         {
@@ -68,4 +74,9 @@
 
         return new Settings();
     }
+
+    public static void setSettingsDirectory( File directory )
+    {
+        settingsDirectory = directory;
+    }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java?rev=896222&r1=896221&r2=896222&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
 Tue Jan  5 21:20:54 2010
@@ -34,14 +34,20 @@
  */
 public class GitUtil
 {
+    protected static final String GIT_SETTINGS_FILENAME = "git-settings.xml";
+
+    public static final File DEFAULT_SETTINGS_DIRECTORY = new File( 
System.getProperty( "user.home" ), ".scm" );
+
+    private static File settingsDirectory = DEFAULT_SETTINGS_DIRECTORY;
+
     private GitUtil()
     {
     }
 
     public static Settings getSettings()
     {
-        File scmUserDir = new File( System.getProperty( "user.home" ), ".scm" 
);
-        File settingsFile = new File( scmUserDir, "git-settings.xml" );
+        File scmUserDir = settingsDirectory;
+        File settingsFile = new File( scmUserDir, GIT_SETTINGS_FILENAME );
 
         if ( settingsFile.exists() )
         {
@@ -68,4 +74,9 @@
 
         return new Settings();
     }
+
+    public static void setSettingsDirectory( File directory )
+    {
+        settingsDirectory = directory;
+    }
 }