svn commit: r1455695 - /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java

[ch...@apache.org]

Author: challngr
Date: Tue Mar 12 20:10:11 2013
New Revision: 1455695

URL: http://svn.apache.org/r1455695
Log:
UIMA-2687
Adjust and correlate args for DuccServiceApi and DuccServiceSubmit

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.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=1455695&r1=1455694&r2=1455695&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 Tue Mar 12 20:10:11 2013
@@ -52,28 +52,31 @@ public class DuccServiceApi 
     UiOption[] registration_options = {
         UiOption.Help,
         UiOption.Debug,
-        UiOption.Register,
-        UiOption.Autostart,
-        UiOption.Instances,
-        UiOption.ClasspathOrder,
         UiOption.Description,
-        UiOption.ProcessDD,
-        UiOption.ProcessMemorySize,
-        UiOption.ProcessClasspath,
-        UiOption.ProcessJvmArgs,
-        UiOption.ProcessEnvironment,
-        UiOption.ProcessFailuresLimit,
         UiOption.SchedulingClass,
-        UiOption.WorkingDirectory,
         UiOption.LogDirectory,
+        UiOption.WorkingDirectory,
         UiOption.Jvm,
+        UiOption.ProcessJvmArgs,
+        UiOption.ProcessClasspath,
+        UiOption.ProcessEnvironment,
+        UiOption.ProcessMemorySize,
+        UiOption.ProcessDD,
+        UiOption.ProcessFailuresLimit,
+        UiOption.ClasspathOrder,
+        // UiOption.Specification          // not used for registration
         UiOption.ServiceDependency,
-        UiOption.ServiceLinger,
         UiOption.ServiceRequestEndpoint,
+        UiOption.ServiceLinger,
         UiOption.ServicePingClass,
+        UiOption.ServicePingClasspath,
         UiOption.ServicePingJvmArgs,
-        UiOption.ServicePingDoLog,
         UiOption.ServicePingTimeout,
+        UiOption.ServicePingDoLog,
+
+        UiOption.Register,
+        UiOption.Autostart,
+        UiOption.Instances,
     }; 
 
     UiOption[] unregister_options = {
@@ -224,10 +227,6 @@ public class DuccServiceApi 
         DuccProperties dp = new DuccProperties();
         init(this.getClass().getName(), registration_options, args, dp, sm_host, sm_port, "sm", null, "services");
 
-        // A few spurious properties are set as an artifact of parsing the overly-complex command line, and need removal
-        dp.remove(UiOption.SubmitPid.pname());
-        dp.remove(UiOption.Register.pname());
-
         //
         // Now: get jvm args and resolve placeholders, in particular, the broker url
         //
@@ -280,7 +279,12 @@ public class DuccServiceApi 
         Trinary autostart = getAutostart();
         String user = (String) dp.remove(UiOption.User.pname());
         byte[] auth_block = (byte[]) dp.remove(UiOption.Signature.pname());
-
+        
+        // A few spurious properties are set as an artifact of parsing the overly-complex command line, and need removal
+        dp.remove(UiOption.SubmitPid.pname());
+        dp.remove(UiOption.Register.pname());
+        dp.remove(UiOption.Instances.pname());
+        dp.remove(UiOption.Autostart.pname());
 
         ServiceRegisterEvent ev = new ServiceRegisterEvent(user, instances, autostart, endpoint, cli_props, auth_block);