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/02/08 20:31:20 UTC
svn commit: r1444199 - in /uima/sandbox/uima-ducc/trunk/src/main: admin/
scripts/
Author: challngr
Date: Fri Feb 8 19:31:19 2013
New Revision: 1444199
URL: http://svn.apache.org/r1444199
Log:
UIMA-2653
All args passed to the Python CLI are re-quoted before passing them to the
java CLI/API.
Removed:
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_service_cancel
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_service_submit
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_cancel
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_monitor
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_perf_stats
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_cancel
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_submit
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_reserve
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_services
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_submit
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_unreserve
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_viewperf
uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_web
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Fri Feb 8 19:31:19 2013
@@ -694,6 +694,17 @@ class DuccUtil:
return p + "/" + file
return None
+ def mkargs(self, args):
+ '''
+ The cli needs to insure all args are fully quoted so the shell doesn't
+ lose the proper tokenization. This quotes everything.
+ '''
+ answer = []
+ for a in args:
+ arg = '"' + a + '"'
+ answer.append(arg)
+ return answer
+
#
# Read the nodefile, recursing into 'imports' if needed, returning a
# map. The map is keyed on filename, with each entry a list of the nodes.
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_cancel
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_cancel?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_cancel (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_cancel Fri Feb 8 19:31:19 2013
@@ -27,7 +27,7 @@ from ducc_util import DuccUtil
class DuccCancel(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-cancel.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-cancel.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
cancel = DuccCancel()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_monitor
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_monitor?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_monitor (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_monitor Fri Feb 8 19:31:19 2013
@@ -27,7 +27,7 @@ from ducc_util import DuccUtil
class DuccMonitor(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-monitor.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-monitor.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
mon = DuccMonitor()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_perf_stats
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_perf_stats?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_perf_stats (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_perf_stats Fri Feb 8 19:31:19 2013
@@ -27,7 +27,7 @@ from ducc_util import DuccUtil
class DuccPerfStats(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-perf-stats.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-perf-stats.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
cancel = DuccPerfStats()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_cancel
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_cancel?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_cancel (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_cancel Fri Feb 8 19:31:19 2013
@@ -28,7 +28,7 @@ from ducc_util import DuccUtil
class DuccProcessCancel(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-process-cancel.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-process-cancel.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
cancel = DuccProcessCancel()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_submit
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_submit?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_submit (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_process_submit Fri Feb 8 19:31:19 2013
@@ -31,7 +31,7 @@ from ducc_util import DuccUtil
class DuccProcessSubmit(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-process-submit.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-process-submit.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
submit = DuccProcessSubmit()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_reserve
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_reserve?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_reserve (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_reserve Fri Feb 8 19:31:19 2013
@@ -28,7 +28,7 @@ from ducc_util import DuccUtil
class DuccReserve(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-reserve.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-reserve.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
res = DuccReserve()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_services
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_services?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_services (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_services Fri Feb 8 19:31:19 2013
@@ -29,18 +29,8 @@ from ducc_util import DuccUtil
class DuccServices(DuccUtil):
- def main(self, argv):
-
- if ( len(argv) > 0 ):
- if ( argv[0] == '--submit' ):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-service-submit.jar', ' '.join(argv[1:]))
- return
-
- if ( argv[0] == '--cancel' ):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-service-cancel.jar', ' '.join(argv[1:]))
- return
-
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-services.jar', ' '.join(argv))
+ def main(self, argv):
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-services.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
svc = DuccServices()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_submit
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_submit?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_submit (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_submit Fri Feb 8 19:31:19 2013
@@ -31,7 +31,7 @@ from ducc_util import DuccUtil
class DuccSubmit(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-submit.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-submit.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
submit = DuccSubmit()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_unreserve
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_unreserve?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_unreserve (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_unreserve Fri Feb 8 19:31:19 2013
@@ -28,7 +28,7 @@ from ducc_util import DuccUtil
class DuccUnReserve(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-unreserve.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-unreserve.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
unres = DuccUnReserve()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_viewperf
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_viewperf?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_viewperf (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_viewperf Fri Feb 8 19:31:19 2013
@@ -29,7 +29,7 @@ from ducc_util import DuccUtil
class DuccViewperf(DuccUtil):
def main(self, argv):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-viewperf.jar', ' '.join(argv))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-viewperf.jar', ' '.join(self.mkargs(argv)))
if __name__ == "__main__":
perf = DuccViewperf()
Modified: uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_web
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_web?rev=1444199&r1=1444198&r2=1444199&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_web (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/scripts/ducc_web Fri Feb 8 19:31:19 2013
@@ -34,12 +34,13 @@ class DuccWeb(DuccUtil):
print " --qr or --query-reservations";
def main(self, argv):
+ args = self.mkargs(argv)
if ( len(argv) > 0 ):
if ( argv[0] == '--qm' or argv[0] == '--query-machines'):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-web-query-machines.jar', ' '.join(argv[1:]))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-web-query-machines.jar', ' '.join(args))
return
if ( argv[0] == '--qr' or argv[0] == '--query-reservations' ):
- self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-web-query-reservations.jar', ' '.join(argv[1:]))
+ self.spawn(self.java(), '-jar', self.DUCC_HOME + '/lib/uima-ducc-web-query-reservations.jar', ' '.join(args))
return
self.syntax();
else: