Changeset 33975

Timestamp:

2020-02-25T14:46:51+13:00 (4 years ago)

Author:

kjdon

Message:

some mods to do with allowing multiple oaiservers. need OAIConfig-servername.xml for each one. Uses oai.servlets property which can be modified in build.properties.

File:

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

main/trunk/greenstone3/build.xml

@@ -24 +24 @@
   <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/>
   <taskdef name="for" classname="net.sf.antcontrib.logic.ForTask" classpathref="project.classpath"/>
+  <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" classpathref="project.classpath"/>
   <taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" classpathref="project.classpath"/>
 
@@ -318 +319 @@
   <!-- now we've read in properties, apply defaults -->
   <property name="disable.collection.building" value="false"/>
-
+  <property name="oai.servlets" value="oaiserver"/> <!-- in case user has old version of build.properties-->
   <!-- get properties from the environment -->
   <property environment="env"/>
@@ -1192 +1193 @@
 
     <!--Now write out the url with /oaiserver suffix as the baseURL property in OAIConfig.xml-->
-    <available file="${basedir}/resources/oai/OAIConfig.xml.in" property="oaiconfig.present"/>
-    <antcall target="init-oaiconfig">
+    <antcall target="init-oaiconfigs">
       <param name="url" value="${url}"/>
     </antcall>
@@ -1204 +1204 @@
 
   </target>
-
-  <target name="init-oaiconfig" if="oaiconfig.present">
-    <echo>Writing out baseURL ${url}oaiserver to ${web.writableclasses}/OAIConfig.xml</echo>
-    <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${web.writableclasses}/OAIConfig.xml"/>
-    <rsr verbosity="1" file="${web.writableclasses}/OAIConfig.xml" pattern="&lt;baseURL&gt;.*&lt;/baseURL&gt;" replacement="&lt;baseURL&gt;${url}oaiserver&lt;/baseURL&gt;" />   
+  
+  <available file="${basedir}/resources/oai/OAIConfig.xml.in" property="oaiconfig.present"/>
+
+  <target name="init-oaiconfigs" if="oaiconfig.present">
+    <echo>Generating new oaiconfigs for servlets ${oai.servlets} </echo>
+    <foreach list="${oai.servlets}" delimiter="," target="init-oaiconfig" param="servlet_name"/>
+  </target>
+  
+  <target name="init-oaiconfig">
+    <if><bool><not><available file="${basedir}/resources/oai/OAIConfig-${servlet_name}.xml.in"/></not></bool>
+    <echo>Copying file ${basedir}/resources/oai/OAIConfig.xml.in to ${basedir}/resources/oai/OAIConfig-${servlet_name}.xml.in</echo>
+    <echo>This file (OAIConfig-${servlet_name}.xml.in) will not be regenerated again, so you may edit it to customise settings for this servlet. To have it regenerated, delete the file.</echo>
+    <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig-${servlet_name}.xml.in"/>
+    </if>
+    <echo>Copying ${basedir}/resources/oai/OAIConfig-${servlet_name}.xml.in to ${web.writableclasses}/OAIConfig-${servlet_name}.xml and setting baseURL to ${url}${servlet_name}</echo>
+    <copy file="${basedir}/resources/oai/OAIConfig-${servlet_name}.xml.in" tofile="${web.writableclasses}/OAIConfig-${servlet_name}.xml"/>
+    <rsr verbosity="1" file="${web.writableclasses}/OAIConfig-${servlet_name}.xml" pattern="&lt;baseURL&gt;.*&lt;/baseURL&gt;" replacement="&lt;baseURL&gt;${url}${servlet_name}&lt;/baseURL&gt;" />   
   </target>
 
@@ -2645 +2657 @@
     Doing "cat </dev/null > packages/tomcat/logs/catalina.out" doesn't work as an ant target.
     It seems to have a problem with cat or </dev/null, with or without the < sign. -->
-  <target name="reset-logs" description="Empties catalina.out, greenstone.log and contents of web/logs/tmp">
+  <target name="reset-logs" description="Empties catalina.out, solr.log, greenstone.log, usage.log, server.log and contents of web/logs/tmp">
     <echo>Truncating catalina.out, solr.log, greenstone.log, usage.log and server.log, and emptying ${web.writablehome}/logs/tmp</echo>    
     <exec executable="rm" os="${os.unix}" dir="${catalina.home}/logs" spawn="false">