Changeset 32355 for main

Show
Ignore:
Timestamp:
22.08.2018 18:43:43 (12 months ago)
Author:
ak19
Message:

Correcting tests for valid ports and associated helpful messages.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32351 r32355  
    116116       * propfile: 
    117117       https://ant.apache.org/manual/Tasks/propertyfile.html 
    118        * valid ports range from 1024–49151 
     118       * "valid ports range from 1024–49151" is probably about user assignable ports. 
     119       But 80 is a valid port for running web servers including GS 
     120       and in future the range may become greater, so don't restrict the port range to 1024-49151. 
    119121       https://stackoverflow.com/questions/113224/what-is-the-largest-tcp-ip-network-port-number-allowable-for-ipv4 
    120122  --> 
     
    123125      <and> 
    124126        <isset property="tomcat.port.http"/> 
    125         <not><matches string="${tomcat.port.http}" pattern="^\d{3,4}\s*$"/></not> 
     127        <not><matches string="${tomcat.port.http}" pattern="^\d{2,}\s*$"/></not> 
    126128      </and>      
    127129      </bool> 
    128130      <fail>... 
    129131    ********* ERROR: tomcat.port.http in file build.properties is set to an invalid port number. 
    130     Valid ports range from 1024–49151. But don't choose any port already in use by another application. 
     132    If port 80 is not possible, user assignable ports range from 1024–49151. 
     133    But don't choose any port already in use by another application. 
    131134    Try setting to tomcat.port.http=8383 
    132135      </fail> 
     
    137140      <and> 
    138141        <isset property="tomcat.port.https"/> 
    139         <not><matches string="${tomcat.port.https}" pattern="^\d{3,4}\s*$"/></not> 
     142        <not><matches string="${tomcat.port.https}" pattern="^\d{2,}\s*$"/></not> 
    140143      </and> 
    141144      </bool> 
    142145      <fail>... 
    143146    ********* ERROR: tomcat.port.https in file build.properties is set to an invalid port number. 
    144     Valid ports range from 1024–49151. But don't choose any port already in use by another application. 
     147    If port 80 is not possible, user assignable ports range from 1024–49151. 
     148    But don't choose any port already in use by another application. 
    145149    Try setting tomcat.port.https=8443 
    146150      </fail>