Changeset 27852 for gs3-extensions

Show
Ignore:
Timestamp:
13.07.2013 23:08:24 (6 years ago)
Author:
davidb
Message:

Need to represent gsdl3home in parameterized form (i.e. @gsdl3home@), so installation of solr.xml correctly changed to match wherever the Greenstone3/web directory actually is for a given installation

Location:
gs3-extensions/solr/trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/build.xml

    r27843 r27852  
    8686    <echo/> 
    8787    <echo>Adding to gsdl3 web solr ext directory: ${web-list-files}</echo> 
    88     <copy todir="${web.extdir}"> 
     88    <pathconvert targetos="unix" property="src.gsdl3.home.unix"> 
     89      <path path="../../web"/> 
     90    </pathconvert> 
     91    <filter token="gsdl3home" value="${src.gsdl3.home.unix}"/> 
     92    <copy todir="${web.extdir}" filtering="true" overwrite="true"> 
    8993          <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/>  
    9094    </copy> 
  • gs3-extensions/solr/trunk/src/solr.xml

    r24500 r27852  
    22<solr persistent="true"> 
    33  <cores adminPath="/admin/cores"> 
    4     <core name="localsite-lucene-jdbm-demo-didx" instanceDir="c:\cygwin\home\davidb\research\code\greenstone3-svn-full\web\sites\localsite\collect\lucene-jdbm-demo\etc\" dataDir="c:\cygwin\home\davidb\research\code\greenstone3-svn-full\web\sites\localsite\collect\lucene-jdbm-demo\building\didx"/> 
    5     <core name="localsite-lucene-jdbm-demo-sidx" instanceDir="c:\cygwin\home\davidb\research\code\greenstone3-svn-full\web\sites\localsite\collect\lucene-jdbm-demo\etc\" dataDir="c:\cygwin\home\davidb\research\code\greenstone3-svn-full\web\sites\localsite\collect\lucene-jdbm-demo\building\sidx"/> 
     4    <core name="localsite-solr-jdbm-demo-sidx"  
     5      instanceDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/etc/"  
     6      dataDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/index/sidx"/> 
     7    <core name="localsite-solr-jdbm-demo-didx"  
     8      instanceDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/etc/"  
     9      dataDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/index/didx"/> 
    610  </cores> 
    711</solr>