Changeset 26033 for main

Timestamp:

2012-07-27T18:04:42+12:00 (12 years ago)

Author:

ak19

Message:

OAIConfig.xml's baseURL property is now set dynamically to the OAIServer URL whenever the tomcat server has started up.

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (1 diff)
• web/WEB-INF/classes/OAIConfig.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -644 +644 @@
     <echo>URL   : ${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-->
+    <available file="${web.classes}/OAIConfig.xml" property="oaiconfig.present"/>
+    <antcall target="init-oaiconfig">
+      <param name="url" value="${url}"/>
+    </antcall>
+  </target>
+
+  <target name="init-oaiconfig" if="oaiconfig.present">
+    <echo>Writing out baseURL ${url}oaiserver to ${web.classes}/OAIConfig.xml</echo>
+    <rsr file="${web.classes}/OAIConfig.xml" pattern="&lt;baseURL&gt;.*&lt;/baseURL&gt;" replacement="&lt;baseURL&gt;${url}oaiserver&lt;/baseURL&gt;" />   
   </target>
 

main/trunk/greenstone3/web/WEB-INF/classes/OAIConfig.xml

@@ -6 +6 @@
   <repositoryName>Greenstone3 OAI repository</repositoryName>
   <!-- The base url to request metadata from this repository.
-  TODO: this element should be determined and overriden dynamically given the osi request url in OAIServer.java. -->
+  TODO: this element should be determined and overriden dynamically given the osi request url in OAIServer.java. 
+    WHAT'S DONE: when ant start is called, it writes out the default oaiserver URL to this file. -->
   <baseURL>http://your-domain-name/greenstone3/oaiserver</baseURL>
   <!-- The version of OAI specification this repository supports. Can be 2.0 or 1.0 -->