Changeset 26433

Show
Ignore:
Timestamp:
31.10.2012 18:56:10 (7 years ago)
Author:
ak19
Message:

Forgot to commit inclusion of FEDORA_HOME env to tomcat start and stop in build.xml, and the all important index write lock timeout property (for fedoragsearch) in build.properties.in.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r26363 r26433  
    8888#fedora.maxpermsize=-XX:MaxPermSize=128m 
    8989#fedora.password=pounamu 
    90  
     90#index.writelock.timeout=10000 
    9191 
    9292##Web services related constants## 
  • main/trunk/greenstone3/build.xml

    r26359 r26433  
    11121112      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here these days ??--> 
    11131113      <env key="WNHOME" path="${wn.home}"/> 
     1114      <env key="FEDORA_HOME" path="${fedora.home}"/> 
    11141115    </exec> 
    11151116    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true"> 
     
    11211122      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    11221123      <env key="CLASSPATH" path="${tomcat.classpath}"/> 
     1124      <env key="FEDORA_HOME" path="${fedora.home}"/> 
    11231125    </exec> 
    11241126    <!-- wait for the server to startup in case other targets need it running --> 
     
    11541156  <target name="force-stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal"> 
    11551157    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 
     1158      <env key="FEDORA_HOME" path="${fedora.home}"/> 
    11561159      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    11571160      <arg line=">/dev/null 2>&amp;1"/> 
    11581161    </exec> 
    11591162    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"> 
     1163      <env key="FEDORA_HOME" path="${fedora.home}"/> 
    11601164      <env key="CATALINA_HOME" value="${catalina.home}"/> 
    11611165      <arg line=">nul 2>&amp;1"/>