Changeset 25095

Show
Ignore:
Timestamp:
20.02.2012 13:45:18 (8 years ago)
Author:
sjm84
Message:

build.xml will now add in classpath information for tomcat

Files:
1 modified

Legend:

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

    r24868 r25095  
    483483    <fileset dir="${lib.jni}"> 
    484484      <include name="*.jar"/> 
     485    </fileset> 
     486     
     487    <pathelement location="${web.lib}"/> 
     488    <fileset dir="${web.lib}"> 
     489      <include name="derby.jar"/> 
    485490    </fileset> 
    486491  </path> 
     
    10421047    <property name="tomcat.path" refid="local.tomcat.path"/> 
    10431048    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> 
     1049 
     1050    <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo> 
     1051    <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo> 
     1052     
    10441053    <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 
    10451054      <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 
     
    10531062      <env key="WNHOME" path="${wn.home}"/> 
    10541063    </exec> 
    1055     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true"> 
     1064    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"> 
    10561065      <env key="GSDLOS" value="windows"/> 
    10571066      <env key="GSDL3HOME" value="${basedir}"/>