svn commit: r1826377 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ README.md build.gradle

[mbrohl]

Author: mbrohl
Date: Fri Mar  9 20:53:14 2018
New Revision: 1826377

URL: http://svn.apache.org/viewvc?rev=1826377&view=rev
Log:
Applied fix from trunk for revision: 1826374
===

Improved: Pass JVM options to OFBiz when using Gradle.
(OFBIZ-10253)

This enables passing JVM options like memory, garbage collection or JMX
configurations to the OFBiz VM. Falls back to the previously hard coded
default if not set.

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/README.md
    ofbiz/ofbiz-framework/branches/release17.12/build.gradle

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 20:53:14 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374

Modified: ofbiz/ofbiz-framework/branches/release17.12/README.md
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/README.md?rev=1826377&r1=1826376&r2=1826377&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/README.md (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/README.md Fri Mar  9 20:53:14 2018
@@ -273,6 +273,14 @@ You can also offset the port, for exampl
 
 `gradlew "ofbizBackground --start --portoffset 10000"`
 
+#### Passing JVM runtime options to OFBiz
+
+You can pass JVM runtime options by specifying the project property `-PjvmArgs`.
+
+`gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx2048M" -Dsome.parameter=hello`
+
+If you do not specify `jvmArgs`, a default of `-Xms128M -Xmx1024M` is set.
+
 * * * * * * * * * * * *
 
 ### Data loading tasks

Modified: ofbiz/ofbiz-framework/branches/release17.12/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/build.gradle?rev=1826377&r1=1826376&r2=1826377&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/build.gradle (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/build.gradle Fri Mar  9 20:53:14 2018
@@ -42,7 +42,10 @@ ext.os = System.getProperty('os.name').t
 ext.pluginsDir = "${rootDir}/plugins"
 
 // java settings
-def jvmArguments = ['-Xms128M', '-Xmx1024M']
+List jvmArguments = ['-Xms128M', '-Xmx1024M']
+if (project.hasProperty('jvmArgs')) {
+    jvmArguments = jvmArgs.tokenize()
+}
 ext.ofbizMainClass = 'org.apache.ofbiz.base.start.Start'
 javadoc.failOnError = true
 sourceCompatibility = '1.8'