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

Timestamp:

2023-01-14T16:52:46+13:00 (16 months ago)

Author:

davidb

Message:

New targets to call when you want to work out what the 'internal' (i.e. localhost URL), or the public facing one (which can default all the way back to being localhost, but in production installations is typically different

File:

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

main/trunk/greenstone3/build.xml

@@ -1214 +1214 @@
     </stringutil>
   </target>
+  
+  <target name="get-revproxy-servlet-url">
+    <if><bool><isset property="revproxy.port"/></bool>
+    <property name="revproxy.optport" value=":${revproxy.port}"/>
+    <else>
+      <property name="revproxy.optport" value=""/>
+    </else>
+    </if>
+    <if><bool><isset property="revproxy.context"/></bool>
+    <property name="revproxy.app.path" value="/${revproxy.context}"/>
+    <else>
+      <property name="revproxy.app.path" value="${app.path}"/>
+    </else>
+    </if>
+
+    
+    <echo>${revproxy.protocol}://${revproxy.server}${revproxy.optport}${revproxy.app.path}${server.default.servlet}</echo>
+  </target>
 
   <target name="get-default-servlet-url">
@@ -1219 +1237 @@
   </target>
 
+  
   <!-- returns the base local URL, something like HTTP://127.0.0.1:<HTTPport>
        or some sane equivalent for 127.0.0.1 -->
@@ -1229 +1248 @@
   </target>
 
+  <target name="get-internal-servlet-url">
+    <antcall target="get-local-http-servlet-url" />
+  </target>
+
+  <target name="get-external-servlet-url">      
+    <if><bool><isset property="revproxy.server"/></bool>
+      <antcall target="get-revproxy-servlet-url"/>
+      <else>
+    <antcall target="get-default-servlet-url"/>
+      </else>
+    </if>
+  </target>
+  
   <!-- solr should only be accessible locally, which therefore also means only over http.
   Note that for http, 127.0.0.1 is safer than localhost (as localhost can be mapped to something