inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
92259: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92130: MNT-12951 Upgrade Java bundled in installers to 1.8.0_25


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:46:29 +00:00
parent bca95f01fa
commit fc9b9a6311
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
View File

@@ -87,10 +87,10 @@
<platformTest negate="1" type="windows-x64"/> <!--set to 1GB if it is Windows 32 -->
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="component(tomcat).parameter(tomcat_memory_settings_unix).value" value="-XX:MaxPermSize=256M -Xms512M -Xmx${java_xmx_setting}M"/>
<setInstallerVariable name="component(tomcat).parameter(tomcat_memory_settings_unix).value" value="-Xms512M -Xmx${java_xmx_setting}M"/>
<setInstallerVariable name="component(tomcat).parameter(tomcat_extra_opts_unix).value" value="-XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -Djava.awt.headless=true -Dalfresco.home=@@BITROCK_INSTALLDIR@@ -Dcom.sun.management.jmxremote -XX:ReservedCodeCacheSize=128m"/>
<setInstallerVariable name="component(tomcat).parameter(tomcat_extra_opts_windows).value">
<value>++JvmOptions="-XX:+DisableExplicitGC" ++JvmOptions="-XX:+UseConcMarkSweepGC" ++JvmOptions="-XX:+UseParNewGC" ++JvmOptions="-XX:ReservedCodeCacheSize=128m" ++JvmOptions="-Dalfresco.home=@@BITROCK_INSTALLDIR@@" ++JvmOptions="-Dcom.sun.management.jmxremote" ++JvmOptions="-XX:MaxPermSize=256m"</value>
<value>++JvmOptions="-XX:+DisableExplicitGC" ++JvmOptions="-XX:+UseConcMarkSweepGC" ++JvmOptions="-XX:+UseParNewGC" ++JvmOptions="-XX:ReservedCodeCacheSize=128m" ++JvmOptions="-Dalfresco.home=@@BITROCK_INSTALLDIR@@" ++JvmOptions="-Dcom.sun.management.jmxremote"</value>
</setInstallerVariable>
<setInstallerVariable name="component(tomcat).parameter(tomcat_memory_settings_windows).value">
<value>--JvmMs 512 --JvmMx ${java_xmx_setting}</value>