maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r941452 - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/ maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/ut...
Date Wed, 05 May 2010 19:57:01 GMT
Author: olamy
Date: Wed May  5 19:57:01 2010
New Revision: 941452

URL: http://svn.apache.org/viewvc?rev=941452&view=rev
Log:
[SCM-534] expose getSettingsFile
Submitted by Robert Scholte

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.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/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
    maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java

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=941452&r1=941451&r2=941452&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
Wed May  5 19:57:01 2010
@@ -115,7 +115,7 @@ public class VssCommandLineUtils
     public static final Settings getSettings()
     {
         Settings settings = null;
-        File settingsFile = new File( scmConfDir, "vss-settings.xml" );
+        File settingsFile = getScmConfFile();
         if ( settingsFile.exists() )
         {
             VssXpp3Reader reader = new VssXpp3Reader();
@@ -181,4 +181,9 @@ public class VssCommandLineUtils
         }
         return ssDir;
     }
+    
+    public static File getScmConfFile() 
+    {
+    	return new File( scmConfDir, "vss-settings.xml" );
+    }
 }

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=941452&r1=941451&r2=941452&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
Wed May  5 19:57:01 2010
@@ -46,8 +46,7 @@ public class CvsUtil
 
     public static Settings getSettings()
     {
-        File scmUserDir = settingsDirectory;
-        File settingsFile = new File( scmUserDir, CVS_SETTINGS_FILENAME );
+        File settingsFile = getSettingsFile();
 
         if ( settingsFile.exists() )
         {
@@ -79,4 +78,9 @@ public class CvsUtil
     {
         settingsDirectory = directory;
     }
+    
+    public static File getSettingsFile()
+    {
+    	return new File( settingsDirectory, CVS_SETTINGS_FILENAME );
+    }
 }

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=941452&r1=941451&r2=941452&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
Wed May  5 19:57:01 2010
@@ -46,8 +46,7 @@ public class GitUtil
 
     public static Settings getSettings()
     {
-        File scmUserDir = settingsDirectory;
-        File settingsFile = new File( scmUserDir, GIT_SETTINGS_FILENAME );
+        File settingsFile = getSettingsFile();
 
         if ( settingsFile.exists() )
         {
@@ -79,4 +78,9 @@ public class GitUtil
     {
         settingsDirectory = directory;
     }
+    
+    public static File getSettingsFile()
+    {
+    	return new File( settingsDirectory, GIT_SETTINGS_FILENAME );
+    }
 }

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/util/SvnUtil.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/util/SvnUtil.java?rev=941452&r1=941451&r2=941452&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/util/SvnUtil.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/util/SvnUtil.java
Wed May  5 19:57:01 2010
@@ -46,8 +46,7 @@ public class SvnUtil
 
     public static Settings getSettings()
     {
-        File scmUserDir = settingsDirectory;
-        File settingsFile = new File( scmUserDir, SVN_SETTINGS_FILENAME );
+        File settingsFile = getSettingsFile();
 
         if ( settingsFile.exists() )
         {
@@ -79,4 +78,9 @@ public class SvnUtil
     {
         settingsDirectory = directory;
     }
+    
+    public static File getSettingsFile()
+    {
+    	return new File( settingsDirectory, SVN_SETTINGS_FILENAME );
+    }
 }



Mime
View raw message