Changeset 38979

Timestamp:

2024-05-02T14:46:28+12:00 (6 weeks ago)

Author:

kjdon

Message:

oaiserver needs to use the public url not the localhost one

File:

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

main/trunk/greenstone3/build.xml

@@ -344 +344 @@
     </else>
       </if>
-      
+
+      <property name="external.context-url" value="${revproxy.protocol}://${revproxy.domain}${revproxy.colon_opt_port}${revproxy.app.path}"/>
       <property name="external.servlet-url" value="${revproxy.protocol}://${revproxy.domain}${revproxy.colon_opt_port}${revproxy.app.path}${server.default.servlet}"/>
       <property name="external.webswing-url" value="${revproxy.protocol}://${revproxy.domain}${revproxy.colon_opt_port}webswing-server"/>
       
       <else>
+    <property name="external.context-url" value="${default.server.protocol}://${tomcat.server}:${default.tomcat.port}/${greenstone.context}"/>
     <property name="external.servlet-url" value="${default.server.protocol}://${tomcat.server}:${default.tomcat.port}/${greenstone.context}${server.default.servlet}"/>
     <property name="external.webswing-url" value="${default.server.protocol}://${tomcat.server}:${default.tomcat.port}/webswing-server"/>
@@ -1465 +1467 @@
     </if>
     <echo>URL   : ${url}</echo>
+    <echo>Public URL  : ${external.servlet-url}/</echo>
     <!-- assuming that index.html is not needed here -->   
 
     <!--Now write out the url with /oaiserver suffix as the baseURL property in OAIConfig.xml-->
     <antcall target="init-oaiconfigs">
-      <param name="url" value="${url}"/>
+      <param name="url" value="${external.context-url}/"/>
     </antcall>
 
@@ -3515 +3518 @@
     <delete dir="${build.home}"/>
   </target>
-
+  
   <target name="compile-core" depends="needs-gs3-devel,init" 
     description="Compile only the Greenstone core">
@@ -3618 +3621 @@
     <mkdir dir="${web.applet}"/>
     <copy file="${build.home}/GsdlCollageApplet.jar" todir="${web.applet}"/>
-    
+
     <!-- phind and GsdlCollage also need webswing-api.jar to be in web/applet -->
     <if>