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/10/03 22:16:31 UTC

svn commit: r1528994 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main: resources/sleepjobs/1.dd.job resources/sleepjobs/1.job resources/sleepjobs/2.job scripts/reg_service

Author: challngr
Date: Thu Oct  3 20:16:31 2013
New Revision: 1528994

URL: http://svn.apache.org/r1528994
Log:
UIMA-3312 Get rid of process_ prefixes for classpath and environment.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
    uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
    uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
    uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/reg_service

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job?rev=1528994&r1=1528993&r2=1528994&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job Thu Oct  3 20:16:31 2013
@@ -1,14 +1,12 @@
 description               Test DD Job 1
 
-driver_classpath          ../lib/uima-ducc-examples.jar
+classpath                 ../lib/uima-ducc-examples.jar
 driver_descriptor_CR      org.apache.uima.ducc.test.randomsleep.FixedSleepCR
 driver_descriptor_CR_overrides jobfile:1.inputs,compression:10,error_rate:0.0
 driver_jvm_args           -Xmx500M
-driver_environment        LD_LIBRARY_PATH=/a/other/bogus/path DUCC_LD_LIBRARY_PATH=/a/other/bogus/path
 
 process_DD                org.apache.uima.ducc.test.ddjob.DDSleepDescriptor
-process_environment       AE_INIT_TIME=10000 AE_INIT_RANGE=1000 INIT_ERROR=0 LD_LIBRARY_PATH=/a/bogus/path DUCC_LD_LIBRARY_PATH=/a/bogus/path
-process_classpath         ../lib/uima-ducc-examples.jar
+environment               AE_INIT_TIME=10000 AE_INIT_RANGE=1000 INIT_ERROR=0 LD_LIBRARY_PATH=/a/bogus/path DUCC_LD_LIBRARY_PATH=/a/bogus/path
 process_jvm_args          -Xmx100M
 
 scheduling_class          normal

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job?rev=1528994&r1=1528993&r2=1528994&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job Thu Oct  3 20:16:31 2013
@@ -1,18 +1,16 @@
 description                    Test job 1
 
-driver_classpath               ../lib/uima-ducc-examples.jar
 driver_descriptor_CR           org.apache.uima.ducc.test.randomsleep.FixedSleepCR
 driver_descriptor_CR_overrides jobfile:1.inputs,compression:10,error_rate:0.0
 driver_jvm_args                -Xmx500M
-driver_environment             LD_LIBRARY_PATH=/a/nother/bogus/path
 
 process_descriptor_AE          org.apache.uima.ducc.test.randomsleep.FixedSleepAE
 process_memory_size            2
-process_classpath              ../lib/uima-ducc-examples.jar
+classpath                      ../lib/uima-ducc-examples.jar
 process_jvm_args               -Xmx100M 
 process_thread_count           2
 process_per_item_time_max      5
-process_environment            AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path
+environment                    AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path
 process_deployments_max        999
 
 scheduling_class               normal

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job?rev=1528994&r1=1528993&r2=1528994&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job Thu Oct  3 20:16:31 2013
@@ -1,18 +1,16 @@
 description                    Test job 2
 
-driver_classpath               ../lib/uima-ducc-examples.jar
 driver_descriptor_CR           org.apache.uima.ducc.test.randomsleep.FixedSleepCR
 driver_descriptor_CR_overrides jobfile:2.inputs,compression:1,error_rate:0.0
 driver_jvm_args                -Xmx500M
-driver_environment             LD_LIBRARY_PATH=/a/nother/bogus/path
 
 process_descriptor_AE          org.apache.uima.ducc.test.randomsleep.FixedSleepAE
 process_memory_size            2
-process_classpath              ../lib/uima-ducc-examples.jar
+classpath                      ../lib/uima-ducc-examples.jar
 process_jvm_args               -Xmx16G
 process_thread_count           2
 process_per_item_time_max      5
-process_environment            AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path PROCESS_BLOAT=10
+environment                    AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path PROCESS_BLOAT=10
 process_deployments_max        999
 
 scheduling_class               normal

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=1528994&r1=1528993&r2=1528994&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 Thu Oct  3 20:16:31 2013
@@ -108,7 +108,7 @@ class RegService(DuccUtil):
             props.write(outfile)
             print outfile, 'created.'
         
-        CMD = self.java() + ' -jar ' + self.DUCC_HOME + '/lib/uima-ducc-services.jar --register --instances ' + str(instances)
+        CMD = ' '.join((self.DUCC_HOME + '/bin/ducc_services', '--register', '--instances', str(instances)))
         for (k, v) in props.items():
             CMD = CMD + ' --' + k + " '" + v + "'"
         print CMD