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 2015/03/16 19:19:07 UTC
svn commit: r1667098 - in /uima/sandbox/uima-ducc/trunk: src/main/assembly/
uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/
uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/
uima-ducc-examples/src/mai...
Author: challngr
Date: Mon Mar 16 18:19:06 2015
New Revision: 1667098
URL: http://svn.apache.org/r1667098
Log:
UIMA-4290 Clean up test scripts and xml.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_0.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_1.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_10.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_11.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_2.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_3.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_4.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_5.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_6.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_7.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_8.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_9.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/reg_service
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Mon Mar 16 18:19:06 2015
@@ -440,6 +440,7 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
<includes>
+ <include>1.dd.job</include>
<include>1.job</include>
<include>1.inputs</include>
</includes>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml Mon Mar 16 18:19:06 2015
@@ -43,7 +43,7 @@
<casMultiplier poolSize="5"/>
</analysisEngine>
- <analysisEngine key="AnalysisEngine">
+ <analysisEngine key="SleepAe">
<scaleout numberOfInstances="4" />
</analysisEngine>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_0.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_0.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_0.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_0.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_0" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_1.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_1.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_1.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_1.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_1" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_10.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_10.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_10.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_10.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_10" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_11.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_11.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_11.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_11.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_11" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_2.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_2.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_2.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_2.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_2" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_3.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_3.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_3.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_3.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_3" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_4.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_4.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_4.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_4.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_4" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_5.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_5.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_5.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_5.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_5" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_6.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_6.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_6.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_6.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_6" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_7.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_7.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_7.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_7.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_7" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_8.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_8.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_8.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_8.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_8" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_9.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_9.xml?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_9.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/service/Service_FixedSleep_9.xml Mon Mar 16 18:19:06 2015
@@ -25,7 +25,7 @@
<version/>
<vendor/>
<deployment protocol="jms" provider="activemq">
- <casPool numberOfCASes="1" initialFsHeapSize="2000000"/>
+ <casPool numberOfCASes="25" initialFsHeapSize="2000000"/>
<service>
<inputQueue endpoint="FixedSleepAE_9" brokerURL="${defaultBrokerURL}" prefetch="0"/>
<topDescriptor>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/reg_service
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/reg_service?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/reg_service (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/reg_service Mon Mar 16 18:19:06 2015
@@ -109,7 +109,7 @@ class RegService(DuccUtil):
plain_broker_url = self.broker_protocol + '://' + self.broker_host + ':' + self.broker_port
props.put('description', description)
- props.put('process_DD', self.DUCC_HOME + '/examples/simple/resources/service/Service_FixedSleep_' + svcid + '.xml')
+ props.put('process_descriptor_DD', self.DUCC_HOME + '/examples/simple/resources/service/Service_FixedSleep_' + svcid + '.xml')
props.put('process_memory_size', '15')
props.put('classpath', self.examples_classpath);
props.put('process_jvm_args', '-DdefaultBrokerURL=' + plain_broker_url)
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc?rev=1667098&r1=1667097&r2=1667098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc Mon Mar 16 18:19:06 2015
@@ -332,8 +332,9 @@ class ServiceStarter(DuccUtil):
props = Properties()
props.put('description', 'Test Service ' + svcid)
- props.put('process_DD', self.DUCC_HOME + '/examples/simple/resources/service/Service_FixedSleep_' + svcid + '.xml')
+ props.put('process_descriptor_DD', self.DUCC_HOME + '/examples/simple/resources/service/Service_FixedSleep_' + svcid + '.xml')
props.put('process_memory_size', '15')
+ props.put('service_linger', '60000')
props.put('classpath', self.runner.examples_classpath);
props.put('process_jvm_args', '-Xmx100M -DdefaultBrokerURL=' + plain_broker_url)