svn commit: r1529837 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli: CliBase.java IUiOptions.java

[bu...@apache.org]

Author: burn
Date: Mon Oct  7 13:31:41 2013
New Revision: 1529837

URL: http://svn.apache.org/r1529837
Log:
UIMA-3333 Default working directory to '.' and make it absolute

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java?rev=1529837&r1=1529836&r2=1529837&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java Mon Oct  7 13:31:41 2013
@@ -21,6 +21,7 @@ package org.apache.uima.ducc.cli;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
@@ -152,19 +153,21 @@ public abstract class CliBase
         return log_directory;
     }
 
-    void setWorkingDirectory()
+    /*
+     * If the workong directory has been defined (or defaulted) make sure it is absolute
+     */
+    void setWorkingDirectory() throws IOException
     {
         String working_directory = cli_props.getProperty(UiOption.WorkingDirectory.pname());
-        if(working_directory == null) {
-            working_directory = System.getProperty("user.dir");
-            cli_props.setProperty(UiOption.WorkingDirectory.pname(), working_directory);
+        if (working_directory == null) {
+            return;     // Not valid for this request
         }
         File f = new File(working_directory);
         if ( ! f.exists() ) {
             throw new IllegalArgumentException("Working directory " + working_directory + " does not exist.");
         }
-        if ( ! f.canExecute() ) {
-            throw new IllegalArgumentException("Working directory " + working_directory + " exists but cannot be accessed.");
+        if ( ! f.isAbsolute() ) {
+            cli_props.setProperty(UiOption.WorkingDirectory.pname(), f.getCanonicalPath());
         }
     }
 

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1529837&r1=1529836&r2=1529837&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java Mon Oct  7 13:31:41 2013
@@ -692,6 +692,7 @@ public interface IUiOptions
             public String argname()     { return "path"; }
             public String description() { return "The working directory set in each process. Default to current directory."; }
             public String example()     { return null; }
+            public String deflt()       { return "."; }
             public String label()       { return "WorkingDirectory"; }
         },            
         ;