You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2014/02/25 19:51:33 UTC
svn commit: r1571786 - in /uima/sandbox/uima-ducc/trunk:
src/main/resources/service_monitors/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/e...
Author: challngr
Date: Tue Feb 25 18:51:32 2014
New Revision: 1571786
URL: http://svn.apache.org/r1571786
Log:
UIMA-3405 Remove obsolete code. Use CLI constants for properties keys. Eliminate
unnecessary serialization declarations.
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IServiceApi.java
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing
uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing.external
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ApiHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServicePingMain.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/SmConstants.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/event/ServiceManagerEventListener.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing Tue Feb 25 18:51:32 2014
@@ -1,9 +1,12 @@
-service_ping_class = org.apache.uima.ducc.cli.UimaAsPing
-service_ping_arguments = meta-timeout=15000,broker-jmx-port=${ducc.broker.jmx.port},max-failures=5,failure-window=10,enable-log=false
-#service_ping_classpath = whatever, in addition to the defaults supplied by the sm
-service_ping_dolog = False
+service_ping_class = org.apache.uima.ducc.cli.UimaAsPing
+service_ping_arguments = meta-timeout=15000,broker-jmx-port=${ducc.broker.jmx.port},enable-log=false
+#service_ping_classpath = whatever, in addition to the defaults supplied by the sm
+service_ping_dolog = False
-internal = true
+instance_failures_window = 10
+instance_failures_limit = 3
+
+internal = true
Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing.external
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing.external?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing.external (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/service_monitors/org.apache.uima.ducc.cli.UimaAsPing.external Tue Feb 25 18:51:32 2014
@@ -1,10 +1,13 @@
service_ping_class = org.apache.uima.ducc.cli.UimaAsPing
-service_ping_arguments = meta-timeout-15000,broker-jmx-port=${ducc.broker.jmx.port},max-failures=5,failure-window=30,enable-log=true
+service_ping_arguments = meta-timeout-15000,broker-jmx-port=${ducc.broker.jmx.port},enable-log=true
#service_ping_jvmargs = any jvm args you need for standalone execution
service_ping_classpath = ${DUCC_HOME}/lib/uima/*:${DUCC_HOME}/activemq/*:${DUCC_HOME}/lib//springframework/*
service_ping_dolog = true
service_ping_timeout = 10000
+instance_failures_window = 10
+instance_failures_limit = 3
+
internal = false
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=1571786&r1=1571785&r2=1571786&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 Tue Feb 25 18:51:32 2014
@@ -21,7 +21,6 @@ package org.apache.uima.ducc.cli;
import java.util.ArrayList;
import java.util.Properties;
-import org.apache.uima.ducc.cli.IServiceApi.RegistrationOption;
import org.apache.uima.ducc.transport.event.SubmitServiceDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitServiceReplyDuccEvent;
import org.apache.uima.ducc.transport.event.cli.ServiceRequestProperties;
@@ -121,7 +120,7 @@ public class DuccServiceSubmit
String uimaDD = cli_props.getStringProperty(UiOption.ProcessDD.pname(), null);
String customCmd = cli_props.getStringProperty(UiOption.ProcessExecutable.pname(), null);
- String endpoint = requestProperties.getProperty(RegistrationOption.ServiceRequestEndpoint.decode());
+ String endpoint = requestProperties.getProperty(UiOption.ServiceRequestEndpoint.pname());
if (endpoint == null || endpoint.startsWith(ServiceType.UimaAs.decode())) {
requestProperties.put(UiOption.ServiceTypeUima.pname(), "");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ApiHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ApiHandler.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ApiHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ApiHandler.java Tue Feb 25 18:51:32 2014
@@ -23,6 +23,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.ServiceStartEvent;
import org.apache.uima.ducc.transport.event.ServiceStopEvent;
import org.apache.uima.ducc.transport.event.ServiceUnregisterEvent;
+import org.apache.uima.ducc.transport.event.sm.IService.Trinary;
/**
@@ -38,7 +39,6 @@ class ApiHandler
/**
*
*/
- private static final long serialVersionUID = 1L;
UiOption cmd;
ServiceHandler serviceHandler;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java Tue Feb 25 18:51:32 2014
@@ -38,11 +38,13 @@ import java.util.Timer;
import java.util.TimerTask;
import org.apache.uima.ducc.cli.AServicePing;
+import org.apache.uima.ducc.cli.IUiOptions.UiOption;
import org.apache.uima.ducc.common.IServiceStatistics;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
+import org.apache.uima.ducc.transport.event.sm.IService.ServiceState;
/**
@@ -66,7 +68,6 @@ class PingDriver
/**
*
*/
- private static final long serialVersionUID = 1L;
private DuccLogger logger = DuccLogger.getLogger(this.getClass().getName(), COMPONENT_NAME);
@@ -123,7 +124,7 @@ class PingDriver
// establish the default pinger, then see if another pinger is specified and set it.
this.ping_class = System.getProperty("ducc.sm.default.monitor.class", "org.apache.uima.ducc.cli.UimaAsPing");
- this.ping_class = job_props.getStringProperty("service_ping_class", this.ping_class);
+ this.ping_class = job_props.getStringProperty(UiOption.ServicePingClass.pname(), this.ping_class);
// If the pinger is registered with us we can pick up (and trust) the registered defaults. Read the registration now.
DuccProperties ping_props = findRegisteredPinger(this.ping_class);
@@ -144,17 +145,17 @@ class PingDriver
this.user = meta_props.getStringProperty("user");
this.max_instances = Integer.parseInt(System.getProperty("ducc.sm.max.instances", "10"));
- this.ping_arguments = resolveStringProperty ("service_ping_arguments", ping_props, job_props, null);
- String jvm_args_str = resolveStringProperty ("service_ping_jvm_args" , ping_props, job_props, "");
+ this.ping_arguments = resolveStringProperty (UiOption.ServicePingArguments.pname() , ping_props, job_props, null);
+ String jvm_args_str = resolveStringProperty (UiOption.ServicePingJvmArgs.pname() , ping_props, job_props, "");
- this.meta_ping_timeout = resolveIntProperty ("service_ping_timeout" , ping_props, job_props, ServiceManagerComponent.meta_ping_timeout);
- this.do_log = resolveBooleanProperty("service_ping_dolog" , ping_props, job_props, false);
- this.classpath = resolveStringProperty ("service_ping_classpath", ping_props, job_props, System.getProperty("java.class.path"));
- this.working_directory = resolveStringProperty ("working_directory" , ping_props, job_props, null); // cli always puts this int job props, no default
-
- this.log_directory = resolveStringProperty ("log_directory" , ping_props, job_props, null); // cli always puts this int job props, no default
- this.failure_window = resolveIntProperty ("instance_failures_window", ping_props, job_props, ServiceManagerComponent.failure_window);
- this.failure_max = resolveIntProperty ("instance_failures_limit" , ping_props, job_props, ServiceManagerComponent.failure_max);
+ this.meta_ping_timeout = resolveIntProperty (UiOption.ServicePingTimeout.pname() , ping_props, job_props, ServiceManagerComponent.meta_ping_timeout);
+ this.do_log = resolveBooleanProperty(UiOption.ServicePingDoLog.pname() , ping_props, job_props, false);
+ this.classpath = resolveStringProperty (UiOption.ServicePingClasspath.pname() , ping_props, job_props, System.getProperty("java.class.path"));
+ this.working_directory = resolveStringProperty (UiOption.WorkingDirectory.pname() , ping_props, job_props, null); // cli always puts this int job props, no default
+
+ this.log_directory = resolveStringProperty (UiOption.LogDirectory.pname() , ping_props, job_props, null); // cli always puts this int job props, no default
+ this.failure_window = resolveIntProperty (UiOption.InstanceFailureWindow.pname(), ping_props, job_props, ServiceManagerComponent.failure_window);
+ this.failure_max = resolveIntProperty (UiOption.InstanceFailureLimit.pname( ), ping_props, job_props, ServiceManagerComponent.failure_max);
jvm_args_str = jvm_args_str.trim();
if ( jvm_args_str.equals("") ) {
@@ -230,26 +231,26 @@ class PingDriver
val.equalsIgnoreCase("true") );
}
- /**
- * Test from main only
- */
- PingDriver(String props)
- {
- DuccProperties dp = new DuccProperties();
- try {
- dp.load(props);
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- this.endpoint = dp.getStringProperty("endpoint");
- String jvm_args_str = dp.getStringProperty("service_ping_jvm_args", "");
- this.ping_class = dp.getStringProperty("service_ping_class");
- this.classpath = dp.getStringProperty("service_ping_classpath");
- jvm_args = jvm_args_str.split(" ");
- this.test_mode = true;
- }
+ // /**
+ // * Test from main only
+ // */
+ // PingDriver(String props)
+ // {
+ // DuccProperties dp = new DuccProperties();
+ // try {
+ // dp.load(props);
+ // } catch (Exception e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+
+ // this.endpoint = dp.getStringProperty("endpoint");
+ // String jvm_args_str = dp.getStringProperty("service_ping_jvm_args", "");
+ // this.ping_class = dp.getStringProperty("service_ping_class");
+ // this.classpath = dp.getStringProperty("service_ping_classpath");
+ // jvm_args = jvm_args_str.split(" ");
+ // this.test_mode = true;
+ // }
/**
@@ -822,14 +823,14 @@ class PingDriver
}
}
- public static void main(String[] args)
- {
- // arg0 = amqurl = put into -Dbroker.url
- // arg1 = endpoint - pass to ServicePingMain
- // call ServicePingMain --class org.apache.uima.ducc.sm.PingTester --endpoint FixedSleepAE_1
- // make sure test.jar is in the classpath
- PingDriver csm = new PingDriver(args[0]);
- csm.run();
- }
+ // public static void main(String[] args)
+ // {
+ // // arg0 = amqurl = put into -Dbroker.url
+ // // arg1 = endpoint - pass to ServicePingMain
+ // // call ServicePingMain --class org.apache.uima.ducc.sm.PingTester --endpoint FixedSleepAE_1
+ // // make sure test.jar is in the classpath
+ // PingDriver csm = new PingDriver(args[0]);
+ // csm.run();
+ // }
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java Tue Feb 25 18:51:32 2014
@@ -28,7 +28,6 @@ import org.apache.uima.ducc.transport.ev
*
* This is a simple class, mostly just a container for the state machine.
*/
-@SuppressWarnings("serial")
class PingOnlyServiceInstance
extends ServiceInstance
{
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java Tue Feb 25 18:51:32 2014
@@ -37,13 +37,14 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.ServiceUnregisterEvent;
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
+import org.apache.uima.ducc.transport.event.sm.IService.ServiceState;
import org.apache.uima.ducc.transport.event.sm.IServiceDescription;
import org.apache.uima.ducc.transport.event.sm.ServiceDependency;
import org.apache.uima.ducc.transport.event.sm.ServiceMap;
-@SuppressWarnings("serial")
+
public class ServiceHandler
implements SmConstants,
Runnable
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java Tue Feb 25 18:51:32 2014
@@ -33,7 +33,7 @@ import org.apache.uima.ducc.transport.ev
*
* This is a simple class, mostly just a container for the state machine.
*/
-@SuppressWarnings("serial")
+
class ServiceInstance
implements SmConstants
{
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java Tue Feb 25 18:51:32 2014
@@ -62,6 +62,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
import org.apache.uima.ducc.transport.event.common.IDuccWorkService;
+import org.apache.uima.ducc.transport.event.sm.IService.Trinary;
import org.apache.uima.ducc.transport.event.sm.ServiceMap;
@@ -80,7 +81,6 @@ public class ServiceManagerComponent
/**
*
*/
- private static final long serialVersionUID = 1L;
private static DuccLogger logger = DuccLogger.getLogger(ServiceManagerComponent.class.getName(), COMPONENT_NAME);
DuccWorkMap localMap = null;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServicePingMain.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServicePingMain.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServicePingMain.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServicePingMain.java Tue Feb 25 18:51:32 2014
@@ -51,7 +51,6 @@ public class ServicePingMain
/**
*
*/
- private static final long serialVersionUID = 1L;
boolean debug = false;
int error_max = 10;
int error_count = 0;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Tue Feb 25 18:51:32 2014
@@ -34,7 +34,6 @@ import java.util.Timer;
import java.util.TimerTask;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.ducc.cli.IServiceApi.RegistrationOption;
import org.apache.uima.ducc.cli.IUiOptions.UiOption;
import org.apache.uima.ducc.cli.UimaAsPing;
import org.apache.uima.ducc.cli.UimaAsServiceMonitor;
@@ -47,6 +46,9 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
+import org.apache.uima.ducc.transport.event.sm.IService.ServiceClass;
+import org.apache.uima.ducc.transport.event.sm.IService.ServiceState;
+import org.apache.uima.ducc.transport.event.sm.IService.ServiceType;
import org.apache.uima.ducc.transport.event.sm.IServiceDescription;
import org.apache.uima.ducc.transport.event.sm.ServiceDescription;
import org.apache.uima.util.Level;
@@ -56,7 +58,6 @@ import org.apache.uima.util.Level;
* Represents the collection of process, jobs, and such that implement a given service.
*/
-@SuppressWarnings("serial")
public class ServiceSet
implements SmConstants
{
@@ -155,7 +156,7 @@ public class ServiceSet
this.props_filename = props_filename;
this.meta_filename = meta_filename;
this.service_state = ServiceState.Stopped;
- this.linger_time = props.getLongProperty(RegistrationOption.ServiceLinger.decode(), linger_time);
+ this.linger_time = props.getLongProperty(UiOption.ServiceLinger.pname(), linger_time);
this.key = meta.getProperty("endpoint");
parseEndpoint(key);
@@ -180,7 +181,7 @@ public class ServiceSet
meta_props.put("service-healthy", "false");
meta_props.put("service-statistics", "N/A");
- if ( (!job_props.containsKey("process_executable")) && (service_type != ServiceType.UimaAs) ) {
+ if ( (!job_props.containsKey(UiOption.ProcessExecutable.pname())) && (service_type != ServiceType.UimaAs) ) {
meta_props.put("ping-only", "true");
this.ping_only = true;
} else {
@@ -334,7 +335,7 @@ public class ServiceSet
private void parseIndependentServices()
{
- String depstr = job_props.getProperty(RegistrationOption.ServiceDependency.decode());
+ String depstr = job_props.getProperty(UiOption.ServiceDependency.pname());
String[] result = null;
if ( depstr != null ) {
@@ -741,7 +742,7 @@ public class ServiceSet
return;
}
- String pingclass = job_props.getStringProperty("service_ping_class", UimaAsPing.class.getName());
+ String pingclass = job_props.getStringProperty(UiOption.ServicePingClass.pname(), UimaAsPing.class.getName());
if ( !pingclass.equals(UimaAsPing.class.getName()) ) {
logger.info(methodName, id, "Deleting unregistered service: not clearing queue because not using the default UIMA-AS pinger:", pingclass, "(", key, ")");
return;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/SmConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/SmConstants.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/SmConstants.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/SmConstants.java Tue Feb 25 18:51:32 2014
@@ -18,82 +18,12 @@
*/
package org.apache.uima.ducc.sm;
-import org.apache.uima.ducc.transport.event.sm.IService;
-
/**
* Constants that are private to SM.
*/
public interface SmConstants
- extends IService
{
// TODO: fold this into IService if we don't find anything else that belongs here.
public final static String COMPONENT_NAME = "SM";
-
-// public enum ServiceEvent
-// {
-// Started, // A service instance started
-// StartFailure, // A service instance failed to start (from OR)
-// Initializing, // OR has recognized it but it's not yet Running
-// Running, // A service instance is successfuly running, according to OR
-// RunFailure, // A service instances failed after successful start
-// PingSuccess, // The service has been happily pung
-// PingFailure, // The pinger is reporting trouble
-// Stopping, // This service is requested to stop but still has active instances or pringer
-// Stopped, // A service instance is fully stopped
-// };
-
- //
- // decode() mean convert the enum into the string the user uses
- // encode() means take the user's string and turn it into th enum
- // description() is a short description of the option for the commons cli parser
- // argname() is a name for the argument for the usage() part of cli parser
- //
- public enum ServicePing
- {
- Arguments {
- public String decode() { return "arguments"; }
- public String description() { return "(Optional) arg string for the pinger."; }
- public String argname() { return "string"; }
- },
-
- Class {
- public String decode() { return "class"; }
- public String description() { return "Class implementing AServicePing to use for the pinger."; }
- public String argname() { return "classname"; }
- },
-
- Endpoint {
- public String decode() { return "endpoint"; }
- public String description() { return "Custom endpoint name, passed to the class in case it cares."; }
- public String argname() { return "string"; }
- },
-
- Port {
- public String decode() { return "port"; }
- public String description() { return "The port of the service manager handler for this custom pinger."; }
- public String argname() { return "integer"; }
- },
-
- Unknown {
- public String decode() { return "unknown"; }
- public String description() { return "Illegal argument"; }
- public String argname() { return "none"; }
- },
- ;
-
- public abstract String decode();
- public abstract String description();
- public abstract String argname();
-
- public static ServicePing encode(String value)
- {
- if ( value.equals("arguments") ) return Arguments;
- if ( value.equals("class") ) return Class;
- if ( value.equals("endpoint") ) return Endpoint;
- if ( value.equals("port") ) return Port;
- return Unknown;
- }
-
- };
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/event/ServiceManagerEventListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/event/ServiceManagerEventListener.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/event/ServiceManagerEventListener.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/event/ServiceManagerEventListener.java Tue Feb 25 18:51:32 2014
@@ -21,7 +21,6 @@ package org.apache.uima.ducc.sm.event;
import org.apache.camel.Body;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.sm.IServiceManager;
-import org.apache.uima.ducc.sm.SmConstants;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
import org.apache.uima.ducc.transport.event.OrchestratorAbbreviatedStateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
@@ -40,21 +39,17 @@ import org.apache.uima.ducc.transport.ev
*
*/
public class ServiceManagerEventListener
- implements DuccEventDelegateListener,
- SmConstants
+ implements DuccEventDelegateListener
{
/**
*
*/
- private static final long serialVersionUID = 1L;
-
-
// private DuccEventDispatcher eventDispatcher;
// private String targetEndpoint;
private IServiceManager serviceManager;
- private static DuccLogger logger = DuccLogger.getLogger(ServiceManagerEventListener.class.getName(), COMPONENT_NAME);
+ private static DuccLogger logger = DuccLogger.getLogger(ServiceManagerEventListener.class.getName(), "SM");
public ServiceManagerEventListener(IServiceManager serviceManager)
{
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java?rev=1571786&r1=1571785&r2=1571786&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java Tue Feb 25 18:51:32 2014
@@ -31,7 +31,8 @@ public interface IService
static final String NULL = "<none>";
//
- // For boolean options, we want a trinary: true, false, unset
+ // For modification of boolean options, we want a trinary: true, false, unset
+ //
public enum Trinary
{
True { public boolean decode() { return true; }},
@@ -40,87 +41,14 @@ public interface IService
;
public abstract boolean decode();
- public static Trinary encode(String value)
- {
- if ( value.equals("true") ) return True;
- if ( value.equals("false") ) return False;
- return Unset;
- }
- };
-
-// public enum ServiceVerb
-// {
-// //
-// // I want to expose these things to the API with the ugly upper-case notation but don't
-// // want that ugliness in the variables, so we have encode and decode routines to do the
-// // correct translation.
-// //
-// Register {
-// public String decode() { return "register"; }
-// public String description() { return "Register a service."; }
-// public String argname() { return "service-DD-specification."; }
-// },
-// Unregister {
-// public String decode() { return "unregister" ; }
-// public String description() { return "Unregister a service." ; }
-// public String argname() { return "service-id-or-endpoint" ; }
-// },
-// Start {
-// public String decode() { return "start"; }
-// public String description() { return "Start a registered service." ; }
-// public String argname() { return "service-id-or-endpoint" ; }
-// },
-// Stop {
-// public String decode() { return "stop"; }
-// public String description() { return "Stop a registered service." ; }
-// public String argname() { return "service-id-or-endpoint [--instances number-to-stop]" ; }
-// },
-// Modify {
-// public String decode() { return "modify"; }
-// public String description() { return "Modify meta properties for a registered service." ; }
-// public String argname() { return "modify-parameters" ; }
-// },
-// Query {
-// public String decode() { return "query"; }
-// public String description() { return "Query registered services." ; }
-// public String argname() { return "none" ; }
-// },
-// Help {
-// public String decode() { return "help"; }
-// public String description() { return "This help message." ; }
-// public String argname() { return "none" ; }
-// },
-// Debug {
-// public String decode() { return "debug"; }
-// public String description() { return "Debug cli" ; }
-// public String argname() { return "none" ; }
-// },
-// Unknown {
-// public String decode() { return "unknown"; }
-// public String description() { return "unknown" ; }
-// public String argname() { return "unknown" ; }
-// },
-// ;
-
-// public abstract String decode();
-// public abstract String description();
-// public abstract String argname();
-
-// public static ServiceVerb encode(String value)
-// {
-// if ( value.equals("register") ) return Register;
-// if ( value.equals("unregister") ) return Unregister;
-// if ( value.equals("start") ) return Start;
-// if ( value.equals("stop") ) return Stop;
-// if ( value.equals("modify") ) return Modify;
-// if ( value.equals("query") ) return Query;
-// if ( value.equals("help") ) return Help;
-// if ( value.equals("debug") ) return Debug;
-// return Unknown;
-// }
-
-// };
+ public static Trinary encode(String value)
+ {
+ if ( value.equals("true") ) return True;
+ if ( value.equals("false") ) return False;
+ return Unset;
+ }
+ };
public enum ServiceType
{