Changeset 27852

Timestamp:

2013-07-13T23:08:24+12:00 (11 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:

• build.xml (modified) (1 diff)
• solr.xml (modified) (1 diff)

gs3-extensions/solr/trunk/src/build.xml

@@ -86 +86 @@
     <echo/>
     <echo>Adding to gsdl3 web solr ext directory: ${web-list-files}</echo>
-    <copy todir="${web.extdir}">
+    <pathconvert targetos="unix" property="src.gsdl3.home.unix">
+      <path path="../../web"/>
+    </pathconvert>
+    <filter token="gsdl3home" value="${src.gsdl3.home.unix}"/>
+    <copy todir="${web.extdir}" filtering="true" overwrite="true">
           <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/> 
     </copy>

gs3-extensions/solr/trunk/src/solr.xml

@@ -2 +2 @@
 <solr persistent="true">
   <cores adminPath="/admin/cores">
-    <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"/>
-    <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"/>
+    <core name="localsite-solr-jdbm-demo-sidx" 
+      instanceDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/etc/" 
+      dataDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/index/sidx"/>
+    <core name="localsite-solr-jdbm-demo-didx" 
+      instanceDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/etc/" 
+      dataDir="@gsdl3home@/sites/localsite/collect/solr-jdbm-demo/index/didx"/>
   </cores>
 </solr>