Changeset 32355 for main/trunk/greenstone3

Timestamp:

2018-08-22T18:43:43+12:00 (6 years ago)

Author:

ak19

Message:

Correcting tests for valid ports and associated helpful messages.

File:

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

main/trunk/greenstone3/build.xml

@@ -116 +116 @@
        * propfile:
        https://ant.apache.org/manual/Tasks/propertyfile.html
-       * valid ports range from 1024–49151
+       * "valid ports range from 1024–49151" is probably about user assignable ports.
+       But 80 is a valid port for running web servers including GS
+       and in future the range may become greater, so don't restrict the port range to 1024-49151.
        https://stackoverflow.com/questions/113224/what-is-the-largest-tcp-ip-network-port-number-allowable-for-ipv4
   -->
@@ -123 +125 @@
       <and>
         <isset property="tomcat.port.http"/>
-        <not><matches string="${tomcat.port.http}" pattern="^\d{3,4}\s*$"/></not>
+        <not><matches string="${tomcat.port.http}" pattern="^\d{2,}\s*$"/></not>
       </and>     
       </bool>
       <fail>...
     ********* ERROR: tomcat.port.http in file build.properties is set to an invalid port number.
-    Valid ports range from 1024–49151. But don't choose any port already in use by another application.
+    If port 80 is not possible, user assignable ports range from 1024–49151.
+    But don't choose any port already in use by another application.
     Try setting to tomcat.port.http=8383
       </fail>
@@ -137 +140 @@
       <and>
         <isset property="tomcat.port.https"/>
-        <not><matches string="${tomcat.port.https}" pattern="^\d{3,4}\s*$"/></not>
+        <not><matches string="${tomcat.port.https}" pattern="^\d{2,}\s*$"/></not>
       </and>
       </bool>
       <fail>...
     ********* ERROR: tomcat.port.https in file build.properties is set to an invalid port number.
-    Valid ports range from 1024–49151. But don't choose any port already in use by another application.
+    If port 80 is not possible, user assignable ports range from 1024–49151.
+    But don't choose any port already in use by another application.
     Try setting tomcat.port.https=8443
       </fail>