Changeset 30723 for main/trunk

Timestamp:

2016-08-18T21:18:15+12:00 (8 years ago)

Author:

ak19

Message:

Fixing annoyingness: To avoid the CGI permissions error appearing continuously in the (localhost) log, need privileged=true set in the root context.xml file too, not just greenstone context file.

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (2 diffs)
• resources/tomcat/root_context.xml (added)

main/trunk/greenstone3/build.xml

@@ -1403 +1403 @@
       <unzip src="${packages.home}/${tomcat.version}.zip" 
         dest="${packages.home}"/>
-      
+      
       <!-- If we are using Java 1.4, we'd be using tomcat 5.5 in which case 
       we would need to have the tomcat compat package to work with Java 1.4-->
@@ -1420 +1420 @@
         <fileset dir="${packages.home}/${tomcat.version}"/>
       </move>
+      
+      <!-- To avoid the CGI permissions error appearing continuously in the (localhost) log, 
+        need privileged=true set in the root context.xml file too, not just greenstone context file -->
+      <!-- http://antelope.stage.tigris.org/nonav/docs/manual/bk03ch05s02.html -->
+      <if><bool><not><islessthan arg1="${tomcat.version.major}" arg2="7"/></not></bool>     
+        <copy file="${basedir}/resources/tomcat/root_context.xml" tofile="${packages.home}/tomcat/conf/context.xml" overwrite="true" />     
+      </if>
+        
+      
       <!--
       <copy file="${basedir}/resources/tomcat/setclasspath.bat"