Changeset 32337 for main/trunk

Show
Ignore:
Timestamp:
14.08.2018 18:35:36 (14 months ago)
Author:
ak19
Message:

Changing tomcat port variable names so they'll be easier to work with later: it's now tomcat.port.http(s) instead of tomcat.http(s).port.

Location:
main/trunk/greenstone3
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.svn

    r32334 r32337  
    1111# but not remotely 
    1212tomcat.server=localhost 
    13 tomcat.http.port=8383 
    14 tomcat.https.port=8443 
     13tomcat.port.http=8383 
     14tomcat.port.https=8443 
    1515# Tomcat's shutdown port - this may need to be changed if you are running two or more Tomcats 
    1616tomcat.shutdown.port=8305 
  • main/trunk/greenstone3/build.xml

    r32334 r32337  
    136136        <and> 
    137137          <equals arg1="${server.protocol}" arg2="http" trim="true" casesensitive="false" forcestring="true"/>         
    138           <isset property="tomcat.http.port"/>         
    139           <matches string="${tomcat.http.port}" pattern="^\d{3,4}\s*$"/> 
     138          <isset property="tomcat.port.http"/>         
     139          <matches string="${tomcat.port.http}" pattern="^\d{3,4}\s*$"/> 
    140140        </and> 
    141141        <and> 
    142142          <equals arg1="${server.protocol}" arg2="https" trim="true" casesensitive="false" forcestring="true"/>        
    143           <isset property="tomcat.https.port"/> 
    144           <matches string="${tomcat.https.port}" pattern="^\d{3,4}\s*$"/> 
     143          <isset property="tomcat.port.https"/> 
     144          <matches string="${tomcat.port.https}" pattern="^\d{3,4}\s*$"/> 
    145145        </and> 
    146146      </or> 
    147147    </not> 
    148148      </bool> 
    149       <fail>ERROR: Unable to set tomcat.port. 
     149      <echo>ERROR: Unable to set tomcat.port. 
    150150      In file build.properties server.protocol=${server.protocol} and requires at minimum that its 
    151       matching tomcat.${server.protocol}.port property line be set and is assigned a valid port number. 
    152       (Ensure any other enabled tomcat port is valid too)</fail> 
     151      matching tomcat.port.${server.protocol} property line be set and is assigned a valid port number. 
     152      (Ensure any other enabled tomcat port is valid too)</echo> 
    153153      <!--<echo>Uncomment at least the tomcat.${server.protocol}.port line in build.properties.</echo>--> 
    154154      <!--<property name="internal.tomcat.port" value=""/>-->       
    155155      <else> 
    156     <condition property="internal.tomcat.port" value="${tomcat.https.port}" else="${tomcat.http.port}"> 
     156    <condition property="internal.tomcat.port" value="${tomcat.port.https}" else="${tomcat.port.http}"> 
    157157      <equals arg1="${server.protocol}" arg2="https" trim="true" casesensitive="false" forcestring="true"/> 
    158158    </condition> 
     159    <echo>### tomcat.port.http: ${tomcat.port.http}</echo> 
    159160      </else> 
    160161    </if> 
     
    10771078      tomcat.server=${tomcat.server} 
    10781079      <!--tomcat.port=${internal.tomcat.port}--> 
    1079       tomcat.http.port=${tomcat.http.port} 
    1080       tomcat.https.port=${tomcat.https.port} 
     1080      tomcat.port.http=${tomcat.port.http} 
     1081      tomcat.port.https=${tomcat.port.https} 
    10811082      tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed) 
    10821083      proxy.host=${proxy.host} 
     
    14381439    <filter token="tomcat.server" value="${tomcat.server}"/> 
    14391440    <filter token="tomcat.port" value="${internal.tomcat.port}"/> 
    1440     <filter token="tomcat.http.port" value="${tomcat.http.port}"/> 
    1441     <filter token="tomcat.https.port" value="${tomcat.https.port}"/> 
     1441    <filter token="tomcat.port.http" value="${tomcat.port.http}"/> 
     1442    <filter token="tomcat.port.https" value="${tomcat.port.https}"/> 
    14421443    <filter token="greenstone.context" value="${greenstone.context}"/> 
    14431444    <filter token="derbyserver" value="${derby.server}"/> 
  • main/trunk/greenstone3/resources/web/global.properties.svn

    r32334 r32337  
    1818tomcat.server=@tomcat.server@ 
    1919tomcat.port=@tomcat.port@ 
    20 tomcat.http.port=@tomcat.http.port@ 
    21 tomcat.https.port=@tomcat.https.port@ 
     20tomcat.port.http=@tomcat.port.http@ 
     21tomcat.port.https=@tomcat.port.https@ 
    2222tomcat.context=@greenstone.context@ 
    2323derby.server.port=@derbyserver.port@