Changeset 36583 for main/trunk/greenstone3/build.xml

Timestamp:

2022-09-06T17:35:33+12:00 (20 months ago)

Author:

davidb

Message:

Need a more carefully constructed way of starting Tomcat with _RUNJAVA specifying xvfb-run-java (when required), but also stopping Tomcat with a regular java (i.e., not the xvfb-run-java version. Solution take is to have gs3-setup.sh set an enviroment variable for this, when bash-script confirms xvfb-run-java is needed

File:

• main/trunk/greenstone3/build.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -2768 +2768 @@
       <env key="WNHOME" path="${wn.home}"/>
       <env key="FEDORA_HOME" path="${fedora.home}"/>
+
+      <env key="_RUNJAVA" value="${env.CATALINA_START_RUNJAVA}"/>
       <arg value="${catalina.home}/bin/startup.sh"/>
     </exec>