You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2012/07/01 08:38:04 UTC
svn commit: r1355851 - in /river/jtsk/trunk: ./ dep-libs/dnsjava/
dep-libs/rc-libs/ netbeans/onebigjar/nbproject/ qa/
qa/src/com/sun/jini/qa/resources/
qa/src/com/sun/jini/test/impl/discoverymanager/
qa/src/com/sun/jini/test/impl/start/ qa/src/com/sun/...
Author: peter_firmstone
Date: Sun Jul 1 06:38:00 2012
New Revision: 1355851
URL: http://svn.apache.org/viewvc?rev=1355851&view=rev
Log:
Refactoring for release, clean up and review new public api, sanity check and remove unnecessary methods.
Added dnsjava name service provider to handle reverse dns lookup and to provide concurrent dns lookups.
Updated reference-collections, these were updated to avoid calling hashCode during initialisation of Timed references and temporary referrers, this helped reduced SocketPermission.hashCode calls that caused reverse lookups and recursive permission checks that cause stack overflow in the CombinerSecurityManager.
Two tests are failling due to a change to ConcurrentPolicyFile, now only privileged domains are returned by getPermissions(CodeSource) and all other instances are diverted to the java.security.Policy superclass which returns an empty PermissionCollection this is to avoid checking permissions twice.
Failing tests:
com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td
com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.td
Added:
river/jtsk/trunk/dep-libs/dnsjava/
river/jtsk/trunk/dep-libs/dnsjava/dnsjava-2.1.3.jar (with props)
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-javadoc.jar (with props)
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-sources.jar (with props)
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-test-sources.jar (with props)
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1.jar (with props)
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/securityprovider.properties
- copied, changed from r1355345, river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties
Removed:
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.0-javadoc.jar
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.0-sources.jar
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.0-test-sources.jar
river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.0.jar
Modified:
river/jtsk/trunk/build.xml
river/jtsk/trunk/common.xml
river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties
river/jtsk/trunk/qa/build.xml
river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/discoverymanager/BadDiscoveryListener.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td
Modified: river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Sun Jul 1 06:38:00 2012
@@ -528,6 +528,9 @@
<fileset refid="high-scale-lib.jars"/>
<fileset refid="reference-collections.jar"/>
</copy>
+ <copy todir="lib-ext">
+ <fileset refid="dnsjava.jar"/>
+ </copy>
</target>
<!-- The following two targets should no longer be necessary.
@@ -2181,14 +2184,14 @@
<mkdir dir="${test.classes.dir}"/>
<mkdir dir="${test.results.dir}"/>
<copy file="dep-libs/high-scale-lib/high-scale-lib.jar" todir="test/lib"/>
- <copy file="dep-libs/rc-libs/reference-collections-1.0.0.jar" todir="test/lib"/>
+ <copy file="dep-libs/rc-libs/reference-collections-1.0.1.jar" todir="test/lib"/>
</target>
<target name="clean-tests" depends="">
<delete dir="${test.classes.dir}" quiet="true"/>
<delete dir="${test.results.dir}" quiet="true"/>
<delete file="test/lib/high-scale-lib.jar" quiet="true"/>
- <delete file="test/lib/reference-collections-1.0.0.jar" quiet="true"/>
+ <delete file="test/lib/reference-collections-1.0.1.jar" quiet="true"/>
</target>
<target name="compile-tests" depends="compile,prep-tests">
Modified: river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/common.xml?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/common.xml (original)
+++ river/jtsk/trunk/common.xml Sun Jul 1 06:38:00 2012
@@ -139,7 +139,11 @@
</fileset>
<fileset id="reference-collections.jar" dir="${root}/dep-libs/rc-libs">
- <include name="reference-collections-1.0.0.jar" />
+ <include name="reference-collections-1.0.1.jar" />
+ </fileset>
+
+ <fileset id="dnsjava.jar" dir="${root}/dep-libs/dnsjava">
+ <include name="dnsjava-2.1.3.jar" />
</fileset>
Added: river/jtsk/trunk/dep-libs/dnsjava/dnsjava-2.1.3.jar
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/dep-libs/dnsjava/dnsjava-2.1.3.jar?rev=1355851&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/trunk/dep-libs/dnsjava/dnsjava-2.1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-javadoc.jar
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-javadoc.jar?rev=1355851&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-javadoc.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-sources.jar?rev=1355851&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-test-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-test-sources.jar?rev=1355851&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1-test-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1.jar
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1.jar?rev=1355851&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/trunk/dep-libs/rc-libs/reference-collections-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties (original)
+++ river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties Sun Jul 1 06:38:00 2012
@@ -34,13 +34,13 @@ file.reference.asm-3.2.jar=../../dep-lib
file.reference.asm-commons-3.2.jar=../../dep-libs/asm/asm-commons-3.2.jar
file.reference.asm-tree-3.2.jar=../../dep-libs/asm/asm-tree-3.2.jar
file.reference.high-scale-lib.jar=../../dep-libs/high-scale-lib/high-scale-lib.jar
-file.reference.reference-collections-1.0.0.jar=../../dep-libs/rc-libs/reference-collections-1.0.0.jar
+file.reference.reference-collections-1.0.1.jar=../../dep-libs/rc-libs/reference-collections-1.0.1.jar
file.reference.river-jstk-trunk-src=../../src
file.reference.velocity-1.7.jar=../../dep-libs/velocity/velocity-1.7.jar
includes=**
jar.compress=false
javac.classpath=\
- ${file.reference.reference-collections-1.0.0.jar}:\
+ ${file.reference.reference-collections-1.0.1.jar}:\
${file.reference.asm-3.2.jar}:\
${file.reference.asm-commons-3.2.jar}:\
${file.reference.asm-tree-3.2.jar}:\
Modified: river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/build.xml?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/build.xml (original)
+++ river/jtsk/trunk/qa/build.xml Sun Jul 1 06:38:00 2012
@@ -207,7 +207,7 @@
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
<file name="classserver.jar"/>
- <file name="reference-collections-1.0.0.jar"/>
+ <file name="reference-collections-1.0.1.jar"/>
<file name="high-scale-lib.jar"/>
</filelist>
</move>
@@ -216,7 +216,7 @@
errorproperty="jtreg.fail" failureproperty="jtreg.fail"
reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
jdk="${jdk.home}">
- <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar${path.separator}${jtlib.tmp}/jsk-lib.jar${path.separator}${jtlib.tmp}/jsk-platform.jar${path.separator}${jtlib.tmp}/jsk-resources.jar${path.separator}${jtlib.tmp}/phoenix-init.jar${path.separator}${jtlib.tmp}/tools.jar${path.separator}${jtlib.tmp}/classserver.jar${path.separator}${jtlib.tmp}/reference-collections-1.0.0.jar${path.separator}${jtlib.tmp}/high-scale-lib.jar"/>
+ <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar${path.separator}${jtlib.tmp}/jsk-lib.jar${path.separator}${jtlib.tmp}/jsk-platform.jar${path.separator}${jtlib.tmp}/jsk-resources.jar${path.separator}${jtlib.tmp}/phoenix-init.jar${path.separator}${jtlib.tmp}/tools.jar${path.separator}${jtlib.tmp}/classserver.jar${path.separator}${jtlib.tmp}/reference-collections-1.0.1.jar${path.separator}${jtlib.tmp}/high-scale-lib.jar"/>
<arg value="-timeout:8"/>
<!--<arg value="-Djsk.home=${river.home}"/>-->
<arg value="-Djtlib.tmp=${jtlib.tmp}"/>
@@ -253,7 +253,7 @@
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
<file name="classserver.jar"/>
- <file name="reference-collections-1.0.0.jar"/>
+ <file name="reference-collections-1.0.1.jar"/>
<file name="high-scale-lib.jar"/>
</filelist>
</move>
@@ -273,7 +273,7 @@
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
<file name="classserver.jar"/>
- <file name="reference-collections-1.0.0.jar"/>
+ <file name="reference-collections-1.0.1.jar"/>
<file name="high-scale-lib.jar"/>
</filelist>
</move>
@@ -337,7 +337,7 @@
<include name="jsk-platform.jar"/>
<include name="jsk-lib.jar"/>
<include name="high-scale-lib.jar"/>
- <include name="reference-collections-1.0.0.jar"/>
+ <include name="reference-collections-1.0.1.jar"/>
</fileset>
</classpath>
<env key="SOUL" value="${soul}"/>
Modified: river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties Sun Jul 1 06:38:00 2012
@@ -132,7 +132,7 @@ net.jini.space.JavaSpace.preparername=te
# For the shared activation group and its SharedGroupImpl
#
sharedGroup.type=group
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar
sharedGroup.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
sharedGroup.policyfile=<url:harness/policy/defaultsharedvm.policy>
sharedGroup.implPrefix=sharedGroupImpl
@@ -154,7 +154,7 @@ sharedGroupImpl.preparername=test.groupP
nonActivatableGroup.type=nonactivatablegroup
nonActivatableGroup.impl=com.sun.jini.qa.harness.NonActivatableGroupImpl
nonActivatableGroup.component=nonActivatableGroup
-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$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar
+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$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.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}
@@ -252,11 +252,11 @@ testPolicyfile=<url:harness/policy/defau
# The default classpath. This property must be defined, and must include
# all Jini dependencies as components
-testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar
+testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar
# Alternate test classpath, for tests that don't use <testJar>
#
-altClasspath=<harnessJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar
+altClasspath=<harnessJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar
#
# Services run with server vm; test runs with client vm
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/discoverymanager/BadDiscoveryListener.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/discoverymanager/BadDiscoveryListener.td?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/discoverymanager/BadDiscoveryListener.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/discoverymanager/BadDiscoveryListener.td Sun Jul 1 06:38:00 2012
@@ -2,3 +2,6 @@ testClass=com.sun.jini.test.impl.discove
testCategories=discoverymanager,discoverymanager_impl
include0=discoverymanager.properties
include1=com/sun/jini/test/share/reggie3_2.properties
+#testjvmargs=-Xdebug,\
+#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
+#${testjvmargs}
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td Sun Jul 1 06:38:00 2012
@@ -32,4 +32,4 @@ com.sun.jini.test.impl.start.ClassLoader
com.sun.jini.test.impl.start.ClassLoaderTest2.host=master
include0=start.properties
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar$:<file:lib/qa1-start-testservice-common.jar>
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar$:<file:lib/qa1-start-testservice-common.jar>
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td Sun Jul 1 06:38:00 2012
@@ -33,7 +33,7 @@ com.sun.jini.test.impl.start.ClasspathTe
com.sun.jini.test.impl.start.ClasspathTest2.host=master
// Shared group overrides
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar$:<file:lib/qa1-start-testservice-common.jar>
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar$:<file:lib/qa1-start-testservice-common.jar>
sharedGroup.codebase=http://${HOST}:${com.sun.jini.jsk.port}/create-dl.jar http://${HOST}:${com.sun.jini.test.port}/qa1-start-testservice-common-dl.jar
sharedGroup.policy=<url:harness/policy/all.policy>
include0=start.properties
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/BasicGrants.td Sun Jul 1 06:38:00 2012
@@ -6,7 +6,7 @@ com.sun.jini.qa.harness.runjiniserver=fa
FILEPOLICY01=<url: policyProviderGrant01.policy>
FILEPOLICY02=<url: policyProviderGrant02.policy>
FILEPOLICYUMBRELLA=<url: policyProviderUmbrellaGrant.policy>
-com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+com.sun.jini.qa.harness.securityproperties=<url: ./securityprovider.properties>
#testjvmargs=-Xdebug,\
#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
#${testjvmargs}
\ No newline at end of file
Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td?rev=1355851&r1=1355850&r2=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td Sun Jul 1 06:38:00 2012
@@ -6,7 +6,7 @@ com.sun.jini.qa.harness.runjiniserver=fa
FILEPOLICY01=<url: policyProviderGrant01.policy>
FILEPOLICY02=<url: policyProviderGrant02.policy>
FILEPOLICYUMBRELLA=<url: policyProviderUmbrellaGrant.policy>
-com.sun.jini.qa.harness.securityproperties=<url: ../securityprovider.properties>
+com.sun.jini.qa.harness.securityproperties=<url: ./securityprovider.properties>
#testjvmargs=-Xdebug,\
#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\
#${testjvmargs}
Copied: river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/securityprovider.properties (from r1355345, river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties)
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/securityprovider.properties?p2=river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/securityprovider.properties&p1=river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties&r1=1355345&r2=1355851&rev=1355851&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/securityprovider.properties Sun Jul 1 06:38:00 2012
@@ -1,4 +1,4 @@
# Java security properties file which overrides the harness supplied
-# file so that the MergedPolicyProvider is not used, which would interfere
-# with the correct operation of these tests
-#net.jini.security.policy.PolicyFileProvider.basePolicyClass=sun.security.provider.PolicyFile
\ No newline at end of file
+# file so that the ConcurrentPolicy is not used, which would interfere
+# with the correct operation of BasicGrants and UmbrellaGrants
+net.jini.security.policy.PolicyFileProvider.basePolicyClass=sun.security.provider.PolicyFile
\ No newline at end of file