Changeset 25418 for main/trunk

Timestamp:

2012-04-18T15:49:46+12:00 (12 years ago)

Author:

ak19

Message:

1. Sometimes if tomcat is started and stopped and (re-)started, the check for whether tomcat is running returns the false answer about the state of the server (such as can happen if tomcat is in the process of stopping or starting). As a result, tomcat may not be forcibly stopped when it out to be and this can confuse the user. The force-stop-tomcat target is back to being the stop-tomcat target, but hides any Java Exception output that occurs when the user tries to stop an already-stopped tomcat. 2. The update-userdb target now calls check-tomcat-running in its depends attribute, so that the checking code is not duplicated.

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -1107 +1107 @@
 
   <!-- windows: do we want to launch a webrowser?? -->
-  <!-- shouldn't this test whether anything is running first? -->
-  <target name="force-stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
+  <!-- shouldn't this test whether anything is running first? 
+       It's safer to always attempt to stop tomcat: that way we won't be dependent on the right time 
+       to check whether the server is stopped or still running before attempting to start again.
+       This target, which was recently called force-stop-tomcat for a while but is back to being 
+       called stop-tomcat, now hides the Java exception output that appears whenever tomcat is already 
+       stopped as happens when stop-tomcat is called consecutively. -->
+  <target name="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="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="CATALINA_HOME" value="${catalina.home}"/>
-    </exec>
-  </target>
-
-  <target name="check-tomcat-running"><!--if you update this target, may want to change similar elements in config-admin-->
-    <!--can also try the "socket" condition in place of the "http" condition-->
-    <condition property="tomcat.isrunning"><!--<waitfor maxwait="5" maxwaitunit="second" timeoutproperty="tomcat.isstopped">-->
-      <http url="http://${tomcat.server}:${tomcat.port}${app.path}"/> <!--host:port/greenstone3-->
-    </condition><!--</waitfor>-->
-  </target>
-
-  <target name="stop-tomcat" description="Shutdown only Tomcat if running" depends="check-tomcat-running" if="tomcat.isrunning">
+      <arg line=">nul 2>&amp;1"/>
+    </exec>
+  </target>
+
+  <!-- Can also try the "socket" condition in place of the "http" condition 
+       And also use a <waitfor> in place of <condition>, such as:
+       <waitfor maxwait="5" maxwaitunit="second" timeoutproperty="tomcat.isstopped"><http url="..."/></waitfor>
+       The http URL resolves to host:port/greenstone3 -->
+  <target name="check-tomcat-running">
+    <condition property="tomcat.isrunning">
+      <http url="http://${tomcat.server}:${tomcat.port}${app.path}"/>
+    </condition>
+  </target>
+
+  <!--<target name="stop-tomcat" description="Shutdown only Tomcat if running" depends="check-tomcat-running" if="tomcat.isrunning">
      <antcall target="force-stop-tomcat"/>
-  </target>
-
+  </target>-->
 
   <target name="restart-tomcat" description="Shutdown and restart only Tomcat" depends="init,stop-tomcat,start-tomcat"/>
@@ -1216 +1225 @@
     See http://www.dcepler.net/post.cfm/hiding-password-input-in-ant 
     But you can do: echo mypassword | ant config-admin -->
-  <target name="update-userdb" description="Add or modify users">
-    <!-- stop tomcat if running, since derby db is embedded and only allows connections from one jvm instance at a time 
-      See http://db.apache.org/derby/papers/DerbyTut/embedded_intro.html -->
-    <!--<antcall target="check-tomcat-running"/>--><!--won't set the tomcat.isrunning property for use below-->
-    <condition property="tomcat.isrunning">
-      <http url="http://${tomcat.server}:${tomcat.port}${app.path}"/><!--can also try the "socket" condition in place of the "http" condition-->
-    </condition>
+  <target name="update-userdb" description="Add or modify users" depends="check-tomcat-running">
+
+    <!-- stop tomcat if running, since derby db is embedded and only allows connections from one jvm instance at a time
+     See http://db.apache.org/derby/papers/DerbyTut/embedded_intro.html
+     The ${tomcat.isrunning} property is set by the depends-target "check-tomcat-running" -->
     <if>
       <bool>
     <istrue value="${tomcat.isrunning}"/>
       </bool>
-      <antcall target="force-stop-tomcat"/>
+      <antcall target="stop-tomcat"/>
     </if>