Author: gtrasuk
Date: Mon Jan 4 09:15:05 2016
New Revision: 1722810
URL: http://svn.apache.org/viewvc?rev=1722810&view=rev
Log:
Update qaDefaults.properties to remove the server/client jvm options on the
jvms used in running the QA tests.
In 2.2.2 and earlier, Services run with server vm; test runs with client vm
However, nowadays its probably best to just let the JVM figure it out.
Most modern machines default to server, while some limited machines like
Raspberry pi don't support '-server'.
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1722810&r1=1722809&r2=1722810&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
Mon Jan 4 09:15:05 2016
@@ -136,7 +136,7 @@ sharedGroup.classpath=${com.sun.jini.jsk
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=com.sun.jini.start.SharedGroupImpl
@@ -157,7 +157,7 @@ nonActivatableGroup.component=nonActivat
nonActivatableGroup.classpath=${com.sun.jini.qa.home}$/lib$/nonactivatablegroup.jar$:${com.sun.jini.jsk.home}$/lib$/start.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar
nonActivatableGroup.codebase=http://${HOST}:${com.sun.jini.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
@@ -181,7 +181,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
@@ -252,12 +252,15 @@ testPolicyfile=<url:harness/policy/defau
testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar
#
-# Services run with server vm; test runs with client vm
+# In 2.2.2 and earlier, Services run with server vm; test runs with client vm
+# However, nowadays its probably best to just let the JVM figure it out.
+# Most modern machines default to server, while some limited machines like
+# Raspberry pi don't support '-server'.
#
# Arguments are comma separated. To embed a comma in
# an argument, use "+,".
#
-testjvmargs=-client,${testjvmargs}
+testjvmargs=${testjvmargs}
#
# defined for historical reasons.
