Changeset 32337 for main

Timestamp:

2018-08-14T18:35:36+12:00 (6 years 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:

• build.properties.svn (modified) (1 diff)
• build.xml (modified) (3 diffs)
• resources/web/global.properties.svn (modified) (1 diff)

main/trunk/greenstone3/build.properties.svn

@@ -11 +11 @@
 # but not remotely
 tomcat.server=localhost
-tomcat.http.port=8383
-tomcat.https.port=8443
+tomcat.port.http=8383
+tomcat.port.https=8443
 # Tomcat's shutdown port - this may need to be changed if you are running two or more Tomcats
 tomcat.shutdown.port=8305

main/trunk/greenstone3/build.xml

@@ -136 +136 @@
         <and>
           <equals arg1="${server.protocol}" arg2="http" trim="true" casesensitive="false" forcestring="true"/>        
-          <isset property="tomcat.http.port"/>        
-          <matches string="${tomcat.http.port}" pattern="^\d{3,4}\s*$"/>
+          <isset property="tomcat.port.http"/>        
+          <matches string="${tomcat.port.http}" pattern="^\d{3,4}\s*$"/>
         </and>
         <and>
           <equals arg1="${server.protocol}" arg2="https" trim="true" casesensitive="false" forcestring="true"/>       
-          <isset property="tomcat.https.port"/>
-          <matches string="${tomcat.https.port}" pattern="^\d{3,4}\s*$"/>
+          <isset property="tomcat.port.https"/>
+          <matches string="${tomcat.port.https}" pattern="^\d{3,4}\s*$"/>
         </and>
       </or>
     </not>
       </bool>
-      <fail>ERROR: Unable to set tomcat.port.
+      <echo>ERROR: Unable to set tomcat.port.
       In file build.properties server.protocol=${server.protocol} and requires at minimum that its
-      matching tomcat.${server.protocol}.port property line be set and is assigned a valid port number.
-      (Ensure any other enabled tomcat port is valid too)</fail>
+      matching tomcat.port.${server.protocol} property line be set and is assigned a valid port number.
+      (Ensure any other enabled tomcat port is valid too)</echo>
       <!--<echo>Uncomment at least the tomcat.${server.protocol}.port line in build.properties.</echo>-->
       <!--<property name="internal.tomcat.port" value=""/>-->      
       <else>
-    <condition property="internal.tomcat.port" value="${tomcat.https.port}" else="${tomcat.http.port}">
+    <condition property="internal.tomcat.port" value="${tomcat.port.https}" else="${tomcat.port.http}">
       <equals arg1="${server.protocol}" arg2="https" trim="true" casesensitive="false" forcestring="true"/>
     </condition>
+    <echo>### tomcat.port.http: ${tomcat.port.http}</echo>
       </else>
     </if>
@@ -1077 +1078 @@
       tomcat.server=${tomcat.server}
       <!--tomcat.port=${internal.tomcat.port}-->
-      tomcat.http.port=${tomcat.http.port}
-      tomcat.https.port=${tomcat.https.port}
+      tomcat.port.http=${tomcat.port.http}
+      tomcat.port.https=${tomcat.port.https}
       tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
       proxy.host=${proxy.host}
@@ -1438 +1439 @@
     <filter token="tomcat.server" value="${tomcat.server}"/>
     <filter token="tomcat.port" value="${internal.tomcat.port}"/>
-    <filter token="tomcat.http.port" value="${tomcat.http.port}"/>
-    <filter token="tomcat.https.port" value="${tomcat.https.port}"/>
+    <filter token="tomcat.port.http" value="${tomcat.port.http}"/>
+    <filter token="tomcat.port.https" value="${tomcat.port.https}"/>
     <filter token="greenstone.context" value="${greenstone.context}"/>
     <filter token="derbyserver" value="${derby.server}"/>

main/trunk/greenstone3/resources/web/global.properties.svn

@@ -18 +18 @@
 [email protected]@
 [email protected]@
-tomcat.[email protected]@
-tomcat.[email protected]@
+tomcat.[email protected]@
+tomcat.[email protected]@
 [email protected]@
 [email protected]@