svn commit: r482649 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java

[evenisse]

Author: evenisse
Date: Tue Dec  5 05:39:55 2006
New Revision: 482649

URL: http://svn.apache.org/viewvc?view=rev&rev=482649
Log:
[SCM-260] Configure location of ss.exe on command line
Submitted by: Martin Goldhahn

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.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?view=diff&rev=482649&r1=482648&r2=482649
==============================================================================
--- 
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
 Tue Dec  5 05:39:55 2006
@@ -126,6 +126,13 @@
                 System.out.println( message );
             }
         }
+        
+        // override settings with command line options
+        String vssDirectory = System.getProperty( "vssDirectory" );
+        if ( StringUtils.isNotEmpty( vssDirectory ) )
+        {
+            settings.setVssDirectory( vssDirectory );
+        }
         return settings;
     }
 
@@ -134,13 +141,16 @@
         String ssDir = "";
         if ( VssCommandLineUtils.getSettings() != null )
         {
-            ssDir = VssCommandLineUtils.getSettings().getVssDirectory();
-
-            ssDir = StringUtils.replace( ssDir, "\\", "/" );
+            String _ssDir = 
VssCommandLineUtils.getSettings().getVssDirectory();
 
-            if ( !ssDir.endsWith( "/" ) )
+            if ( _ssDir != null ) 
             {
-                ssDir += "/";
+                ssDir = StringUtils.replace( _ssDir, "\\", "/" );
+    
+                if ( !ssDir.endsWith( "/" ) )
+                {
+                    ssDir += "/";
+                }
             }
         }
         return ssDir;