Changeset 35320

Timestamp:

2021-08-23T13:56:36+12:00 (3 years ago)

Author:

davidb

Message:

Curently removed using 'force=true' from <copy> element, as release kit is using ant v.1.8.1, however this attribute is not supported until v1.8.2

File:

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

main/trunk/greenstone3/build.xml

@@ -14 +14 @@
   -->
 
-  <!-- Need to be using ant v1.8.2+ to support the 'force="true"' attribute in the file <copy> flag -->
+  <!-- Need to increase minimum ant version to be v1.8.2, to support the 'force="true"' attribute in the file <copy> flag.
+       This change is needed to allow running Greenstone3 as a service as another user (e.g. user=www=data).
+       Not currently able to do this, as the release kit is currently using v1.8.1 and so fails if the value below 
+       is changed to 1.8.2.
+  --> 
   <antversion property="ant.version.running" />  
   <fail message="Minimum of Ant v1.8.1 required to operate Greenstone3 (detected version ${ant.version.running})">
@@ -1761 +1765 @@
     <filter token="disable.collection.building" value="${disable.collection.building}"/>
     <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/>
-    <copy file="${basedir}/resources/web/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true" force="true"/>
-    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true" force="true"/>
+    <copy file="${basedir}/resources/web/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/>
     <if>
       <bool><istrue value="${gsdl3home.isreadonly}"/></bool>
@@ -1771 +1775 @@
     <chmod file="${web.writableclasses}/log4j.properties" perm="664"/>
 
-    <copy file="${basedir}/resources/iiif/cantaloupe.properties.in" tofile="${basedir}/cantaloupe.properties" filtering="true" overwrite="true" force="true"/>
+    <copy file="${basedir}/resources/iiif/cantaloupe.properties.in" tofile="${basedir}/cantaloupe.properties" filtering="true" overwrite="true"/>
     <chmod file="${basedir}/cantaloupe.properties" perm="664"/>
   </target>
@@ -2439 +2443 @@
     </exec>
 
-    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true" force="true">
+    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true">
       <filterset>
     <filter token="solr.context" value="${solr.context}"/>
@@ -2452 +2456 @@
         <copy file="${basedir}/resources/tomcat/greenstone3.xml.in" tofile="${basedir}/resources/tomcat/${greenstone.context}.xml.in" overwrite="true"/>
     </if>
-    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true" force="true">
+    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true">
       <filterset>
         <filter token="gsdl3webhome" value="${web.home}"/>