Changeset 27843 for gs3-extensions/solr/trunk/src/build.xml

Timestamp:

2013-07-13T16:21:14+12:00 (11 years ago)

Author:

davidb

Message:

Example collection added/remove through add/del targets

File:

• gs3-extensions/solr/trunk/src/build.xml (modified) (5 diffs)

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

@@ -4 +4 @@
   <!-- DIRECTORY LOCATIONS -->
   <property name="web.home" value="${basedir}/../../web"/>
+  <property name="localsite.collectdir" value="${web.home}/sites/localsite/collect"/>
   <property name="gsdlsrcdir" value="${basedir}/../../src/java/org/greenstone/gsdl3"/>
   <property name="ext.gsdlsrcdir" value="${basedir}/src/java/org/greenstone/gsdl3"/>
@@ -61 +62 @@
     
     <copy todir="${gsdlsrcdir}/service">
-        <filelist id="java-src-files-service" dir="${ext.gsdlsrcdir}/service" files="${java-service-files}"/> 
-    </copy>
+          <filelist id="java-src-files-service" dir="${ext.gsdlsrcdir}/service" files="${java-service-files}"/> 
+    </copy>
     <copy todir="${gsdlsrcdir}/util">
-        <filelist id="java-src-files-util" dir="${ext.gsdlsrcdir}/util" files="${java-util-files}"/>           
-    </copy>
+          <filelist id="java-src-files-util" dir="${ext.gsdlsrcdir}/util" files="${java-util-files}"/>         
+    </copy>
     
     <echo/>
     <echo>Adding to gsdl3 properties area: properties/${property-files}</echo>
     <copy todir="${classesdir}">
-        <filelist id="prop-files" dir="properties" files="${property-files}"/>
-    </copy>
+          <filelist id="prop-files" dir="properties" files="${property-files}"/>
+    </copy>
 
     <echo/>
     <echo>Adding to gsdl3 web jar lib directory: ${basedir}/lib/java's ${jars}</echo>
     <copy todir="${jarwebdir}">
-        <filelist id="jar-files" dir="lib/java" files="${jars}"/>
-    </copy> 
+          <filelist id="jar-files" dir="lib/java" files="${jars}"/>
+    </copy> 
     
     <echo/>
@@ -86 +87 @@
     <echo>Adding to gsdl3 web solr ext directory: ${web-list-files}</echo>
     <copy todir="${web.extdir}">
-        <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/> 
-    </copy>
+          <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/> 
+    </copy>
     
+    <echo/>
+    <echo>Adding example solr-jdbm-demo collection to gsdl3/web/sites/localsite/collect</echo>
+    <copy todir="${localsite.collectdir}/solr-jdbm-demo"
+          preservelastmodified="true"
+          failonerror="true" >  
+      <fileset dir="${basedir}/collect/solr-jdbm-demo" includes="**"/>  
+    </copy>
+
     <!-- copy the content of the web folder (avoiding the top-level .svn directory) -->
-    <available property="ext.web.exists" file="${basedir}/web" type="dir" />    
+    <available property="ext.web.exists" file="${basedir}/web" type="dir" />
+
   </target>
   
@@ -100 +110 @@
     <echo>Copy to gsdl3 web: the content of the ${basedir}/web folder (excluding .svn)</echo>
     <copy todir="${web.extdir}">
-        <dirset dir="${basedir}/web">
-            <exclude name=".svn"/>
-        </dirset> 
-    </copy>
+          <dirset dir="${basedir}/web">
+        <exclude name=".svn"/>
+      </dirset> 
+    </copy>
+
   </target>
   
@@ -117 +128 @@
     
     <delete failonerror="false">
-        <filelist dir="${gsdlsrcdir}/service" files="${java-service-files}"/> 
-    </delete>
+          <filelist dir="${gsdlsrcdir}/service" files="${java-service-files}"/> 
+    </delete>
     <delete failonerror="false">
-        <filelist dir="${gsdlsrcdir}/util" files="${java-util-files}"/>        
-    </delete>
+          <filelist dir="${gsdlsrcdir}/util" files="${java-util-files}"/>          
+    </delete>
     
     <echo/>
     <echo>Removing from  gsdl3 properties area: properties/${property-files}</echo>
     <delete failonerror="false">
-        <filelist dir="${classesdir}" files="${property-files}"/>
-    </delete>
+          <filelist dir="${classesdir}" files="${property-files}"/>
+    </delete>
 
     <echo/>
     <echo>Removing from gsdl3 web jar lib directory: ${basedir}/lib/java's ${jars}</echo>
     <delete failonerror="false">
-        <filelist dir="${jarwebdir}" files="${jars}"/>
-    </delete>   
+          <filelist dir="${jarwebdir}" files="${jars}"/>
+    </delete>   
     
     <echo/>
     <echo>Removing web solr extension directory: ${web.extdir}</echo>
     <delete failonerror="false" includeEmptyDirs="true" dir="${web.extdir}"/>   
+
+    <echo/>
+    <echo>Removing solr-jdbm-demo collection from: ${localsite.collectdir}</echo>
+    <delete failonerror="false" includeEmptyDirs="true" dir="${localsite.collectcdir}/solr-jdbm-demo"/> 
     
   </target>