Changeset 32337 for main/trunk/greenstone3/build.xml
- Timestamp:
- 2018-08-14T18:35:36+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r32334 r32337 136 136 <and> 137 137 <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*$"/> 140 140 </and> 141 141 <and> 142 142 <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*$"/> 145 145 </and> 146 146 </or> 147 147 </not> 148 148 </bool> 149 < fail>ERROR: Unable to set tomcat.port.149 <echo>ERROR: Unable to set tomcat.port. 150 150 In file build.properties server.protocol=${server.protocol} and requires at minimum that its 151 matching tomcat. ${server.protocol}.portproperty 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> 153 153 <!--<echo>Uncomment at least the tomcat.${server.protocol}.port line in build.properties.</echo>--> 154 154 <!--<property name="internal.tomcat.port" value=""/>--> 155 155 <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}"> 157 157 <equals arg1="${server.protocol}" arg2="https" trim="true" casesensitive="false" forcestring="true"/> 158 158 </condition> 159 <echo>### tomcat.port.http: ${tomcat.port.http}</echo> 159 160 </else> 160 161 </if> … … 1077 1078 tomcat.server=${tomcat.server} 1078 1079 <!--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} 1081 1082 tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed) 1082 1083 proxy.host=${proxy.host} … … 1438 1439 <filter token="tomcat.server" value="${tomcat.server}"/> 1439 1440 <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}"/> 1442 1443 <filter token="greenstone.context" value="${greenstone.context}"/> 1443 1444 <filter token="derbyserver" value="${derby.server}"/>
Note:
See TracChangeset
for help on using the changeset viewer.