Changeset 22320

Show
Ignore:
Timestamp:
29.06.2010 14:03:25 (10 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r22199 r22320  
    8989    <equals arg1="1.4" arg2="${ant.java.version}"/> 
    9090  </condition> 
    91  
    92  
     91  <condition property="privileged.attribute" value="privileged='true'" else="">  
     92    <equals arg1="6" arg2="${tomcat.version.major}"/> 
     93  </condition> 
    9394 
    9495  <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/> 
     
    803804      <filterset> 
    804805        <filter token="gsdl3webhome" value="${web.home}"/> 
     806    <filter token="privilegedattribute" value ="${privileged.attribute}"/> 
    805807      </filterset> 
    806808    </copy> 
  • main/trunk/greenstone3/resources/tomcat/greenstone3.xml

    r11289 r22320  
    55  docBase="@gsdl3webhome@"  
    66  debug="1" reloadable="true"  
     7  @privilegedattribute@ 
    78  allowLinking="false"> 
    89</Context>