Changeset 27860

Show
Ignore:
Timestamp:
15.07.2013 20:30:45 (6 years ago)
Author:
davidb
Message:

Code to regenerate web/ext/solr.xml as needed

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

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

    r27859 r27860  
    9494  <property name="src.packages.home" value="${basedir}/src/packages"/> 
    9595  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 
     96 
     97  <property name="solr-ext.home" value="${basedir}/ext/solr"/> 
    9698 
    9799  <property file="build.properties"/> 
     
    171173      <mkdir dir="${gsdl3.writablehome}/packages"/>  
    172174      <mkdir dir="${gsdl3.writablehome}/logs"/> 
     175      <mkdir dir="${gsdl3.writablehome}/ext/solr"/> 
    173176 
    174177      <chmod perm="a+rwx" dir="${gsdl3.writablehome}"/> 
    175178      <chmod perm="a+rwx" dir="${gsdl3.writablehome}/packages"/> 
    176179      <chmod perm="a+rwx" dir="${gsdl3.writablehome}/logs"/>  
     180      <chmod perm="a+rwx" dir="${gsdl3.writablehome}/ext/solr"/>  
    177181 
    178182      <!-- copy over packages tomcat folder --> 
     
    778782  </target>  
    779783   
    780   <target name="start" depends="init,configure-tomcat,configure-web,start-tomcat" 
     784  <target name="start" depends="init,configure-tomcat,configure-web,configure-solr-ext,start-tomcat" 
    781785    description="Startup the Tomcat server." > 
    782786    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>  
     
    10641068   
    10651069  <target name="prepare-solr-ext" depends="init" > 
    1066     <property name="solr-ext.home" value="${basedir}/ext/solr"/> 
    10671070    <exec executable="ant.bat" os="${os.windows}" dir="${solr-ext.home}" spawn="false"> 
    10681071      <arg value="add-service"/> 
     
    12891292    </copy> 
    12901293     
    1291     <!-- set up the greenstone3 web.xml file --> 
    1292     <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true"> 
    1293         <filterset> 
    1294             <filter token="perlpath" value="${perl.path}"/> 
    1295         </filterset> 
    1296     </copy> 
     1294    <!-- set up the greenstone3 web.xml file --> 
     1295    <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true"> 
     1296      <filterset> 
     1297    <filter token="perlpath" value="${perl.path}"/> 
     1298      </filterset> 
     1299    </copy> 
    12971300  </target> 
    12981301 
     
    13021305  </target> 
    13031306 
     1307 
     1308  <target name="configure-solr-ext" depends="init" > 
     1309    <!-- re-setup the web/ext/solr/solr.xml file --> 
     1310    <copy file="${solr-ext.home}/solr.xml.in" 
     1311      tofile="${gsdl3.writablehome}/solr/ext/solr.xml" overwrite="true"> 
     1312      <filterset> 
     1313        <filter token="gsdl3.home" value="${src.gsdl3.home.unix}"/> 
     1314        <filter token="gsdl3.writablehome" value="${src.gsdl3.writablehome.unix}"/> 
     1315      </filterset> 
     1316    </copy> 
     1317  </target> 
    13041318  
    13051319  <!-- This target runs tomcat's "bin/catalina.bat(.sh) jpda start"  
  • main/trunk/greenstone3/gs3-server.sh

    r27837 r27860  
    4545        mkdir -p "$gsdl3_writablehome/packages"  
    4646        mkdir -p "$gsdl3_writablehome/logs"  
     47        mkdir -p "$gsdl3_writablehome/ext/solr"  
    4748 
    4849        chmod a+rwx "$gsdl3_writablehome"  
    4950        chmod a+rwx "$gsdl3_writablehome/packages"  
    5051        chmod a+rwx "$gsdl3_writablehome/logs"  
     52        chmod a+rwx "$gsdl3_writablehome/ext/solr"  
    5153 
    5254        echo "Copying to $gsdl3_writablehome/packages/tomcat"