Changeset 26359 for main

Show
Ignore:
Timestamp:
18.10.2012 16:49:29 (7 years ago)
Author:
ak19
Message:

Sam fixed a bug in my previous commit of new fedora.MaxPermSize? ant property's usage.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r26357 r26359  
    8585 
    8686##This needs to be uncommented if using Fedora and Fedora GSearch with Greenstone's tomcat 
    87 #fedora.maxpermsize= -XX:MaxPermSize=128m 
     87#fedora.maxpermsize=-XX:MaxPermSize=128m 
    8888 
    8989##Web services related constants## 
  • main/trunk/greenstone3/build.xml

    r26357 r26359  
    10901090    <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 
    10911091    <property name="tomcat.path" refid="local.tomcat.path"/> 
    1092     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M ${fedora.maxpermsize}"/> 
     1092 
     1093    <if><bool> 
     1094    <isset property="fedora.maxpermsize"/></bool> 
     1095      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M ${fedora.maxpermsize}"/> 
     1096      <else> 
     1097    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> 
     1098      </else> 
     1099    </if> 
    10931100 
    10941101    <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo>