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/02/10 12:53:36 UTC
svn commit: r1242750 [1/5] - in /river/jtsk/trunk: ./ asm/ qa/ qa/doc/
qa/harness/policy/ qa/harness/trust/ qa/jtreg/certs/ qa/jtreg/certs/keys/
qa/jtreg/net/jini/jeri/ssl/UnitTests/
qa/jtreg/net/jini/jeri/tcp/localHostExposure/ qa/jtreg/net/jini/jeri/...
Author: peter_firmstone
Date: Fri Feb 10 11:53:29 2012
New Revision: 1242750
URL: http://svn.apache.org/viewvc?rev=1242750&view=rev
Log:
River-323 Merge of skunk/peterConcurrentPolicy with trunk
Added:
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca.cert
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca.cert
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca.key
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca.key
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca.properties
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca.properties
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca1.cert
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca1.cert
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca1.key
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca1.key
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca1.properties
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/ca1.properties
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2.chain
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2.chain
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2.request
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2.request
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2expired.chain
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2expired.chain
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2expired.properties
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2expired.properties
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2expired.request
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/clientDSA2expired.request
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2.chain
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2.chain
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2.request
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2.request
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2expired.chain
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2expired.chain
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2expired.properties
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2expired.properties
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2expired.request
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/net/jini/jeri/ssl/UnitTests/serverRSA2expired.request
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/securityexceptionconstructornoaccessclass.properties
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/securityexceptionconstructornoaccessclass.properties
river/jtsk/trunk/src/net/jini/loader/pref/CodeSourceWithPermissionsRequired.java
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/loader/pref/CodeSourceWithPermissionsRequired.java
river/jtsk/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/net/jini/security/policy/DynamicPolicyProvider.java
river/jtsk/trunk/test/lib/imunit-1.3.jar
- copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/lib/imunit-1.3.jar
Removed:
river/jtsk/trunk/test/lib/MultithreadedTC-1.01.jar
river/jtsk/trunk/test/src/com/sun/jini/outrigger/FastListTest.java
Modified:
river/jtsk/trunk/ (props changed)
river/jtsk/trunk/asm/asm-3.2.jar (props changed)
river/jtsk/trunk/asm/asm-commons-3.2.jar (props changed)
river/jtsk/trunk/build.xml
river/jtsk/trunk/common.xml
river/jtsk/trunk/qa/ (props changed)
river/jtsk/trunk/qa/README.txt (props changed)
river/jtsk/trunk/qa/build.xml
river/jtsk/trunk/qa/doc/HowToRunATest.html (props changed)
river/jtsk/trunk/qa/doc/HowToWriteATest.html (props changed)
river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc (props changed)
river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html (props changed)
river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc (props changed)
river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html (props changed)
river/jtsk/trunk/qa/doc/discoverymanagement-req.doc (props changed)
river/jtsk/trunk/qa/doc/discoverymanagement-req.html (props changed)
river/jtsk/trunk/qa/doc/discoverymanagement-test.doc (props changed)
river/jtsk/trunk/qa/doc/discoverymanagement-test.html (props changed)
river/jtsk/trunk/qa/doc/discoveryservice-req.doc (props changed)
river/jtsk/trunk/qa/doc/discoveryservice-req.html (props changed)
river/jtsk/trunk/qa/doc/discoveryservice-test.doc (props changed)
river/jtsk/trunk/qa/doc/discoveryservice-test.html (props changed)
river/jtsk/trunk/qa/doc/eventmailbox-req.doc (props changed)
river/jtsk/trunk/qa/doc/eventmailbox-req.html (props changed)
river/jtsk/trunk/qa/doc/eventmailbox-test.doc (props changed)
river/jtsk/trunk/qa/doc/eventmailbox-test.html (props changed)
river/jtsk/trunk/qa/doc/index-requirements.html (props changed)
river/jtsk/trunk/qa/doc/index-testdescriptions.html (props changed)
river/jtsk/trunk/qa/doc/index.html (props changed)
river/jtsk/trunk/qa/doc/javaspace_req.html (props changed)
river/jtsk/trunk/qa/doc/javaspace_test.html (props changed)
river/jtsk/trunk/qa/doc/joinmanager-req.doc (props changed)
river/jtsk/trunk/qa/doc/joinmanager-req.html (props changed)
river/jtsk/trunk/qa/doc/joinmanager-test.doc (props changed)
river/jtsk/trunk/qa/doc/locatordiscovery-req.doc (props changed)
river/jtsk/trunk/qa/doc/locatordiscovery-req.html (props changed)
river/jtsk/trunk/qa/doc/locatordiscovery-test.doc (props changed)
river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc (props changed)
river/jtsk/trunk/qa/doc/lookupdiscovery-req.html (props changed)
river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc (props changed)
river/jtsk/trunk/qa/doc/qaMethodWorkArch.html (props changed)
river/jtsk/trunk/qa/doc/qaarch.sdw (props changed)
river/jtsk/trunk/qa/doc/renewalmanager-req.doc (props changed)
river/jtsk/trunk/qa/doc/renewalmanager-req.html (props changed)
river/jtsk/trunk/qa/doc/renewalservice-req.doc (props changed)
river/jtsk/trunk/qa/doc/renewalservice-req.html (props changed)
river/jtsk/trunk/qa/doc/renewalservice-test.doc (props changed)
river/jtsk/trunk/qa/doc/renewalservice-test.html (props changed)
river/jtsk/trunk/qa/doc/servicediscovery-req.doc (props changed)
river/jtsk/trunk/qa/doc/servicediscovery-req.html (props changed)
river/jtsk/trunk/qa/doc/servicediscovery-test.doc (props changed)
river/jtsk/trunk/qa/doc/servicediscovery-test.html (props changed)
river/jtsk/trunk/qa/doc/testcategories.doc (props changed)
river/jtsk/trunk/qa/doc/testcategories.html (props changed)
river/jtsk/trunk/qa/harness/policy/defaultsharedvm.policy
river/jtsk/trunk/qa/harness/policy/defaulttest.policy
river/jtsk/trunk/qa/harness/policy/qa.policy
river/jtsk/trunk/qa/harness/trust/dynamic-policy.properties
river/jtsk/trunk/qa/jtreg/certs/ (props changed)
river/jtsk/trunk/qa/jtreg/certs/CA.java
river/jtsk/trunk/qa/jtreg/certs/Makefile
river/jtsk/trunk/qa/jtreg/certs/keys/test-ca1.cert
river/jtsk/trunk/qa/jtreg/certs/keys/test-ca1.key
river/jtsk/trunk/qa/jtreg/certs/keys/test-ca2.cert
river/jtsk/trunk/qa/jtreg/certs/keys/test-ca2.key
river/jtsk/trunk/qa/jtreg/certs/run-ca.sh
river/jtsk/trunk/qa/jtreg/certs/test-ca1.properties
river/jtsk/trunk/qa/jtreg/certs/test-ca2.properties
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/TestRMI.java
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/TestUtilities.java
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/keystore
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/keystore.sh
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/policy
river/jtsk/trunk/qa/jtreg/net/jini/jeri/ssl/UnitTests/truststore
river/jtsk/trunk/qa/jtreg/net/jini/jeri/tcp/localHostExposure/TestNameService.java
river/jtsk/trunk/qa/jtreg/net/jini/jeri/transport/multihomed/TestNameService.java
river/jtsk/trunk/qa/jtreg/net/jini/security/Security/implicitGrants/Test.java
river/jtsk/trunk/qa/jtreg/net/jini/security/Security/implicitGrants/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/basePolicyNotFound/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/domainCaching/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/dynamicBasePolicy/Test.java
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/dynamicBasePolicy/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/nullCases/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/principalGrants/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/DynamicPolicyProvider/selfGrants/policy.0
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basePolicyNotFound/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basicGrants/policy.0
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/nullCases/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/umbrellaGrants/policy
river/jtsk/trunk/qa/jtreg/net/jini/security/porter/policy
river/jtsk/trunk/qa/jtreg/unittestlib/BasicTest.java
river/jtsk/trunk/qa/jtreg/unittestlib/UnitTestUtilities.java
river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/MasterTest.java
river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/MergedPolicyProvider.java
river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/QATest.java
river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/TestDescription.java
river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/reggie/NameServiceImpl.java
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/impl/start/CodebaseTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadTransientServiceTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/CheckContextAction.java
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.sharedgroup.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice1.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/securityTest.testservice2.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement_NoContext.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/https/HttpsRobustnessTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/jeri/transport/resources/ssl.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoConnectToCodebase.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoGetClassLoader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoConnectToCodebase.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoGetClassLoader.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/MultipleEvntLeaseRenewals.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrDel.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/lookupservice/test_set02/NotifyOnAttrSet.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/DynamicPolicyProviderTestBase.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase01.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantNoPrincipalCase02.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/GrantPrincipal.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/RefreshNoPrincipal.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructor.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/SecurityExceptionConstructorNoAccessClass.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant02.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderUmbrellaGrant.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant01.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrant02.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoAccessClass.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderNoGetProperty.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderUmbrellaGrant.policy
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/SecurityExceptionConstructor.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/UmbrellaGrants.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant02.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrantAll.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant02.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoAccessClass.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderNoGetProperty.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderUmbrellaGrant.policy
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/securityprovider.properties
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/policyprovider/util/Util.java
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedExceptionTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedTest.td
river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/security.policy
river/jtsk/trunk/src-doc/static/build.html
river/jtsk/trunk/src/com/sun/jini/collection/WeakKeyReference.java
river/jtsk/trunk/src/com/sun/jini/jeri/internal/mux/Session.java
river/jtsk/trunk/src/com/sun/jini/outrigger/FastList.java
river/jtsk/trunk/src/com/sun/jini/resource/Service.java
river/jtsk/trunk/src/com/sun/jini/start/AggregatePolicyProvider.java
river/jtsk/trunk/src/com/sun/jini/start/LoaderSplitPolicyProvider.java
river/jtsk/trunk/src/com/sun/jini/start/SharedActivationPolicyPermission.java
river/jtsk/trunk/src/com/sun/jini/thread/ThreadPool.java
river/jtsk/trunk/src/manifest/jsk-dl/META-INF/PREFERRED.LIST
river/jtsk/trunk/src/net/jini/config/ConfigurationProvider.java
river/jtsk/trunk/src/net/jini/export/ServerContext.java
river/jtsk/trunk/src/net/jini/jeri/BasicInvocationDispatcher.java
river/jtsk/trunk/src/net/jini/jeri/BasicObjectEndpoint.java
river/jtsk/trunk/src/net/jini/jeri/ssl/AuthManager.java
river/jtsk/trunk/src/net/jini/jeri/ssl/HttpsEndpoint.java
river/jtsk/trunk/src/net/jini/jeri/ssl/ServerAuthManager.java
river/jtsk/trunk/src/net/jini/jeri/ssl/SslConnection.java
river/jtsk/trunk/src/net/jini/jeri/ssl/SslEndpointImpl.java
river/jtsk/trunk/src/net/jini/jeri/ssl/SslServerEndpointImpl.java
river/jtsk/trunk/src/net/jini/jeri/tcp/TcpServerEndpoint.java
river/jtsk/trunk/src/net/jini/loader/pref/PreferredClassLoader.java
river/jtsk/trunk/src/net/jini/lookup/ServiceDiscoveryManager.java
river/jtsk/trunk/src/net/jini/security/GrantPermission.java
river/jtsk/trunk/src/net/jini/security/Security.java
river/jtsk/trunk/src/net/jini/security/SecurityContext.java
river/jtsk/trunk/src/net/jini/security/policy/PolicyFileProvider.java
river/jtsk/trunk/src/net/jini/url/httpmd/Handler.java
river/jtsk/trunk/test/src/net/jini/core/event/RemoteEventTest.java
river/jtsk/trunk/test/src/net/jini/security/GrantPermissionTest.java
Propchange: river/jtsk/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 10 11:53:29 2012
@@ -1,16 +1,14 @@
classes
-LICENSE.txt
-River-149-patch-final.diff
-River-149-patch.diff
-build
-.*
-lib-dl
lib-ext
-lib
build.properties
-doc
deps
configentry
nbproject
-NOTICE.txt
+build
+.*
+lib-dl
+lib
dist
+doc
+LICENSE.txt
+NOTICE.txt
Propchange: river/jtsk/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters:765902-766476
+/river/jtsk/skunk/peterConcurrentPolicy:1137883-1242503
Propchange: river/jtsk/trunk/asm/asm-3.2.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/tools/asm-3.2.jar:765902-766476
+/river/jtsk/skunk/peterConcurrentPolicy/asm/asm-3.2.jar:1137883-1242503
Propchange: river/jtsk/trunk/asm/asm-commons-3.2.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/tools/asm-commons-3.2.jar:765902-766476
+/river/jtsk/skunk/peterConcurrentPolicy/asm/asm-commons-3.2.jar:1137883-1242503
Modified: river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Fri Feb 10 11:53:29 2012
@@ -468,14 +468,17 @@
browser.jars" />
<target name="river.jars" depends="stubs,
- jini-core.jar,
- jini-ext.jar,
jsk-dl.jar,
jsk-lib.jar,
jsk-resources.jar,
jsk-platform.jar,
- jsk-policy.jar,
- sun-util.jar" />
+ jsk-policy.jar" />
+
+ <!-- old river.jars entrys deprecated removed.
+ jini-core.jar,
+ jini-ext.jar,
+ sun-util.jar
+ -->
<target name="services.jars" depends="toolswrappers.jars,
destroy.jar,
@@ -498,10 +501,13 @@
phoenix-init.jar,
reggie.jar,
reggie-dl.jar,
- sdm-dl.jar,
serviceui.jar,
sharedvm.jar,
start.jar" />
+
+ <!-- Old services.jars
+ sdm-dl.jar,
+ -->
<target name="browser.jars" depends="services.jars,
browser.jar,
@@ -518,9 +524,11 @@
<target name="copy-extlibs" >
<copy todir="lib">
<fileset refid="asm.jars"/>
+ <fileset refid="high-scale-lib.jars"/>
</copy>
</target>
+ <!-- The following two targets should no longer be necessary.
<target name="install-policy"
description="Installs jsk-policy.jar into the JRE extensions directory.">
<copy file="${lib-ext.dir}/jsk-policy.jar" todir="${jre.ext.dir}"/>
@@ -529,12 +537,13 @@
<target name="uninstall-policy"
description="Removes jsk-policy.jar from the JRE extensions directory.">
<delete file="${jre.ext.dir}/jsk-policy.jar"/>
- </target>
+ </target>-->
<target name="stubs" description="Generate stubs"
- depends="compile, browser.stubs, fiddler.stubs, mahalo.stubs,
+ depends="compile, phoenix.stubs, start.stubs">
+ <!-- , browser.stubs, fiddler.stubs, mahalo.stubs,
mercury.stubs, norm.stubs, outrigger.stubs, phoenix.stubs,
- reggie.stubs, sdm.stubs, start.stubs">
+ reggie.stubs, sdm.stubs, start.stubs">-->
</target>
<target name="clean" depends="clean-dist, clean-jars, doc-clean"
@@ -692,41 +701,6 @@
</fileset>
</jar>
</target>
-
- <!--
- Deprecated since 2.1 - Scheduled for removal (RIVER-365)
- -->
- <target name="jini-core.jar" depends="stubs">
- <jar destfile="${lib.dir}/jini-core.jar" index="false">
- <fileset dir="${build.classes.dir}"
- includes="net/jini/core/**"/>
- </jar>
- </target>
-
- <!--
- Deprecated since 2.1 - Scheduled for removal (RIVER-365)
- -->
- <target name="jini-ext.jar" depends="stubs">
- <property name="jini-ext.deps" location="${build.deps.dir}/jini-ext.deps"/>
- <classdep output="${jini-ext.deps}"
- classpathref="classdep.classes.classpath">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg line="-in com.sun.jini"/>
- <arg line="-in net.jini"/>
- <arg line="-out net.jini.core"/>
- <arg line="-prune net.jini.core"/>
- <arg path="${build.classes.dir}/net/jini"/>
- <arg path="${build.classes.dir}/com/sun/jini/discovery"/>
- </classdep>
- <jar destfile="${lib.dir}/jini-ext.jar"
- index="false"
- manifest="${src.manifest.dir}/jini-ext.mf">
- <fileset dir="${build.classes.dir}" includesfile="${jini-ext.deps}"/>
- </jar>
- </target>
-
<target name="jsk-debug-policy.jar" depends="stubs">
<property name="jsk-debug-policy.deps" location="${build.deps.dir}/jsk-debug-policy.deps"/>
@@ -740,7 +714,7 @@
<arg value="com.sun.jini.tool.DebugDynamicPolicyProvider"/>
<arg value="com.sun.jini.tool.ProfilingSecurityManager"/>
</classdep>
- <jar destfile="${lib.dir}/jsk-debug-policy.jar"
+ <jar destfile="${lib-ext.dir}/jsk-debug-policy.jar"
index="false"
manifest="${src.manifest.dir}/jsk-debug-policy.mf">
<fileset dir="${build.classes.dir}" includesfile="${jsk-debug-policy.deps}"/>
@@ -786,7 +760,7 @@
<arg value="net.jini.lease.LeaseUnmarshalException"/>
<arg value="net.jini.lease.RenewalFailureEvent"/>
<arg value="net.jini.lookup.DiscoveryAdmin"/>
- <arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
+ <!--<arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>-->
</classdep>
<jar destfile="${lib-dl.dir}/jsk-dl.jar"
index="false">
@@ -794,7 +768,7 @@
<metainf dir="${src.manifest.dir}/jsk-dl/META-INF"/>
</jar>
</target>
-
+ <!-- QA suite deps are from sun-util.jar-->
<target name="jsk-lib.jar" depends="stubs">
<property name="jsk-lib.deps" location="${build.deps.dir}/jsk-lib.deps"/>
<classdep output="${jsk-lib.deps}"
@@ -807,6 +781,7 @@
<arg line="${jskplatform.exclude}"/>
<arg path="${build.classes.dir}/com/sun/jini/admin"/>
<arg path="${build.classes.dir}/com/sun/jini/config"/>
+ <arg path="${build.classes.dir}/com/sun/jini/constants"/> <!--qa suite dep-->
<arg path="${build.classes.dir}/com/sun/jini/landlord"/>
<arg path="${build.classes.dir}/com/sun/jini/lease"/>
<arg path="${build.classes.dir}/com/sun/jini/lookup/entry"/>
@@ -814,6 +789,7 @@
<arg path="${build.classes.dir}/com/sun/jini/reliableLog"/>
<arg path="${build.classes.dir}/com/sun/jini/resource"/>
<arg path="${build.classes.dir}/com/sun/jini/thread"/>
+ <arg path="${build.classes.dir}/com/sun/jini/system"/> <!--qa suite dep-->
<arg path="${build.classes.dir}/net/jini"/>
<arg value="com.sun.jini.logging.Levels"/>
<arg value="com.sun.jini.phoenix.ActivationAdmin"/>
@@ -844,6 +820,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
+ <arg line="-in org.apache.river"/>
<arg path="${build.classes.dir}/net/jini/activation"/>
<arg path="${build.classes.dir}/net/jini/config"/>
<arg path="${build.classes.dir}/net/jini/constraint"/>
@@ -914,12 +891,17 @@
<arg value="-files"/>
<arg value="net.jini.security.policy.DynamicPolicyProvider"/>
<arg value="net.jini.security.policy.PolicyFileProvider"/>
+ <arg value="org.apache.river.api.security.ConcurrentPolicyFile"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
+ <arg line="-in org.apache.river"/>
</classdep>
<jar destfile="${lib-ext.dir}/jsk-policy.jar"
index="false">
<fileset dir="${build.classes.dir}" includesfile="${jsk-policy.deps}"/>
+ <fileset dir="${src.dir}">
+ <include name="org/apache/river/api/security/messages.properties"/>
+ </fileset>
</jar>
</target>
@@ -935,85 +917,6 @@
</jar>
</target>
- <!--
- Deprecated since 2.1 - Scheduled for removal
- Note: the QA suite depends on some of the classes in sun-util.jar
- -->
- <target name="sun-util.jar" depends="stubs">
- <property name="sun-util.deps" location="${build.deps.dir}/sun-util.deps"/>
- <classdep output="${sun-util.deps}"
- classpathref="classdep.classes.classpath">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg value="com.sun.jini.discovery.ClientSubjectChecker"/>
- <arg value="com.sun.jini.fiddler.FiddlerAdmin"/>
- <arg value="com.sun.jini.outrigger.ConstrainableJavaSpaceAdmin"/>
- <arg value="com.sun.jini.phoenix.ActivationAdmin"/>
- <arg value="com.sun.jini.start.LifeCycle"/>
- <arg value="com.sun.jini.start.ServiceProxyAccessor"/>
- <arg line="-in com.sun.jini"/>
- </classdep>
- <jar destfile="${lib.dir}/sun-util.jar"
- duplicate="preserve"
- index="false">
- <fileset dir="${build.classes.dir}" includesfile="${sun-util.deps}"/>
- <fileset dir="${build.classes.dir}"
- includes="com/sun/jini/action/**
- com/sun/jini/admin/**
- com/sun/jini/collection/**
- com/sun/jini/config/**
- com/sun/jini/constants/**
- com/sun/jini/landlord/**
- com/sun/jini/lease/**
- com/sun/jini/logging/**
- com/sun/jini/lookup/entry/**
- com/sun/jini/proxy/**
- com/sun/jini/reliableLog/**
- com/sun/jini/resource/**
- com/sun/jini/system/**
- com/sun/jini/thread/**"/>
- </jar>
- </target>
-
- <!--
- Deprecated since 2.1 - Scheduled for removal
- -->
- <target name="sdm-dl.jar" depends="stubs">
- <property name="sdm-dl.deps" location="${build.deps.dir}/sdm-dl.deps"/>
- <classdep output="${sdm-dl.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in com.sun.jini"/>
- <arg line="-in net.jini"/>
- <arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
- <arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
- </classdep>
- <jar destfile="${lib-dl.dir}/sdm-dl.jar"
- index="false">
- <fileset dir="${build.classes.dir}" includesfile="${sdm-dl.deps}"/>
- </jar>
- <preferredlistgen>
- <arg line="-cp"/>
- <arg path="${lib.dir}/jsk-platform.jar"/>
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/sdm-dl.jar"/>
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
- <classpath refid="river.jars"/>
- </preferredlistgen>
- </target>
-
- <target name="sdm.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars"/>
- <include name="net/jini/lookup/ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener.class"/>
- </rmic>
- </target>
-
<patternset id="svc-common-entries-set">
<include name="JoinManager"/>
<patternset id="dis-common-entries-set">
@@ -1366,8 +1269,8 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.example.browser"/>
<arg value="com.sun.jini.example.browser.Browser"/>
- <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
- <arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
+ <!--<arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>-->
+ <!--<arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>-->
</classdep>
<jar destfile="${lib.dir}/browser.jar"
index="false"
@@ -1384,8 +1287,8 @@
<arg value="-files"/>
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.example.browser"/>
- <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
- <arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
+ <!--<arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>-->
+ <!--<arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>-->
<arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
</classdep>
<jar destfile="${lib-dl.dir}/browser-dl.jar"
@@ -1399,18 +1302,18 @@
<arg path="${lib-dl.dir}/browser-dl.jar"/>
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
+ <!--<arg line="-proxy com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>-->
<classpath refid="river.jars"/>
</preferredlistgen>
</target>
- <target name="browser.stubs" depends="compile">
+ <!--<target name="browser.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars"/>
<include name="com/sun/jini/example/browser/Browser$$Listener.class"/>
<include name="com/sun/jini/example/browser/ServiceEditor$$NotifyReceiver.class"/>
</rmic>
- </target>
+ </target>-->
<target name="fiddler.jar" depends="stubs">
<property name="fiddler.deps" location="${build.deps.dir}/fiddler.deps" />
@@ -1422,7 +1325,7 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg value="com.sun.jini.fiddler.ActivatableFiddlerImpl"/>
<arg value="com.sun.jini.fiddler.FiddlerPermission" />
- <arg value="com.sun.jini.fiddler.FiddlerImpl_Stub" />
+ <!--<arg value="com.sun.jini.fiddler.FiddlerImpl_Stub"/>-->
<arg value="com.sun.jini.fiddler.NonActivatableFiddlerImpl" />
<arg value="com.sun.jini.fiddler.TransientFiddlerImpl"/>
</classdep>
@@ -1451,7 +1354,7 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg value="com.sun.jini.fiddler.FiddlerAdminProxy" />
<arg value="com.sun.jini.fiddler.FiddlerImpl$$FiddlerStatus"/>
- <arg value="com.sun.jini.fiddler.FiddlerImpl_Stub" />
+ <!--<arg value="com.sun.jini.fiddler.FiddlerImpl_Stub"/>-->
<arg value="com.sun.jini.fiddler.FiddlerLease"/>
<arg value="com.sun.jini.fiddler.FiddlerProxy"/>
<arg value="com.sun.jini.fiddler.FiddlerRegistration"/>
@@ -1477,12 +1380,12 @@
</preferredlistgen>
</target>
- <target name="fiddler.stubs" depends="compile">
+ <!--<target name="fiddler.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/fiddler/FiddlerImpl.class" />
</rmic>
- </target>
+ </target>-->
<target name="mahalo.jar" depends="stubs">
<property name="mahalo.deps" location="${build.deps.dir}/mahalo.deps" />
@@ -1496,7 +1399,7 @@
<arg value="com.sun.jini.mahalo.NonActivatableMahaloImpl"/>
<arg value="com.sun.jini.mahalo.TransientMahaloImpl"/>
<arg value="com.sun.jini.mahalo.MahaloPermission"/>
- <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
+ <!--<arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>-->
</classdep>
<jar destfile="${lib.dir}/mahalo.jar" index="false"
manifest="${src.manifest.dir}/mahalo.mf">
@@ -1529,7 +1432,7 @@
<arg value="com.sun.jini.lookup.entry.BasicServiceType" />
<arg value="com.sun.jini.mahalo.TxnMgrAdminProxy"/>
<arg value="com.sun.jini.mahalo.InternalManagerException"/>
- <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
+ <!--<arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>-->
</classdep>
<jar destfile="${lib-dl.dir}/mahalo-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${mahalo-dl.deps}" />
@@ -1547,12 +1450,12 @@
</preferredlistgen>
</target>
- <target name="mahalo.stubs" depends="compile">
+ <!--<target name="mahalo.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/mahalo/TxnManagerImpl.class" />
</rmic>
- </target>
+ </target>-->
<target name="mercury.jar" depends="stubs">
<property name="mercury.deps" location="${build.deps.dir}/mercury.deps" />
@@ -1566,7 +1469,7 @@
<arg value="com.sun.jini.mercury.NonActivatableMercuryImpl" />
<arg value="com.sun.jini.mercury.TransientMercuryImpl"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
- <arg value="com.sun.jini.mercury.MailboxImpl_Stub" />
+ <!--<arg value="com.sun.jini.mercury.MailboxImpl_Stub"/>-->
</classdep>
<jar destfile="${lib.dir}/mercury.jar" index="false"
manifest="${src.manifest.dir}/mercury.mf">
@@ -1594,7 +1497,7 @@
<arg value="com.sun.jini.mercury.InternalMailboxException" />
<arg value="com.sun.jini.mercury.ListenerProxy" />
<arg value="com.sun.jini.mercury.MailboxAdminProxy" />
- <arg value="com.sun.jini.mercury.MailboxImpl_Stub" />
+ <!--<arg value="com.sun.jini.mercury.MailboxImpl_Stub"/>-->
<arg value="com.sun.jini.mercury.MailboxProxy"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
<arg value="com.sun.jini.mercury.RemoteEventDataCursor"/>
@@ -1621,12 +1524,12 @@
</preferredlistgen>
</target>
- <target name="mercury.stubs" depends="compile">
+ <!--<target name="mercury.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/mercury/MailboxImpl.class" />
</rmic>
- </target>
+ </target>-->
<target name="norm.jar" depends="stubs">
<property name="norm.deps" location="${build.deps.dir}/norm.deps" />
@@ -1638,7 +1541,7 @@
<arg line="-in com.sun.jini.norm"/>
<arg value="com.sun.jini.norm.ActivatableNormServerImpl"/>
<arg value="com.sun.jini.norm.NormPermission"/>
- <arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>
+ <!--<arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>-->
<arg value="com.sun.jini.norm.PersistentNormServerImpl"/>
<arg value="com.sun.jini.norm.TransientNormServerImpl"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
@@ -1670,7 +1573,7 @@
<arg value="com.sun.jini.norm.CorruptedStoreException"/>
<arg value="com.sun.jini.norm.InternalNormException"/>
<arg value="com.sun.jini.norm.NormPermission"/>
- <arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>
+ <!--<arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>-->
<arg value="com.sun.jini.norm.ProxyVerifier"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
@@ -1694,12 +1597,12 @@
</preferredlistgen>
</target>
- <target name="norm.stubs" depends="compile">
+ <!--<target name="norm.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/norm/NormServerBaseImpl.class" />
</rmic>
- </target>
+ </target>-->
<target name="outrigger-snaplogstore.jar" depends="stubs">
<property name="outrigger-snaplogstore.deps" location="${build.deps.dir}/outrigger-snaplogstore.deps" />
@@ -1726,7 +1629,7 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.outrigger"/>
<arg value="com.sun.jini.outrigger.OutriggerPermission"/>
- <arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub" />
+ <!--<arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub" />-->
<arg value="com.sun.jini.outrigger.PersistentOutriggerImpl" />
<arg value="com.sun.jini.outrigger.TransientOutriggerImpl"/>
</classdep>
@@ -1749,7 +1652,7 @@
<arg value="com.sun.jini.lookup.entry.BasicServiceType"/>
<arg value="com.sun.jini.outrigger.OutriggerPermission"/>
<arg value="com.sun.jini.outrigger.OutriggerQueryCookie"/>
- <arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub" />
+ <!--<arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub"/>-->
<arg value="com.sun.jini.outrigger.OutriggerAvailabilityEvent"/>
<arg value="com.sun.jini.outrigger.ProxyVerifier"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
@@ -1773,12 +1676,12 @@
</preferredlistgen>
</target>
- <target name="outrigger.stubs" depends="compile">
+ <!--<target name="outrigger.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/outrigger/OutriggerServerWrapper.class" />
</rmic>
- </target>
+ </target>-->
<target name="phoenix.jar" depends="tools.jar">
<property name="phoenix.deps" location="${build.deps.dir}/phoenix.deps" />
@@ -1849,7 +1752,7 @@
<arg path="${lib-dl.dir}/phoenix-dl.jar"/>
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub" />
+ <arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub"/>
<classpath refid="river.jars"/>
</preferredlistgen>
</target>
@@ -1867,7 +1770,7 @@
<arg value="com.sun.jini.phoenix.AccessILFactory"/>
<arg value="com.sun.jini.phoenix.InstantiatorAccessExporter"/>
<arg value="com.sun.jini.phoenix.InstantiatorPermission"/>
- <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub" />
+ <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub"/>
</classdep>
<jar destfile="${lib.dir}/phoenix-group.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${phoenix-group.deps}" />
@@ -1915,8 +1818,8 @@
<arg line="-in com.sun.jini.reggie" />
<arg value="com.sun.jini.reggie.PersistentRegistrarImpl"/>
<arg value="com.sun.jini.reggie.RegistrarPermission"/>
- <arg value="com.sun.jini.reggie.RegistrarImpl_Stub" />
- <arg value="com.sun.jini.reggie.TransientRegistrarImpl" />
+ <!--<arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>-->
+ <arg value="com.sun.jini.reggie.TransientRegistrarImpl"/>
</classdep>
<jar destfile="${lib.dir}/reggie.jar" index="false"
manifest="${src.manifest.dir}/reggie.mf">
@@ -1945,7 +1848,7 @@
<arg value="com.sun.jini.reggie.EventLease"/>
<arg value="com.sun.jini.reggie.ProxyVerifier"/>
<arg value="com.sun.jini.reggie.RegistrarEvent"/>
- <arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>
+ <!--<arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>-->
<arg value="com.sun.jini.reggie.RegistrarPermission"/>
<arg value="com.sun.jini.reggie.RegistrarProxy"/>
<arg value="com.sun.jini.reggie.Registration"/>
@@ -1968,12 +1871,12 @@
</preferredlistgen>
</target>
- <target name="reggie.stubs" depends="compile">
+ <!--<target name="reggie.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/reggie/RegistrarImpl.class" />
</rmic>
- </target>
+ </target>-->
<target name="start.copy-resources" depends="prep">
<!--
@@ -2013,7 +1916,7 @@
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.start"/>
- <arg value="com.sun.jini.start.SharedGroupImpl" />
+ <arg value="com.sun.jini.start.SharedGroupImpl"/>
<arg value="com.sun.jini.start.SharedGroupImpl_Stub"/>
</classdep>
<jar destfile="${lib.dir}/group.jar" index="false">
Modified: river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/common.xml?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/common.xml (original)
+++ river/jtsk/trunk/common.xml Fri Feb 10 11:53:29 2012
@@ -25,7 +25,7 @@
<property file="${root}/build.properties" />
<!-- Product version info -->
- <property name="version" value="trunk"/>
+ <property name="version" value="2.2.0"/>
<property name="product.name" value="apache-river-${version}"/>
<property name="product.title" value="Apache River v${version}"/>
@@ -78,7 +78,7 @@
<property name="test.results.dir" value="${test.results}"/>
<!-- Standard javadoc options and settings -->
- <property name="jdk.doc.url" value="http://docs.oracle.com/javase/6/docs/api"/>
+ <property name="jdk.doc.url" value="http://java.sun.com/j2se/1.4.2/docs/api"/>
<property name="jdk.packages" location="${root}/${src-doc}/j2se"/>
<property name="api.copyright" value="Copyright 2007-2010, multiple authors.<br>Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="child" >Apache License, Version 2.0</a>, see the <a href="{@docRoot}/doc-files/NOTICE" target="child" >NOTICE</a> file for attributions."/>
@@ -96,7 +96,7 @@
## can be removed -->
<property name="jskprivate.include" value="-in com.sun.jini.action -in com.sun.jini.collection -in com.sun.jini.constants -in com.sun.jini.system -in com.sun.jini.logging -skip com.sun.jini.logging.LogManager -skip com.sun.jini.logging.Levels -in com.sun.jini.outrigger"/>
<!-- Common packages to exclude within ClassDep -->
- <property name="jskplatform.exclude" value="-out com.sun.jini.discovery -out net.jini.activation -out net.jini.config -out net.jini.constraint -out net.jini.core -out net.jini.export -out net.jini.id -out net.jini.iiop -out net.jini.io -out net.jini.jeri -out net.jini.jrmp -out net.jini.loader -out net.jini.security -out net.jini.url -out org.apache.river -skip net.jini.discovery.ConstrainableLookupLocator -skip net.jini.discovery.ConstrainableLookupLocatorTrustVerifier -skip com.sun.jini.config.ConfigUtil -skip com.sun.jini.config.KeyStores -skip com.sun.jini.logging.LogManager"/>
+ <property name="jskplatform.exclude" value="-out com.sun.jini.discovery -out net.jini.activation -out net.jini.config -out net.jini.constraint -out net.jini.core -out net.jini.export -out net.jini.id -out net.jini.iiop -out net.jini.io -out net.jini.jeri -out net.jini.jrmp -out net.jini.loader -out net.jini.security -out net.jini.url -out org.apache.river.api -skip net.jini.discovery.ConstrainableLookupLocator -skip net.jini.discovery.ConstrainableLookupLocatorTrustVerifier -skip com.sun.jini.config.ConfigUtil -skip com.sun.jini.config.KeyStores -skip com.sun.jini.logging.LogManager"/>
<property name="river.home" location="${root}"/>
<property name="river.lib.dir" location="${river.home}/${lib}"/>
@@ -133,10 +133,16 @@
<fileset id="velocity.jars" dir="${root}/velocity">
<include name="velocity-1.7.jar" />
</fileset>
+
+ <fileset id="high-scale-lib.jars" dir="${root}/high-scale-lib">
+ <include name="high-scale-lib.jar" />
+ </fileset>
+
<path id="compile.classpath" >
<fileset refid="asm.jars" />
<fileset refid="velocity.jars" />
+ <fileset refid="high-scale-lib.jars" />
</path>
@@ -148,7 +154,7 @@
<path refid="river.classes"/>
<path refid="asm.classpath"/>
</path>
-
+
<path id="classdep.jar.classpath">
<pathelement location="${river.lib.dir}/classdep.jar"/>
<!--<path refid="asm.classpath" />-->
@@ -190,8 +196,8 @@
<attribute name="dest.dir"/>
<attribute name="debug" default="${debug}"/>
<attribute name="debuglevel" default="${debuglevel}"/>
- <attribute name="source" default="6"/>
- <attribute name="target" default="6"/>
+ <attribute name="source" default="5"/>
+ <attribute name="target" default="5"/>
<attribute name="deprecation" default="${deprecation}"/>
<attribute name="verbose" default="${verbose}"/>
<attribute name="nowarn" default="${nowarn}"/>
Propchange: river/jtsk/trunk/qa/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -0,0 +1 @@
+/river/jtsk/skunk/peterConcurrentPolicy/qa:1137883-1242503
Propchange: river/jtsk/trunk/qa/README.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/README.txt:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/README.txt:1137883-1242503
Modified: river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/build.xml?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/build.xml (original)
+++ river/jtsk/trunk/qa/build.xml Fri Feb 10 11:53:29 2012
@@ -58,7 +58,7 @@
<property name="jtreg.home" location="${env.JT_HOME}" />
<!-- probably should rename the environment variable, to enable using the correct -->
<!-- jdk version for the jtreg tests which depend on jdk1.5 -->
- <property name="jdk1.5.home" location="/usr/jdk/jdk1.5.0_15"/>
+ <property name="jdk1.5.home" location="/usr/jdk/jdk1.6.0_30"/>
<property name="jtlib.tmp" location="${jtreg.dir}/JTlib-tmp"/>
<!-- classpath for use by ClassDep in this build -->
@@ -206,6 +206,7 @@
<file name="jsk-resources.jar"/>
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
+ <file name="classserver.jar"/>
</filelist>
</move>
<move file="${river.lib-ext.dir}/jsk-policy.jar" todir="${jtreg.dir}/JTlib-tmp"/>
@@ -213,18 +214,34 @@
errorproperty="jtreg.fail" failureproperty="jtreg.fail"
reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
jdk="${jdk1.5.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"/>
+ <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"/>
<arg value="-timeout:2"/>
<!--<arg value="-Djsk.home=${river.home}"/>-->
<arg value="-Djtlib.tmp=${jtlib.tmp}"/>
+ <arg value="-Dscratch.dir=${jtreg.dir}/JTwork/scratch"/>
+ <!-- This argument only runs the tests that failed on the last test run -->
<!--<arg value="-status:fail"/>-->
<!--<arg value="-Djava.security.debug=access,failure"/>-->
+ <!-- -DtestLevel Controls the amount of information printed.
+ * 0 - Just print final results and failures.
+ * 5 - Include stack trace for unexpected exceptions (default).
+ * 10 - Print test number and class for each new top level test class
+ * 15 - Print test number and class for every test.
+ * 20 - Print full test entry and pass/fail for every test.
+ * 25 - Include passing results.
+ * 30 - Include additional test debugging output, including time. -->
+ <arg value="-DtestLevel=5"/>
<!--<arg value="-Dsun.security.krb5.debug=true"/>-->
- <arg value="-Djavatest.maxOutputSize=500000"/>
+ <!-- For an unknown reason the following property is ignored -->
+ <arg value="-Djavatest.maxOutputSize=300000"/>
<!--<arg value="net/jini/jeri/kerberos/UnitTests/runTestPerformance.sh" />-->
<!--<arg value="-Bug:6307813"/>-->
<!--<arg value="net/jini/security/policy/DynamicPolicyProvider/dynamicBasePolicy/Test.java"/>-->
+ <!--<arg value="net/jini/security/Security/implicitGrants/Test.java"/>-->
<!--<arg value="net/jini/security/GrantPermission/implies/Test.java" />-->
+ <!--<arg value="net/jini/url/httpmd/TestEqual.java"/>-->
+ <!--<arg value="net/jini/jeri/ssl/UnitTests/TestEndpoint.java"/>-->
+ <!--<arg value="net/jini/jeri/ssl/UnitTests/TestRMI.java"/>-->
</jtreg>
<move todir="${river.lib.dir}">
<filelist dir="${jtreg.dir}/JTlib-tmp">
@@ -233,6 +250,7 @@
<file name="jsk-resources.jar"/>
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
+ <file name="classserver.jar"/>
</filelist>
</move>
<move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
@@ -249,6 +267,8 @@
<file name="jsk-platform.jar"/>
<file name="jsk-resources.jar"/>
<file name="phoenix-init.jar"/>
+ <file name="tools.jar"/>
+ <file name="classserver.jar"/>
</filelist>
</move>
<move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
@@ -263,7 +283,7 @@
<!--Note these arguments only apply to the qa harness, they aren't
propagated to client test jvm's to do that you must set the
global or client vm args in the file:
- src/com/sun/jini/resources/qaDefaults.properties-->
+ src/com/sun/jini/qa/resources/qaDefaults.properties-->
<!-- JDK extension directories (include our lib-ext dirs, for the custom policy providers) -->
<!--<jvmarg value="-Xbootclasspath/a:${river-ext.lib-dir}"/>-->
<jvmarg value="-Djava.ext.dirs=${ext.dirs}"/>
@@ -310,6 +330,7 @@
<fileset dir="${river.lib.dir}">
<include name="jsk-platform.jar"/>
<include name="jsk-lib.jar"/>
+ <include name="high-scale-lib.jar"/>
</fileset>
</classpath>
<env key="SOUL" value="${soul}"/>
Propchange: river/jtsk/trunk/qa/doc/HowToRunATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToRunATest.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/HowToRunATest.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/HowToWriteATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToWriteATest.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/HowToWriteATest.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverygroupmanagement-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverygroupmanagement-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverylocatormanagement-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverylocatormanagement-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverymanagement-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverymanagement-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverymanagement-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoverymanagement-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoverymanagement-test.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoveryservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoveryservice-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoveryservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoveryservice-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoveryservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoveryservice-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/discoveryservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/discoveryservice-test.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/eventmailbox-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/eventmailbox-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/eventmailbox-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/eventmailbox-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/eventmailbox-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/eventmailbox-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/eventmailbox-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/eventmailbox-test.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/index-requirements.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index-requirements.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/index-requirements.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/index-testdescriptions.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index-testdescriptions.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/index-testdescriptions.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/index.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/javaspace_req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/javaspace_req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/javaspace_test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_test.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/javaspace_test.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/joinmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/joinmanager-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/joinmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/joinmanager-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/joinmanager-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/joinmanager-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/locatordiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/locatordiscovery-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/locatordiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/locatordiscovery-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/locatordiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/locatordiscovery-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/lookupdiscovery-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/lookupdiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/lookupdiscovery-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/lookupdiscovery-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/qaMethodWorkArch.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/qaMethodWorkArch.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/qaMethodWorkArch.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/qaarch.sdw
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/qaarch.sdw:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/qaarch.sdw:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/renewalmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/renewalmanager-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/renewalmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/renewalmanager-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/renewalservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/renewalservice-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/renewalservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/renewalservice-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/renewalservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/renewalservice-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/renewalservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/renewalservice-test.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/servicediscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/servicediscovery-req.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/servicediscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/servicediscovery-req.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/servicediscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/servicediscovery-test.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/servicediscovery-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/servicediscovery-test.html:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/testcategories.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.doc:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/testcategories.doc:1137883-1242503
Propchange: river/jtsk/trunk/qa/doc/testcategories.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 11:53:29 2012
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.html:766115-766476
+/river/jtsk/skunk/peterConcurrentPolicy/qa/doc/testcategories.html:1137883-1242503
Modified: river/jtsk/trunk/qa/harness/policy/defaultsharedvm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/harness/policy/defaultsharedvm.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/harness/policy/defaultsharedvm.policy (original)
+++ river/jtsk/trunk/qa/harness/policy/defaultsharedvm.policy Fri Feb 10 11:53:29 2012
@@ -18,6 +18,12 @@ grant codebase "file:${com.sun.jini.jsk.
permission java.security.AllPermission "", "";
};
+grant {
+ permission com.sun.jini.phoenix.ExecOptionPermission "*";
+ // for a start test
+ permission com.sun.jini.phoenix.ExecPermission "/bin/javax";
+};
+
grant principal javax.security.auth.x500.X500Principal "CN=Phoenix"
{
permission com.sun.jini.phoenix.InstantiatorPermission "*";
@@ -28,7 +34,7 @@ grant principal javax.security.auth.kerb
permission com.sun.jini.phoenix.InstantiatorPermission "*";
};
-grant codebase "file:${com.sun.jini.qa.home}${/}lib{/}harness-killer.jar" {
+grant codebase "file:${com.sun.jini.qa.home}${/}lib${/}harness-killer.jar" {
permission com.sun.jini.start.SharedActivationPolicyPermission "jar:file:${com.sun.jini.qa.harness.harnessJar}!/harness/policy/all.policy";
permission com.sun.jini.start.SharedActivationPolicyPermission "jar:file:${com.sun.jini.qa.harness.harnessJar}!/harness/policy/policy.all";
};
Modified: river/jtsk/trunk/qa/harness/policy/defaulttest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/harness/policy/defaulttest.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/harness/policy/defaulttest.policy (original)
+++ river/jtsk/trunk/qa/harness/policy/defaulttest.policy Fri Feb 10 11:53:29 2012
@@ -2,14 +2,9 @@
// I think this has something to do with the new java 6 Policy implementation,
// the visibility of our policy implementations on the boot classpath and
// jdk1.6 compiler optimisations. See River-334
+
grant codebase "file:${com.sun.jini.jsk.home}${/}lib-ext${/}*" {
permission java.security.AllPermission "", "";
- //permission java.security.SecurityPermission "getProperty.net.jini.security.policy.PolicyFileProvider.basePolicyClass";
- //permission java.util.PropertyPermission "java.security.policy", "read";
- //permission java.util.PropertyPermission "java.security.policy", "write";
- //permission java.lang.RuntimePermission "accessClassInPackage.sun.security.provider";
- //permission java.lang.RuntimePermission "getProtectionDomain";
- //permission net.jini.security.GrantPermission "java.security.AllPermission \"\", \"\"";
};
// Grants required for jdk1.6 combined with source=5 and target=jsr14
@@ -20,6 +15,12 @@ grant codebase "file:${com.sun.jini.test
permission java.security.AllPermission "", "";
};
+// required for new PolicyFile provider.
+grant codebase "file:${{java.ext.dirs}}${/}-" {
+ permission java.security.AllPermission "", "";
+};
+
+
grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}jsk-platform.jar" {
permission java.security.AllPermission "", "";
};
@@ -63,23 +64,30 @@ grant codebase "file:${com.sun.jini.qa.h
// needed by various proxies
grant {
- permission java.lang.RuntimePermission
- "accessClassInPackage.sun.util.logging.resources";
-
- permission java.io.FilePermission
- "${com.sun.jini.jsk.home}${/}lib${/}-", "read";
-
- permission java.io.FilePermission
- "${com.sun.jini.qa.home}${/}lib${/}-", "read";
-
- permission java.util.PropertyPermission
- "*", "read";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.security.util";
+ permission java.io.FilePermission "${com.sun.jini.jsk.home}${/}lib${/}-", "read";
+ permission java.io.FilePermission "${com.sun.jini.qa.home}${/}lib${/}-", "read";
+ permission java.util.PropertyPermission "*", "read";
};
// needed by some io tests
grant {
+ permission java.lang.RuntimePermission "setIO";
permission java.lang.RuntimePermission "setFactory";
permission java.net.SocketPermission "*:1024-", "connect,accept";
permission java.util.PropertyPermission "com.sun.jini.qa.spec.io.util.FakeIntegrityVerifier.throwException", "write";
};
+
+// needed when using a SecurityManager from command line
+
+grant {
+ permission java.io.FilePermission "-", "read";
+};
+
+grant {
+ permission com.sun.jini.phoenix.ExecOptionPermission "*";
+ // for a start test
+ permission com.sun.jini.phoenix.ExecPermission "/bin/javax";
+};
Modified: river/jtsk/trunk/qa/harness/policy/qa.policy
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/harness/policy/qa.policy?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/harness/policy/qa.policy (original)
+++ river/jtsk/trunk/qa/harness/policy/qa.policy Fri Feb 10 11:53:29 2012
@@ -74,21 +74,22 @@ grant codebase "file:${com.sun.jini.qa.h
// THE FOLLOWING ARE REQUIRED IF UTILISING A SECURITY MANAGER FROM COMMAND LINE
// AT START UP.
// logging permissions
- // permission java.util.logging.LoggingPermission "control";
+ permission java.util.logging.LoggingPermission "control";
// runtime permissions
- //permission java.lang.RuntimePermission "createClassLoader";
- //permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
- //permission java.lang.RuntimePermission "getClassLoader";
+ permission java.lang.RuntimePermission "createClassLoader";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
+ permission java.lang.RuntimePermission "getClassLoader";
// property permissions
- //permission java.util.PropertyPermission "*", "read,write";
- //permission java.io.FilePermission "${com.sun.jini.jsk.home}${/}-", "read";
- //permission java.io.FilePermission "${com.sun.jini.jsk.home}", "read";
+ permission java.util.PropertyPermission "*", "read,write";
+ permission java.io.FilePermission "${com.sun.jini.jsk.home}${/}-", "read";
+ permission java.io.FilePermission "${com.sun.jini.jsk.home}", "read";
+ permission java.lang.RuntimePermission "setIO";
};
// THE FOLLOWING ARE REQUIRED IF UTILISING A SECURITY MANAGER FROM COMMAND LINE
// OR AT START UP.
grant codebase "file:${com.sun.jini.qa.home}${/}lib${/}jinitests.jar" {
- //permission java.util.PropertyPermission "net.jini.discovery.announce", "read";
- //permission java.util.PropertyPermission "com.sun.jini.qa.harness.testhosts", "read";
+ permission java.util.PropertyPermission "net.jini.discovery.announce", "read";
+ permission java.util.PropertyPermission "com.sun.jini.qa.harness.testhosts", "read";
};
grant codebase "file:${com.sun.jini.qa.home}${/}lib/qa1-jini-latest.jar" {
Modified: river/jtsk/trunk/qa/harness/trust/dynamic-policy.properties
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/harness/trust/dynamic-policy.properties?rev=1242750&r1=1242749&r2=1242750&view=diff
==============================================================================
--- river/jtsk/trunk/qa/harness/trust/dynamic-policy.properties (original)
+++ river/jtsk/trunk/qa/harness/trust/dynamic-policy.properties Fri Feb 10 11:53:29 2012
@@ -6,4 +6,5 @@ policy.provider=net.jini.security.policy
#net.jini.security.policy.PolicyFileProvider.basePolicyClass=com.sun.jini.qa.harness.MergedPolicyProvider
net.jini.security.policy.DynamicPolicyProvider.basePolicyClass=com.sun.jini.qa.harness.MergedPolicyProvider
#net.jini.security.policy.DynamicPolicyProvider.basePolicyClass=net.jini.security.policy.PolicyFileProvider
-#net.jini.security.policy.PolicyFileProvider.basePolicyClass=org.apache.river.security.concurrent.ConcurrentPolicyFile
+net.jini.security.policy.PolicyFileProvider.basePolicyClass=org.apache.river.api.security.ConcurrentPolicyFile
+#net.jini.security.policy.PolicyFileProvider.basePolicyClass=sun.security.provider.PolicyFile
Propchange: river/jtsk/trunk/qa/jtreg/certs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 11:53:29 2012
@@ -0,0 +1,19 @@
+OID.java
+PBEKeyImpl.java
+ConsoleKeyTool.java
+PKCS12KeyDerivation.java
+NetscapeCertType.java
+CertGenerator.java
+PKCS5KeyDerivation.java
+PBEKeyDerivation.java
+ConsoleCATool.java
+ContentInfo.java
+ToolException.java
+ConfigException.java
+BasicConstraints.java
+SubjectKeyIdentifier.java
+PKCS8EncryptedPrivateKey.java
+AlgorithmId.java
+RevokedCertificate.java
+Config.java
+UTCTime.java