Author: degenaro
Date: Wed Jun 15 13:45:40 2016
New Revision: 1748581
URL: http://svn.apache.org/viewvc?rev=1748581&view=rev
Log:
UIMA-4974 DUCC Orchestrator (OR) remove abbreviated state publication remnants
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_install
uima/uima-ducc/trunk/uima-ducc-cli/ (props changed)
uima/uima-ducc/trunk/uima-ducc-cli/src/test/scripts/test_api.py
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
uima/uima-ducc/trunk/uima-ducc-database/ (props changed)
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_install
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_install?rev=1748581&r1=1748580&r2=1748581&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_install (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_install Wed Jun 15 13:45:40 2016
@@ -441,9 +441,6 @@ print " NOTE - if your ducc_ling is
#orchestrator.state.update.endpoint=ducc.orchestrator.state
#orchestrator.state.update.endpoint.type=topic
#orchestrator.state.publish.rate=10000
-#orchestrator.abbreviated.state.update.endpoint=ducc.orchestrator.abbreviated.state
-#orchestrator.abbreviated.state.update.endpoint.type=topic
-#orchestrator.abbreviated.state.publish.rate=10000
#orchestrator.maintenance.rate=60000
#orchestrator.http.port=19988
#orchestrator.http.node=${ducc.head}
Propchange: uima/uima-ducc/trunk/uima-ducc-cli/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 15 13:45:40 2016
@@ -2,3 +2,5 @@
target
.classpath
.project
+
+.pydevproject
Modified: uima/uima-ducc/trunk/uima-ducc-cli/src/test/scripts/test_api.py
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/test/scripts/test_api.py?rev=1748581&r1=1748580&r2=1748581&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-cli/src/test/scripts/test_api.py (original)
+++ uima/uima-ducc/trunk/uima-ducc-cli/src/test/scripts/test_api.py Wed Jun 15
13:45:40 2016
@@ -36,7 +36,6 @@ import subprocess
# ducc.sm.meta.ping.rate 10000
# ducc.sm.default.linger 15000
# ducc.orchestrator.state.publish.rate 10000
-# ducc.orchestrator.abbreviated.state.publish.rate 10000
# ducc.rm.state.publish.ratio 1
# ducc.agent.node.metrics.publish.rate 10000
# ducc.agent.node.inventory.publish.rate 10000
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1748581&r1=1748580&r2=1748581&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
Wed Jun 15 13:45:40 2016
@@ -163,7 +163,6 @@ public class DuccPropertiesResolver {
public static final String ducc_rm_node_stability =
"ducc.rm.node.stability";
public static final String ducc_agent_node_metrics_publish_rate =
"ducc.agent.node.metrics.publish.rate";
public static final String ducc_rm_state_publish_rate =
"ducc.rm.state.publish.rate";
- public static final String
ducc_orchestrator_abbreviated_state_publish_rate =
"ducc.orchestrator.abbreviated.state.publish.rate";
public static final String ducc_agent_node_inventory_publish_rate
="ducc.agent.node.inventory.publish.rate";
public static final String ducc_agent_node_inventory_publish_rate_skip
="ducc.agent.node.inventory.publish.rate.skip";
Propchange: uima/uima-ducc/trunk/uima-ducc-database/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 15 13:45:40 2016
@@ -3,3 +3,5 @@ target
.classpath
.project
+
+.pydevproject
