You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/12/12 21:24:11 UTC
svn commit: r1550513 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts: prepare
reg_service runducc service start_sim stop_sim
Author: burn
Date: Thu Dec 12 20:24:10 2013
New Revision: 1550513
URL: http://svn.apache.org/r1550513
Log:
UIMA-3497 Make nested scripts get DUCC_HOME from their location
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/prepare
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
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/service
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/stop_sim
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/prepare
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/prepare?rev=1550513&r1=1550512&r2=1550513&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/prepare (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/prepare Thu Dec 12 20:24:10 2013
@@ -45,8 +45,8 @@ import sys
import getopt
import random
-os.environ['DUCC_HOME'] = os.path.abspath('../..')
-sys.path.append(os.environ['DUCC_HOME'] + '/admin')
+DUCC_HOME = os.path.abspath(__file__ + '/../../..')
+sys.path.append(DUCC_HOME + '/admin')
from ducc_util import DuccUtil
from ducc_util import DuccProperties
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=1550513&r1=1550512&r2=1550513&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 Dec 12 20:24:10 2013
@@ -22,8 +22,9 @@ import sys
import os
import getopt
-os.environ['DUCC_HOME'] = os.path.abspath('../..')
-sys.path.append(os.environ['DUCC_HOME'] + '/admin')
+#designed to run only here, relative to ducc_runtime
+DUCC_HOME = os.path.abspath(__file__ + '/../../..')
+sys.path.append(DUCC_HOME + '/admin')
from ducc_util import DuccUtil
from ducc_util import DuccProperties
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=1550513&r1=1550512&r2=1550513&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 Thu Dec 12 20:24:10 2013
@@ -39,7 +39,8 @@ import signal
from threading import *
import Queue
-os.environ['DUCC_HOME'] = os.path.abspath('../..')
+DUCC_HOME = os.path.abspath(__file__ + '/../../..')
+sys.path.append(DUCC_HOME + '/admin')
sys.path.append(os.environ['DUCC_HOME'] + '/admin')
@@ -52,7 +53,7 @@ class DuccProcess(Thread):
Thread.__init__(self)
self.runner = runner
self.jobfile = jobfile
- self.DUCC_HOME = os.environ['DUCC_HOME']
+ self.DUCC_HOME = DUCC_HOME
#
# read file and get nthreads, memory, class
@@ -208,7 +209,7 @@ class DuccProcess(Thread):
print 'jvm_driver_args', jvm_driver_args
print 'jvm_process_args', jvm_process_args
- CMD = 'java'
+ CMD = os.environ['JAVA_HOME'] + '/bin/java'
CMD = CMD + ' ' + self.runner.submit_package + '.cli.DuccJobSubmit'
CMD = CMD + ' --description ' + description + '[' + self.runner.style + ']'
@@ -530,7 +531,7 @@ class RunDucc(DuccUtil):
print ' -y'
print ' Error probability during initialation, int, 0:100', self.init_error
print ''
- print 'We run with DUCC_HOME set to', os.environ['DUCC_HOME']
+ print 'We run with DUCC_HOME set to', self.DUCC_HOME
sys.exit(1)
def main(self, argv):
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/service
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/service?rev=1550513&r1=1550512&r2=1550513&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/service (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/service Thu Dec 12 20:24:10 2013
@@ -35,8 +35,9 @@ import signal
#from threading import *
#import Queue
-os.environ['DUCC_HOME'] = os.path.abspath('../..')
-sys.path.append(os.environ['DUCC_HOME'] + '/admin')
+#designed to run only here, relative to ducc_runtime
+DUCC_HOME = os.path.abspath(__file__ + '/../../..')
+sys.path.append(DUCC_HOME + '/admin')
from ducc_util import DuccUtil
from ducc_util import DuccProperties
@@ -69,7 +70,6 @@ class DuccService(DuccUtil):
print 'broker:', self.broker_url
- DUCC_HOME = os.environ['DUCC_HOME']
CMD = ['java']
CMD.append("-DSERVICE_ID=" + instance)
CMD.append("-DdefaultBrokerURL='" + self.broker_url + "'")
@@ -105,7 +105,7 @@ class DuccService(DuccUtil):
print 'Where options are'
print ' -i instance_number'
print ''
- print 'We run with DUCC_HOME set to', os.environ['DUCC_HOME']
+ print 'We run with DUCC_HOME set to', self.DUCC_HOME
sys.exit(1)
def main(self, argv):
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim?rev=1550513&r1=1550512&r2=1550513&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim Thu Dec 12 20:24:10 2013
@@ -36,8 +36,8 @@ from threading import *
import Queue
#designed to run only here, relative to ducc_runtime
-os.environ['DUCC_HOME'] = os.path.abspath(sys.argv[0] + '/../../..')
-sys.path.append(os.environ['DUCC_HOME'] + '/admin')
+DUCC_HOME = os.path.abspath(__file__ + '/../../..')
+sys.path.append(DUCC_HOME + '/admin')
from ducc_util import DuccUtil
from ducc_util import DuccProperties
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/stop_sim
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/stop_sim?rev=1550513&r1=1550512&r2=1550513&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/stop_sim (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/stop_sim Thu Dec 12 20:24:10 2013
@@ -25,10 +25,7 @@ import os
import sys
import time
-if ( not os.environ.has_key('DUCC_HOME') ):
- os.environ['DUCC_HOME'] = os.path.abspath('../..')
-
-DUCC_HOME=os.environ['DUCC_HOME']
+DUCC_HOME = os.path.abspath(__file__ + '/../../..')
sys.path.append(DUCC_HOME + '/admin')
import getopt