Changeset 29268

Show
Ignore:
Timestamp:
11.09.2014 14:19:24 (5 years ago)
Author:
kjdon
Message:

need to copy OAIConfig.xml to WEB-INF, not OAIConfig.xml.in, as the .xml file is the one we tell users to edit.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r29244 r29268  
    789789 
    790790    <!--Now write out the url with oaiserver suffix as the baseURL property in OAIConfig.xml--> 
    791     <available file="${basedir}/resources/oai/OAIConfig.xml.in" property="oaiconfig.present"/> 
     791    <available file="${basedir}/resources/oai/OAIConfig.xml" property="oaiconfig.present"/> 
    792792    <antcall target="init-oaiconfig"> 
    793793      <param name="url" value="${url}"/> 
     
    797797  <target name="init-oaiconfig" if="oaiconfig.present"> 
    798798    <echo>Writing out baseURL ${url}oaiserver to ${web.writableclasses}/OAIConfig.xml</echo> 
    799     <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${web.writableclasses}/OAIConfig.xml"/> 
     799    <copy file="${basedir}/resources/oai/OAIConfig.xml" tofile="${web.writableclasses}/OAIConfig.xml"/> 
    800800    <rsr verbosity="1" file="${web.writableclasses}/OAIConfig.xml" pattern="&lt;baseURL&gt;.*&lt;/baseURL&gt;" replacement="&lt;baseURL&gt;${url}oaiserver&lt;/baseURL&gt;" />    
    801801  </target>