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/03 20:35:49 UTC
svn commit: r1564022 [5/5] - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/
uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/servi...
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=1564022&r1=1564021&r2=1564022&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 Mon Feb 3 19:35:48 2014
@@ -29,6 +29,20 @@ public interface SmConstants
// 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
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceModifyEvent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceModifyEvent.java?rev=1564022&r1=1564021&r2=1564022&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceModifyEvent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceModifyEvent.java Mon Feb 3 19:35:48 2014
@@ -18,7 +18,7 @@
*/
package org.apache.uima.ducc.transport.event;
-import org.apache.uima.ducc.transport.event.sm.IService.Trinary;
+import org.apache.uima.ducc.common.utils.DuccProperties;
@SuppressWarnings("serial")
public class ServiceModifyEvent
@@ -26,45 +26,66 @@ public class ServiceModifyEvent
{
private long friendly; // the "friendly" part of a DuccId
private String epname;
- private int instances; // 0 ==> don't modify instances
- private Trinary autostart;
- private boolean activate;
+ // private int instances; // 0 ==> don't modify instances
+ // private Trinary autostart;
+ // private boolean activate;
+ // private String pingClass;
- public ServiceModifyEvent(String user, long friendly, String epname, byte[] auth_block)
+ private DuccProperties props;
+
+ public ServiceModifyEvent(String user, long friendly, String epname, DuccProperties props, byte[] auth_block)
{
super(EventType.SERVICE_STOP, user, auth_block);
this.friendly = friendly;
this.epname = epname;
- this.instances = -1; // default, instances aren't changed
- this.autostart = Trinary.Unset;
- this.activate = false;
+ this.props = props;
+ // this.instances = -1; // default, instances aren't changed
+ // this.autostart = Trinary.Unset;
+ // this.activate = false;
+ // this.pingClass = null;
}
- public void setInstances(int instances) {
- this.instances = instances;
+ public DuccProperties getProperties()
+ {
+ return props;
}
- public int getInstances() {
- return instances;
- }
- public void setAutostart(Trinary autostart) {
- this.autostart = autostart;
- }
+ // public void setInstances(int instances) {
+ // this.instances = instances;
+ // }
- public Trinary getAutostart() {
- return autostart;
- }
+ // public int getInstances() {
+ // return instances;
+ // }
- public void setActivate(boolean activate)
- {
- this.activate = activate;
- }
+ // public void setAutostart(Trinary autostart) {
+ // this.autostart = autostart;
+ // }
- public boolean getActivate()
- {
- return activate;
- }
+ // public Trinary getAutostart() {
+ // return autostart;
+ // }
+
+ // public void setPingClass(String cl)
+ // {
+ // this.pingClass = cl;
+ // }
+
+ // public String getPingClass()
+ // {
+ // return this.pingClass;
+ // }
+
+ // public void setActivate(boolean activate)
+ // {
+ // this.activate = activate;
+ // }
+
+ // public boolean getActivate()
+ // {
+ // return activate;
+ // }
public long getFriendly() {
return friendly;
@@ -81,9 +102,7 @@ public class ServiceModifyEvent
@Override
public String toString() {
- return "ServiceModifyEvent [friendly=" + friendly + ", user=" + user + ", instances=" + instances
- + ", autostart=" + autostart + ", activate=" + activate
- + "]";
+ return "ServiceModifyEvent [friendly=" + friendly + ", user=" + user + "]";
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceRegisterEvent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceRegisterEvent.java?rev=1564022&r1=1564021&r2=1564022&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceRegisterEvent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceRegisterEvent.java Mon Feb 3 19:35:48 2014
@@ -61,8 +61,7 @@ public class ServiceRegisterEvent
@Override
public String toString() {
return "ServiceRegisterEvent [ninstances=" + ninstances + ", autostart=" + autostart + ", endpoint="
- + endpoint + ", user=" + user + ", service_descriptor="
- + descriptor + "]";
+ + endpoint + ", user=" + user + "]";
}
}