You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/08/30 13:41:12 UTC
svn commit: r1758390 - in /uima/uima-ducc/trunk: src/main/admin/
src/main/resources/
uima-ducc-container/src/test/resources/ducc_runtime/resources/
uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/
Author: degenaro
Date: Tue Aug 30 13:41:12 2016
New Revision: 1758390
URL: http://svn.apache.org/viewvc?rev=1758390&view=rev
Log:
UIMA-5059 DUCC WebServer (WS) no longer employs JSP compilation directory with modern Jetty
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc.py
uima/uima-ducc/trunk/src/main/resources/default.ducc.properties
uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties
Modified: uima/uima-ducc/trunk/src/main/admin/ducc.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc.py?rev=1758390&r1=1758389&r2=1758390&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc.py (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc.py Tue Aug 30 13:41:12 2016
@@ -198,14 +198,6 @@ class Ducc(DuccUtil):
self.prepend_classpath(ducc_home + '/lib/cassandra/*')
if ( c == 'ws' ):
- #see if the ws jsp compilation directory is specified
- compdir = self.ducc_properties.get('ducc.ws.jsp.compilation.directory')
-
- if ( compdir != None ):
- os.system("rm -rf %s" % compdir)
- os.makedirs(compdir)
- jvm_opts.append('-Djava.io.tmpdir=' + compdir)
-
here = os.getcwd()
os.chdir(self.DUCC_HOME + '/webserver')
if ( self.ws_jvm_args != None ):
Modified: uima/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=1758390&r1=1758389&r2=1758390&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/resources/default.ducc.properties (original)
+++ uima/uima-ducc/trunk/src/main/resources/default.ducc.properties Tue Aug 30 13:41:12 2016
@@ -293,10 +293,6 @@ ducc.ws.automatic.cancel.minutes = 5
# history entries for each of Jobs/Reservations/Services
ducc.ws.max.history.entries = 4096
-# Specify the ducc Web Server jsp compilation directory
-# Note: This directory is removed then recreated on each Web Server restart
-ducc.ws.jsp.compilation.directory = /tmp/ducc/jsp
-
# Specify login enabled (default is true)
ducc.ws.login.enabled = false
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties?rev=1758390&r1=1758389&r2=1758390&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties Tue Aug 30 13:41:12 2016
@@ -188,9 +188,6 @@ ducc.ws.automatic.cancel.minutes = 5
# Optionally configure the webserver max history entries for each of Jobs/Reservations/Services
ducc.ws.max.history.entries = 4096
-# Specify the ducc jsp comp dir
-ducc.ws.jsp.compilation.directory = /tmp/ducc/jsp
-
# OVERRIDE by merger Thu Jul 23 14:28:36 2015 old value: false
ducc.ws.login.enabled = true
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties?rev=1758390&r1=1758389&r2=1758390&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties Tue Aug 30 13:41:12 2016
@@ -168,9 +168,6 @@ ducc.ws.automatic.cancel.minutes = 5
# Optionally configure the webserver max history entries for each of Jobs/Reservations/Services
ducc.ws.max.history.entries = 4096
-# Specify the ducc jsp comp dir
-ducc.ws.jsp.compilation.directory = /tmp/ducc/jsp
-
# OVERRIDE by merger Fri Sep 11 17:17:08 2015 old value: false
ducc.ws.login.enabled = true