Changeset 25321 for main/trunk/greenstone3/build.xml

Timestamp:

2012-03-30T20:00:47+13:00 (12 years ago)

Author:

ak19

Message:

1. added force-stop-tomcat target which does what the old stop-tomcat target did. The current stop-tomcat target calls force-stop-tomcat only if tomcat is already running. 2. The config-admin target is modified to also test for an already running tomcat and only stops and restarts it in such a case.

File:

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

main/trunk/greenstone3/build.xml

@@ -1108 +1108 @@
   <!-- windows: do we want to launch a webrowser?? -->
   <!-- shouldn't this test whether anything is running first? -->
-  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
+  <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="CATALINA_HOME" value="${catalina.home}"/>
@@ -1116 +1116 @@
     </exec>
   </target>
+
+  <target name="check-tomcat-running">
+    <!--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">
+     <antcall target="force-stop-tomcat"/>
+  </target>
+
 
   <target name="restart-tomcat" description="Shutdown and restart only Tomcat" depends="init,stop-tomcat,start-tomcat"/>
@@ -1223 +1235 @@
       <handler classname="org.apache.tools.ant.input.SecureInputHandler" /> <!-- password won't be visible on screen -->
     </input>
-    <antcall target="stop-tomcat"/>
+
+    <!-- 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>
+    <if>
+      <bool>
+    <istrue value="${tomcat.isrunning}"/>
+      </bool>
+      <antcall target="force-stop-tomcat"/>
+    </if>
+
     <!--<echo>${admin.password}</echo>--> <!-- for testing -->
     <java classname="org.greenstone.gsdl3.util.ChangePwdUsersDB">
@@ -1231 +1257 @@
       <arg value="${admin.password}"/>
     </java>
-    <antcall target="start-tomcat"/>
+
+    <!-- run tomcat again if it used to be running -->
+    <if>
+      <bool>
+    <istrue value="${tomcat.isrunning}"/>
+    </bool>
+      <antcall target="start-tomcat"/>
+    </if>
   </target>