Changeset 26359

Timestamp:

2012-10-18T16:49:29+13:00 (11 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:

• build.properties.in (modified) (1 diff)
• build.xml (modified) (1 diff)

main/trunk/greenstone3/build.properties.in

@@ -85 +85 @@
 
 ##This needs to be uncommented if using Fedora and Fedora GSearch with Greenstone's tomcat
-#fedora.maxpermsize= -XX:MaxPermSize=128m
+#fedora.maxpermsize=-XX:MaxPermSize=128m
 
 ##Web services related constants##

main/trunk/greenstone3/build.xml

@@ -1090 +1090 @@
     <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     <property name="tomcat.path" refid="local.tomcat.path"/>
-    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M ${fedora.maxpermsize}"/>
+
+    <if><bool>
+    <isset property="fedora.maxpermsize"/></bool>
+      <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M ${fedora.maxpermsize}"/>
+      <else>
+    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
+      </else>
+    </if>
 
     <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo>