Author: gtrasuk
Date: Fri Jan 22 04:07:58 2016
New Revision: 1726141
URL: http://svn.apache.org/viewvc?rev=1726141&view=rev
Log:
Apply Dan Rollo's patch to remove '-server' jvm arg from qaDefaults.properties.
Most modern JVMs default to '-server' on modern hardware, but some VM's like on
the
Raspberry Pi don't support the option, even though they otherwise run River
just fine.
Modified:
river/jtsk/trunk/qa/src/org/apache/river/qa/resources/qaDefaults.properties
Modified:
river/jtsk/trunk/qa/src/org/apache/river/qa/resources/qaDefaults.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/org/apache/river/qa/resources/qaDefaults.properties?rev=1726141&r1=1726140&r2=1726141&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/org/apache/river/qa/resources/qaDefaults.properties
(original)
+++ river/jtsk/trunk/qa/src/org/apache/river/qa/resources/qaDefaults.properties
Fri Jan 22 04:07:58 2016
@@ -137,7 +137,7 @@ sharedGroup.classpath=${org.apache.river
sharedGroup.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
sharedGroup.policyfile=<url:harness/policy/defaultsharedvm.policy>
sharedGroup.implPrefix=sharedGroupImpl
-sharedGroup.serverjvmargs=-server,${sharedGroup.serverjvmargs}
+sharedGroup.serverjvmargs=${sharedGroup.serverjvmargs}
sharedGroupImpl.type=activatable
sharedGroupImpl.impl=org.apache.river.start.SharedGroupImpl
@@ -158,7 +158,7 @@ nonActivatableGroup.component=nonActivat
nonActivatableGroup.classpath=${org.apache.river.qa.home}$/lib$/nonactivatablegroup.jar$:${org.apache.river.jsk.home}$/lib$/start.jar$:${org.apache.river.jsk.home}$/lib$/jsk-platform.jar$:${org.apache.river.jsk.home}$/lib$/custard-apple-1.0.3.jar$:${org.apache.river.jsk.home}$/lib$/high-scale-lib.jar
nonActivatableGroup.codebase=http://${HOST}:${org.apache.river.qa.port}/nonactivatablegroup-dl.jar
nonActivatableGroup.policyfile=<url:harness/policy/defaultnonactvm.policy>
-nonActivatableGroup.serverjvmargs=-server,${nonActivatableGroup.serverjvmargs}
+nonActivatableGroup.serverjvmargs=${nonActivatableGroup.serverjvmargs}
#
# For the VM killer - no preparer defined, since it always uses jeri - no
configuration files needed
@@ -182,7 +182,7 @@ activationSystem.codebase=http://${HOST}
activationSystem.serviceConfiguration=<url:harness/configs/<config>/phoenix/phoenix.config>
activationSystem.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
activationSystem.preparername=test.phoenixPreparer
-activationSystem.serverjvmargs=-server,${activationSystem.serverjvmargs}
+activationSystem.serverjvmargs=${activationSystem.serverjvmargs}
#
# for the JSK class server
