Changeset 37137 for main/trunk/greenstone3/build.xml

Timestamp:

2023-01-15T00:54:38+13:00 (15 months ago)

Author:

davidb

Message:

Revision in property name, along with changes after testing the new revproxy.protocol, revproxy.domain properties

File:

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

main/trunk/greenstone3/build.xml

@@ -1216 +1216 @@
   
   <target name="get-revproxy-servlet-url">
-    <if><bool><isset property="revproxy.port"/></bool>
-    <property name="revproxy.optport" value=":${revproxy.port}"/>
+    <if><bool><isset property="revproxy.opt_port"/></bool>
+    <property name="revproxy.colon_opt_port" value=":${revproxy.opt_port}"/>
     <else>
-      <property name="revproxy.optport" value=""/>
+      <property name="revproxy.colon_opt_port" value=""/>
     </else>
     </if>
@@ -1230 +1230 @@
 
     
-    <echo>${revproxy.protocol}://${revproxy.server}${revproxy.optport}${revproxy.app.path}${server.default.servlet}</echo>
+    <echo>${revproxy.protocol}://${revproxy.domain}${revproxy.colon_opt_port}${revproxy.app.path}${server.default.servlet}</echo>
   </target>
 
@@ -1253 +1253 @@
 
   <target name="get-external-servlet-url">      
-    <if><bool><isset property="revproxy.server"/></bool>
+    <if><bool><isset property="revproxy.domain"/></bool>
       <antcall target="get-revproxy-servlet-url"/>
       <else>
@@ -1903 +1903 @@
     <filter token="gsdl3writablehome" value="${src.gsdl3.writablehome.unix}"/>
     <filter token="gsdl3version" value="${app.version}"/>
+    <filter token="revproxy.protocol" value="${revproxy.protocol}"/>
+    <filter token="revproxy.domain"   value="${revproxy.domain}"/>
+    <filter token="revproxy.opt_port" value="${revproxy.opt_port}"/>
+    <filter token="revproxy.context"  value="${revproxy.context}"/>
     <filter token="server.protocols" value="${server.protocols}"/>
     <filter token="default.server.protocol" value="${default.server.protocol}"/>