Changeset 37473

Timestamp:

2023-03-13T10:16:19+13:00 (9 days ago)

Author:

davidb

Message:

Further property for webswing. While this 'external' version was not found to be needed, as the 'internal' version is all that the config file needs, it was felt that it was useful to include for completeness/future proofing

File:

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

main/trunk/greenstone3/build.xml

@@ -346 +346 @@
       
       <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.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"/>
       </else>
     </if>
@@ -2812 +2814 @@
       <arg value="-Dinternal.servlet-url=${internal.servlet-url}"/>
       <arg value="-Dexternal.servlet-url=${external.servlet-url}"/>
+      <arg value="-Dexternal.webswing-url=${external.webswing-url}"/>
       <arg value="configure-extension"/>
     </exec>
@@ -2821 +2824 @@
       <arg value="-Dinternal.servlet-url=${internal.servlet-url}"/>
       <arg value="-Dexternal.servlet-url=${external.servlet-url}"/>
+      <arg value="-Dexternal.webswing-url=${external.webswing-url}"/>
       <arg value="configure-extension"/>
     </exec>