Index: /main/trunk/greenstone3/build.xml
===================================================================
--- /main/trunk/greenstone3/build.xml (revision 32337)
+++ /main/trunk/greenstone3/build.xml (revision 32338)
@@ -128,6 +128,4 @@
https://stackoverflow.com/questions/113224/what-is-the-largest-tcp-ip-network-port-number-allowable-for-ipv4
-->
-
@@ -147,10 +145,8 @@
- ERROR: Unable to set tomcat.port.
+ ERROR: Unable to set tomcat.port.
In file build.properties server.protocol=${server.protocol} and requires at minimum that its
matching tomcat.port.${server.protocol} property line be set and is assigned a valid port number.
- (Ensure any other enabled tomcat port is valid too)
-
-
+ (Ensure any other enabled tomcat port is valid too)
@@ -160,5 +156,4 @@
-
-
-
-
- ERROR: no tomcat port, so tomcat operations won't proceed.
- tomcat.${server.protocol}.port is not set or not valid.
- Correct this in build.properties.
-
-
-
@@ -1416,5 +1400,5 @@
-
@@ -1586,5 +1570,5 @@
-
+
-
+
@@ -1733,5 +1717,5 @@
-
+
@@ -1787,5 +1771,5 @@
-
+
@@ -1794,5 +1778,5 @@
-
+
@@ -1827,5 +1811,5 @@
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. -->
-
+
@@ -1855,5 +1839,5 @@
both stop and start, both of which need to do tomcat checks. Each property can be set only once during
an invocation with ant. So ant restart will need two properties to store each of the tomcat checks -->
-
+
@@ -2147,5 +2131,5 @@
-
@@ -2160,5 +2144,5 @@
-
@@ -2178,5 +2162,5 @@
-
@@ -3489,5 +3473,5 @@
-
+
The testing extension is not available. This is required to perform the tests. It can be acquired from SVN by running the command "svn co http://svn.greenstone.org/gs3-extensions/testing/trunk/src testing" in the ext directory of your Greenstone 3 installation.