Changeset 22320

Timestamp:

2010-06-29T14:03:25+12:00 (14 years ago)

Author:

ak19

Message:

If using tomcat 6 and not 5, build.xml now automatically replaces the privilegedattribute placeholder with the privileged=true attribute in the Context element of the greenstone3.xml template file that's in the resources/tomcat folder.

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (2 diffs)
• resources/tomcat/greenstone3.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -89 +89 @@
     <equals arg1="1.4" arg2="${ant.java.version}"/>
   </condition>
-
-
+  <condition property="privileged.attribute" value="privileged='true'" else=""> 
+    <equals arg1="6" arg2="${tomcat.version.major}"/>
+  </condition>
 
   <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/>
@@ -803 +804 @@
       <filterset>
         <filter token="gsdl3webhome" value="${web.home}"/>
+    <filter token="privilegedattribute" value ="${privileged.attribute}"/>
       </filterset>
     </copy>

main/trunk/greenstone3/resources/tomcat/greenstone3.xml

@@ -5 +5 @@
   docBase="@gsdl3webhome@" 
   debug="1" reloadable="true" 
+  @privilegedattribute@
   allowLinking="false">
 </Context>