Changeset 26433

Timestamp:

2012-10-31T18:56:10+13:00 (11 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:

• build.properties.in (modified) (1 diff)
• build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.properties.in

@@ -88 +88 @@
 #fedora.maxpermsize=-XX:MaxPermSize=128m
 #fedora.password=pounamu
-
+#index.writelock.timeout=10000
 
 ##Web services related constants##

main/trunk/greenstone3/build.xml

@@ -1112 +1112 @@
       <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here these days ??-->
       <env key="WNHOME" path="${wn.home}"/>
+      <env key="FEDORA_HOME" path="${fedora.home}"/>
     </exec>
     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
@@ -1121 +1122 @@
       <env key="CATALINA_HOME" value="${catalina.home}"/>
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
+      <env key="FEDORA_HOME" path="${fedora.home}"/>
     </exec>
     <!-- wait for the server to startup in case other targets need it running -->
@@ -1154 +1156 @@
   <target name="force-stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
+      <env key="FEDORA_HOME" path="${fedora.home}"/>
       <env key="CATALINA_HOME" value="${catalina.home}"/>
       <arg line=">/dev/null 2>&amp;1"/>
     </exec>
     <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false">
+      <env key="FEDORA_HOME" path="${fedora.home}"/>
       <env key="CATALINA_HOME" value="${catalina.home}"/>
       <arg line=">nul 2>&amp;1"/>