Changeset 27843


Ignore:
Timestamp:
07/13/13 16:21:14 (8 years ago)
Author:
davidb
Message:

Example collection added/remove through add/del targets

File:
1 edited

Legend:

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

    r25906 r27843  
    44  <!-- DIRECTORY LOCATIONS -->
    55  <property name="web.home" value="${basedir}/../../web"/>
     6  <property name="localsite.collectdir" value="${web.home}/sites/localsite/collect"/>
    67  <property name="gsdlsrcdir" value="${basedir}/../../src/java/org/greenstone/gsdl3"/>
    78  <property name="ext.gsdlsrcdir" value="${basedir}/src/java/org/greenstone/gsdl3"/>
     
    6162   
    6263    <copy todir="${gsdlsrcdir}/service">
    63         <filelist id="java-src-files-service" dir="${ext.gsdlsrcdir}/service" files="${java-service-files}"/>
    64     </copy>
     64          <filelist id="java-src-files-service" dir="${ext.gsdlsrcdir}/service" files="${java-service-files}"/>
     65    </copy>
    6566    <copy todir="${gsdlsrcdir}/util">
    66         <filelist id="java-src-files-util" dir="${ext.gsdlsrcdir}/util" files="${java-util-files}"/>           
    67     </copy>
     67          <filelist id="java-src-files-util" dir="${ext.gsdlsrcdir}/util" files="${java-util-files}"/>         
     68    </copy>
    6869   
    6970    <echo/>
    7071    <echo>Adding to gsdl3 properties area: properties/${property-files}</echo>
    7172    <copy todir="${classesdir}">
    72         <filelist id="prop-files" dir="properties" files="${property-files}"/>
    73     </copy>
     73          <filelist id="prop-files" dir="properties" files="${property-files}"/>
     74    </copy>
    7475
    7576    <echo/>
    7677    <echo>Adding to gsdl3 web jar lib directory: ${basedir}/lib/java's ${jars}</echo>
    7778    <copy todir="${jarwebdir}">
    78         <filelist id="jar-files" dir="lib/java" files="${jars}"/>
    79     </copy>
     79          <filelist id="jar-files" dir="lib/java" files="${jars}"/>
     80    </copy>
    8081   
    8182    <echo/>
     
    8687    <echo>Adding to gsdl3 web solr ext directory: ${web-list-files}</echo>
    8788    <copy todir="${web.extdir}">
    88         <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/>
    89     </copy>
     89          <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/>
     90    </copy>
    9091   
     92    <echo/>
     93    <echo>Adding example solr-jdbm-demo collection to gsdl3/web/sites/localsite/collect</echo>
     94    <copy todir="${localsite.collectdir}/solr-jdbm-demo"
     95          preservelastmodified="true"
     96          failonerror="true" > 
     97      <fileset dir="${basedir}/collect/solr-jdbm-demo" includes="**"/> 
     98    </copy>
     99
    91100    <!-- copy the content of the web folder (avoiding the top-level .svn directory) -->
    92     <available property="ext.web.exists" file="${basedir}/web" type="dir" />   
     101    <available property="ext.web.exists" file="${basedir}/web" type="dir" />
     102
    93103  </target>
    94104 
     
    100110    <echo>Copy to gsdl3 web: the content of the ${basedir}/web folder (excluding .svn)</echo>
    101111    <copy todir="${web.extdir}">
    102         <dirset dir="${basedir}/web">
    103             <exclude name=".svn"/>
    104         </dirset>
    105     </copy>
     112          <dirset dir="${basedir}/web">
     113        <exclude name=".svn"/>
     114      </dirset>
     115    </copy>
     116
    106117  </target>
    107118 
     
    117128   
    118129    <delete failonerror="false">
    119         <filelist dir="${gsdlsrcdir}/service" files="${java-service-files}"/>
    120     </delete>
     130          <filelist dir="${gsdlsrcdir}/service" files="${java-service-files}"/>
     131    </delete>
    121132    <delete failonerror="false">
    122         <filelist dir="${gsdlsrcdir}/util" files="${java-util-files}"/>       
    123     </delete>
     133          <filelist dir="${gsdlsrcdir}/util" files="${java-util-files}"/>         
     134    </delete>
    124135   
    125136    <echo/>
    126137    <echo>Removing from  gsdl3 properties area: properties/${property-files}</echo>
    127138    <delete failonerror="false">
    128         <filelist dir="${classesdir}" files="${property-files}"/>
    129     </delete>
     139          <filelist dir="${classesdir}" files="${property-files}"/>
     140    </delete>
    130141
    131142    <echo/>
    132143    <echo>Removing from gsdl3 web jar lib directory: ${basedir}/lib/java's ${jars}</echo>
    133144    <delete failonerror="false">
    134         <filelist dir="${jarwebdir}" files="${jars}"/>
    135     </delete>   
     145          <filelist dir="${jarwebdir}" files="${jars}"/>
     146    </delete>   
    136147   
    137148    <echo/>
    138149    <echo>Removing web solr extension directory: ${web.extdir}</echo>
    139150    <delete failonerror="false" includeEmptyDirs="true" dir="${web.extdir}"/>   
     151
     152    <echo/>
     153    <echo>Removing solr-jdbm-demo collection from: ${localsite.collectdir}</echo>
     154    <delete failonerror="false" includeEmptyDirs="true" dir="${localsite.collectcdir}/solr-jdbm-demo"/>
    140155   
    141156  </target>
Note: See TracChangeset for help on using the changeset viewer.