Changeset 32437 for main/trunk/greenstone3

Timestamp:

2018-09-10T17:52:23+12:00 (6 years ago)

Author:

ak19

Message:

On windows, need to do a little more work to stop tomcat when we run it on port 80 for https certification: need to set local.http.url to the base url over port 80 before calling ant stop and ant start, because the local.http.url is what's used to check whether tomcat is already running or stopped.

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -1736 +1736 @@
         <param name="localhost.port.http" value="80"/>
         <param name="default.tomcat.port" value="80"/>
+        <param name="local.http.url" value="http://${localhost.server.http}"/><!-- For port 80 over http, leave out port number in URL -->
         <param name="http.address.restriction" value=""/><!-- don't prevent public access over http of port 80 -->
         <param name="https.comment.out.start" value="${comment.start}"/>
@@ -1776 +1777 @@
         <param name="localhost.port.http" value="80"/>
         <param name="default.tomcat.port" value="80"/>
+        <param name="local.http.url" value="http://${localhost.server.http}"/><!-- For port 80 over http, leave out port number in URL -->
         <param name="http.address.restriction" value=""/>
         <param name="https.comment.out.start" value="${comment.start}"/>