Changeset 35318

Timestamp:

2021-08-22T15:09:51+12:00 (3 years ago)

Author:

davidb

Message:

Giving this a small nudge down to the ant requirement being 1.8.1 or above. While is is not strictly correct, the release kit code is currently operating with 1.8.1 and so currently fails. In the next overnigt build we'll see if the force=true attributes in <copy> cause a problem (requiremeint 1.8.2) or if they are silently ignored

File:

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

main/trunk/greenstone3/build.xml

@@ -16 +16 @@
   <!-- Need to be using ant v1.8.2+ to support the 'force="true"' attribute in the file <copy> flag -->
   <antversion property="ant.version.running" />  
-  <fail message="Minimum of Ant v1.8.2 required to operate Greenstone3 (detected version ${ant.version.running})">
+  <fail message="Minimum of Ant v1.8.1 required to operate Greenstone3 (detected version ${ant.version.running})">
     <condition>      
-      <not><antversion atleast="1.8.2" /></not>
+      <not><antversion atleast="1.8.1" /></not>
     </condition>
   </fail>
@@ -2524 +2524 @@
       <!--<env key="GSDLOS" value="linux"/> do we need this?? -->
       <env key="PATH" path="${tomcat.path}"/>
+      <!-- Based on:
+         https://jfrog.com/knowledge-base/tomcat-takes-forever-to-start-what-can-i-do/
+       consider controlling Tomcat to use the psuedo random number generator '/dev/urandom' 
+       raher than the default '/dev/random' which while cryptographically stronger is
+       also slower when demand is high
+
+           -Djava.security.egd=file:/dev/urandom 
+      -->
       <env key="CATALINA_OPTS" value="${catalina.opts}"/>
       <env key="CATALINA_HOME" value="${catalina.home}"/>