Index: main/trunk/greenstone3/build.xml
===================================================================
--- main/trunk/greenstone3/build.xml (revision 25418)
+++ main/trunk/greenstone3/build.xml (revision 25420)
@@ -1113,5 +1113,5 @@
called stop-tomcat, now hides the Java exception output that appears whenever tomcat is already
stopped as happens when stop-tomcat is called consecutively. -->
-
+
@@ -1122,4 +1122,24 @@
+
+ Waiting for the server to shutdown...
+
+
+
+
+
+
+
+
+
+ WARNING: Checked socket 15 times, but port ${tomcat.port} still busy. Going to try to continue anyway...
+
+ Tomcat is stopped.
+
+
+
@@ -1127,5 +1147,8 @@
And also use a in place of , such as:
- The http URL resolves to host:port/greenstone3 -->
+ The http URL resolves to host:port/greenstone3
+ Condition uses rather than for testing, since if the server was stopped, the socket
+ might still be in use for some moments. We test the URL with the http condition since it's likelier to
+ fail sooner if the server has indeed been stopped. -->
@@ -1134,7 +1157,7 @@
-
+