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/08/14 23:05:51 UTC
svn commit: r1618053 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/
Author: challngr
Date: Thu Aug 14 21:05:51 2014
New Revision: 1618053
URL: http://svn.apache.org/r1618053
Log:
UIMA-3988 SM Update query.
Modified:
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-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java
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=1618053&r1=1618052&r2=1618053&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 Thu Aug 14 21:05:51 2014
@@ -1938,6 +1938,11 @@ public class ServiceSet
sd.setLinger(linger_time);
sd.setId(id);
sd.setUser(user);
+ sd.setDisableReason(meta_props.getStringProperty("disable-reason", null));
+ sd.setLastUse(last_use);
+ sd.setRegistrationDate(meta_props.getStringProperty("registration-date", ""));
+ sd.setReferenceStart(reference_start);
+ sd.setErrorString(meta_props.getStringProperty("submit-error", null));
if ( serviceMeta != null ) {
sd.setQueueStatistics(serviceMeta.getServiceStatistics());
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.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/IServiceDescription.java?rev=1618053&r1=1618052&r2=1618053&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java Thu Aug 14 21:05:51 2014
@@ -127,8 +127,25 @@ public interface IServiceDescription
* Internal to DUCC.
*/
public void setAutostart(boolean autostart);
+ public boolean isAutostart();
+
+ public void setReferenceStart(boolean ref);
+ public boolean isReferenceStart();
public boolean isEnabled();
+ public void setDisableReason(String r);
+ public String getDisableReason();
+
+ public void setLastUse(long last_use);
+ public long getLastUse();
+ public String getLastUseString();
+
+ public void setRegistrationDate(String d);
+ public String getRegistrationDate();
+
+ public String getErrorString();
+ public void setErrorString(String s);
+
/**
* Internal to DUCC.
*/
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.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/ServiceDescription.java?rev=1618053&r1=1618052&r2=1618053&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java Thu Aug 14 21:05:51 2014
@@ -19,6 +19,7 @@
package org.apache.uima.ducc.transport.event.sm;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -66,6 +67,7 @@ public class ServiceDescription
// enabled?
private boolean enabled = true;
+ private String disable_reason = null;
// for submitted service, the registered service id
private ADuccId id;
@@ -80,6 +82,12 @@ public class ServiceDescription
private IServiceStatistics qstats;
+ private String error_string = null;
+ private long last_use = 0;
+
+ private String registration_date = null;
+ private boolean reference_start = true;
+
public ADuccId getId() {
return id;
}
@@ -202,6 +210,65 @@ public class ServiceDescription
this.enabled = enabled;
}
+ public String getDisableReason()
+ {
+ return disable_reason;
+ }
+
+ public void setDisableReason(String s)
+ {
+ this.disable_reason = s;
+ }
+
+ public void setErrorString(String s)
+ {
+ this.error_string = s;
+ }
+
+ public String getErrorString()
+ {
+ return error_string;
+ }
+
+ public void setLastUse(long l)
+ {
+ this.last_use = l;
+ }
+
+ public long getLastUse()
+ {
+ return this.last_use;
+ }
+
+ public String getLastUseString()
+ {
+ if ( last_use == 0) {
+ return "N/A";
+ } else {
+ return (new Date(last_use)).toString();
+ }
+ }
+
+ public void setRegistrationDate(String s)
+ {
+ this.registration_date = s;
+ }
+
+ public String getRegistrationDate()
+ {
+ return this.registration_date;
+ }
+
+ public void setReferenceStart(boolean b)
+ {
+ this.reference_start = b;
+ }
+
+ public boolean isReferenceStart()
+ {
+ return this.reference_start;
+ }
+
public IServiceStatistics getQstats() {
return qstats;
}
@@ -325,20 +392,40 @@ public class ServiceDescription
sb.append(active);
sb.append("\n");
- sb.append(" Autostart : ");
- sb.append(autostart);
- sb.append("\n");
+ sb.append(" Start Mode : ");
+ if ( autostart ) { sb.append("autostart"); }
+ else if ( reference_start ) { sb.append("reference"); }
+ else { sb.append("manual"); }
- sb.append(" Enabled : ");
- sb.append(enabled);
+ if ( enabled ) {
+ sb.append(", Enabled");
+ } else {
+ sb.append(", Disabled; reason: ");
+ sb.append(disable_reason);
+ }
sb.append("\n");
+ sb.append(" Last Use : ");
+ sb.append(getLastUseString());
+ sb.append("\n");
+
+ sb.append(" Registration Date : ");
+ sb.append(registration_date);
+ sb.append("\n");
+
+ if ( error_string != null ) {
+ sb.append(" Errors : ");
+ sb.append(error_string);
+ sb.append("\n");
+ }
+
sb.append(" Service Statistics: ");
if ( qstats == null ) {
sb.append("None\n");
} else {
sb.append("\n ");
sb.append(qstats.toString());
+ sb.append("\n");
}
return sb.toString();
}