Show
Ignore:
Timestamp:
22.02.2012 15:24:15 (8 years ago)
Author:
sjm84
Message:

Second commit upgrading from tomcat 6 to tomcat 7

Files:
1 modified

Legend:

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

    r25095 r25131  
    8383  <!-- version properties for external packages --> 
    8484  <!-- for Java versions < 1.4, we print out the message that Java is too old. 
    85     For Java 1.4, we use Tomcat 5.5, for Java5 and higher, we use Tomcat 6.0--> 
    86   <condition property="tomcat.version" value="apache-tomcat-5.5.25" else="apache-tomcat-6.0.20">  
     85    For Java 1.4, we use Tomcat 5.5, for Java5 and higher, we use Tomcat 7.0--> 
     86  <condition property="tomcat.version" value="apache-tomcat-5.5.25" else="apache-tomcat-7.0.26">  
    8787    <equals arg1="1.4" arg2="${ant.java.version}"/> 
    8888  </condition> 
    89   <condition property="tomcat.version.major" value="5" else="6">  
     89  <condition property="tomcat.version.major" value="5" else="7">  
    9090    <equals arg1="1.4" arg2="${ant.java.version}"/> 
    9191  </condition> 
     
    145145    </and> 
    146146  </condition> 
    147    
     147  
    148148  <property name="os.linux" value="Linux"/>  
    149149  <property name="os.mac" value="Mac OS X"/> 
     
    442442  </path> 
    443443   
    444   <!-- All elements that Tomcat 6 exposes to applications --> 
    445   <path id="tomcat6"> 
     444  <!-- All elements that Tomcat 7 exposes to applications --> 
     445  <path id="tomcat7"> 
    446446    <fileset dir="${catalina.home}/lib"> 
    447447      <include name="*.jar"/> 
     
    731731    <!-- 
    732732    the next block checks if the bundled tomcat is present in the 'packages' directory, 
    733     and checks for the lethal combination of tomcat 6 and java 1.4. Test for 
     733    and checks for the lethal combination of tomcat 7 and java 1.4. Test for 
    734734    tomcat6 is based on the presence of a file inserted by greenstone into the tomcat6 
    735735    download, as there is no other surefire way to check tomcat version under java 1.4 
     
    738738      <available file="packages/tomcat"/> 
    739739    </condition> 
    740     <condition property="packages.tomcat.istomcat6" value="true" else="false"> 
    741       <available file="packages/tomcat/tomcat6.txt"/> 
     740    <condition property="packages.tomcat.istomcat7" value="true" else="false"> 
     741      <available file="packages/tomcat/tomcat7.txt"/> 
    742742    </condition> 
    743743    <if> 
     
    745745        <and> 
    746746          <istrue value="${packages.tomcat.ispresent}"/> 
    747           <istrue value="${packages.tomcat.istomcat6}"/> 
     747          <istrue value="${packages.tomcat.istomcat7}"/> 
    748748          <equals arg1="1.4" arg2="${ant.java.version}"/> 
    749749        </and> 
     
    955955   
    956956  <!-- this target downloads and installs Tomcat --> 
    957   <!-- we download tomcat (version 6 for Java 1.5 and later, version 5 for Java 1.4 plus the 1.4 compatibility package). --> 
     957  <!-- we download tomcat (version 7 for Java 1.5 and later, version 5 for Java 1.4 plus the 1.4 compatibility package). --> 
    958958  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal" 
    959     description="downloads the appropriate version of Tomcat (Tomcat 5 if using Java 1.4, Tomcat 6 if using Java 1.5 or higher). If you want to change which version of Java you are using between 1.4 and 1.5/6 then you need to run prepare-tomcat"> 
    960     <if> 
     959    description="downloads the appropriate version of Tomcat (Tomcat 5 if using Java 1.4, Tomcat 7 if using Java 1.5 or higher). If you want to change which version of Java you are using between 1.4 and 1.5/7 then you need to run prepare-tomcat"> 
     960  <if> 
    961961      <bool> 
    962962        <not><available file="${packages.home}/tomcat/.flagfile"/></not> 
     
    987987        <fileset dir="${packages.home}/${tomcat.version}"/> 
    988988      </move> 
     989       
    989990      <copy file="${basedir}/resources/tomcat/setclasspath.bat" 
    990991        tofile="${packages.home}/tomcat/bin/setclasspath.bat" 
     
    993994        tofile="${packages.home}/tomcat/bin/setclasspath.sh" 
    994995        overwrite="true"/> 
     996 
    995997      <!-- make sure we have execute permission for the .sh files --> 
    996998      <chmod dir="${packages.home}/tomcat/bin" perm="ugo+rx"  
     
    13461348    description="Compile only the Greenstone core"> 
    13471349    <mkdir dir="${build.home}"/> 
     1350     
    13481351    <if><bool><isset property="with.jni"/></bool> 
    13491352    <javac srcdir="${src.home}"