Changeset 33004 for main

Timestamp:

2019-04-09T17:24:00+12:00 (5 years ago)

Author:

ak19

Message:

Same as previous commit which I should have also added to the key force-start-tomcat target instead of just the debug-(force-)start-tomcat. Previous commit message: Recently GS3 tomcat failed to start on windows in a path containing spacse. Kathy discovered the cause was in catalina.opts property being set to contain a catanloup.config filepath that wasn't bookended by quotes. There are some further problems with catalina.opts property line, which I will fix and test incrementally and commit. This commit contains the minimal needed to fix GS3 tomcat server startup on windows.

File:

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

main/trunk/greenstone3/build.xml

@@ -2416 +2416 @@
     <if><bool>
     <isset property="fedora.maxpermsize"/></bool>
-      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=${basedir}/cantaloupe.properties ${readonly.catalina.opts} ${fedora.maxpermsize}"/>
+      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts} ${fedora.maxpermsize}"/>
       <else>
-    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=${basedir}/cantaloupe.properties ${readonly.catalina.opts}"/>
+    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx800M -Dcantaloupe.config=&quot;${basedir}/cantaloupe.properties&quot; ${readonly.catalina.opts}"/>
       </else>
     </if>