You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/06/28 21:41:46 UTC
svn commit: r1497899 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli: DuccServiceApi.java DuccServiceSubmit.java

Author: burn
Date: Fri Jun 28 19:41:45 2013
New Revision: 1497899

URL: http://svn.apache.org/r1497899
Log:
UIMA-3026 Moved environment fixup from service-submit to service-register so don't get SM's environment

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1497899&r1=1497898&r2=1497899&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java Fri Jun 28 19:41:45 2013
@@ -298,6 +298,17 @@ public class DuccServiceApi 
         // Presumably only the endpoint and service dependencies can have place holders
         DuccUiUtilities.resolvePropertiesPlaceholders(cli_props, jvmargs);
 
+        /*
+         * Fixup the environment: rename LD_LIBRARY_PATH & add any standard ones
+         */
+        String key_ev = UiOption.ProcessEnvironment.pname();
+        if ( cli_props.containsKey(UiOption.Environment.pname()) ) {
+            key_ev = UiOption.Environment.pname();
+        }
+        if (!DuccUiUtilities.ducc_environment(this, cli_props, key_ev)) {
+            throw new IllegalArgumentException("Invalid environment syntax: " + cli_props.getProperty(key_ev));
+        }
+        
         setLinger();
 
         //

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1497899&r1=1497898&r2=1497899&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java Fri Jun 28 19:41:45 2013
@@ -225,16 +225,6 @@ public class DuccServiceSubmit 
             requestProperties.dump();
         }
     
-        /*
-         * set DUCC_LD_LIBRARY_PATH in process environment
-         */
-        String key_ev = UiOption.ProcessEnvironment.pname();
-        if ( cli_props.containsKey(UiOption.Environment.pname()) ) {
-            key_ev = UiOption.Environment.pname();
-        }
-        if (!DuccUiUtilities.ducc_environment(this, requestProperties, key_ev)) {
-            return false;
-        }
         requestProperties.put(UiOption.ProcessThreadCount.pname(), "1");         // enforce this - OR will complain if it's missing
 
         SubmitServiceDuccEvent      ev    = new SubmitServiceDuccEvent(requestProperties);