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 2013/01/30 20:21:12 UTC
svn commit: r1440595 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/
Author: challngr
Date: Wed Jan 30 19:21:12 2013
New Revision: 1440595
URL: http://svn.apache.org/viewvc?rev=1440595&view=rev
Log:
UIMA-2624
Pick up autostart in CLI and pass to SM to save in service meta properties.
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-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/ServiceRegisterEvent.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=1440595&r1=1440594&r2=1440595&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 Wed Jan 30 19:21:12 2013
@@ -629,7 +629,7 @@ public class DuccServiceApi
* @param props Name of file in standard Java properies format with the service specification.
* @return
*/
- public ServiceReplyEvent register(DuccProperties service_props, int instances)
+ public ServiceReplyEvent register(DuccProperties service_props, int instances, Trinary autostart)
throws Exception
{
//
@@ -711,7 +711,7 @@ public class DuccServiceApi
//
// DuccEventDispatcher dispatcher = connect();
- ServiceRegisterEvent ev = new ServiceRegisterEvent(DuccUiUtilities.getUser(), instances, endpoint, service_props);
+ ServiceRegisterEvent ev = new ServiceRegisterEvent(DuccUiUtilities.getUser(), instances, autostart, endpoint, service_props);
ServiceReplyEvent reply = null;
try {
@@ -942,7 +942,8 @@ public class DuccServiceApi
case Register:
props = getPropsFile(commandLine);
instances = getInstances(commandLine, "1");
- reply = register(props, instances);
+ autostart = getAutostart(commandLine);
+ reply = register(props, instances, autostart);
break;
case Unregister:
id = getId(commandLine, verb);
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=1440595&r1=1440594&r2=1440595&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 Wed Jan 30 19:21:12 2013
@@ -682,6 +682,7 @@ public class ServiceManagerComponent
DuccProperties props = ev.getDescriptor();
String endpoint = ev.getEndpoint();
int instances = ev.getNinstances();
+ Trinary autostart = ev.getAutostart();
String user = ev.getUser();
@@ -702,6 +703,11 @@ public class ServiceManagerComponent
meta.setProperty("endpoint", endpoint);
meta.setProperty("numeric_id", id.toString());
meta.setProperty("uuid", id.getUnique());
+ if ( autostart == Trinary.True ) {
+ meta.setProperty("autostart", "true");
+ } else {
+ meta.setProperty("autostart", "false");
+ }
String desc_name = descriptor_dir + "/" + id + ".svc";
String meta_name = descriptor_dir + "/" + id + ".meta";
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=1440595&r1=1440594&r2=1440595&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 Wed Jan 30 19:21:12 2013
@@ -26,15 +26,17 @@ public class ServiceRegisterEvent
{
private int ninstances;
+ private Trinary autostart;
private String endpoint;
private String user;
private DuccProperties descriptor;
- public ServiceRegisterEvent(String user, int ninstances, String endpoint, DuccProperties descriptor)
+ public ServiceRegisterEvent(String user, int ninstances, Trinary autostart, String endpoint, DuccProperties descriptor)
{
super(EventType.SERVICE_REGISTER);
this.user = user;
this.ninstances = ninstances;
+ this.autostart = autostart;
this.endpoint = endpoint;
this.descriptor = descriptor;
}
@@ -43,6 +45,9 @@ public class ServiceRegisterEvent
return ninstances;
}
+ public Trinary getAutostart() {
+ return autostart;
+ }
public String getEndpoint() {
return endpoint;
@@ -61,7 +66,7 @@ public class ServiceRegisterEvent
@Override
public String toString() {
- return "ServiceRegisterEvent [ninstances=" + ninstances + ", endpoint="
+ return "ServiceRegisterEvent [ninstances=" + ninstances + ", autostart=" + autostart + ", endpoint="
+ endpoint + ", user=" + user + ", service_descriptor="
+ descriptor + "]";
}