Author: peter_firmstone Date: Fri Feb 10 11:37:04 2012 New Revision: 1242747
URL: http://svn.apache.org/viewvc?rev=1242747&view=rev Log: River-323 Merge of skunk/peterConcurrentPolicy with trunk Added: river/jtsk/trunk/bouncy-castle/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/bouncy-castle/ river/jtsk/trunk/bouncy-castle/bcmail-jdk16-146.jar - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/bouncy-castle/bcmail-jdk16-146.jar river/jtsk/trunk/bouncy-castle/bcpg-jdk16-146.jar - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/bouncy-castle/bcpg-jdk16-146.jar river/jtsk/trunk/bouncy-castle/bcprov-jdk16-146.jar - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/bouncy-castle/bcprov-jdk16-146.jar river/jtsk/trunk/bouncy-castle/bctest-jdk16-146.jar - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/bouncy-castle/bctest-jdk16-146.jar river/jtsk/trunk/bouncy-castle/bctsp-jdk16-146.jar - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/bouncy-castle/bctsp-jdk16-146.jar river/jtsk/trunk/high-scale-lib/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/high-scale-lib/ river/jtsk/trunk/high-scale-lib/high-scale-lib.jar - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/high-scale-lib/high-scale-lib.jar river/jtsk/trunk/qa/jtreg/certs/keystores/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/ river/jtsk/trunk/qa/jtreg/certs/keystores/test-ca.truststore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca.truststore river/jtsk/trunk/qa/jtreg/certs/keystores/test-ca1.truststore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca1.truststore river/jtsk/trunk/qa/jtreg/certs/keystores/test-ca2.truststore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca2.truststore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user1A.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1A.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user1B.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1B.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user1C.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1C.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user1D.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1D.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user1E.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1E.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user2A.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2A.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user2B.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2B.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user2C.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2C.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user2D.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2D.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/test-user2E.keystore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2E.keystore river/jtsk/trunk/qa/jtreg/certs/keystores/users.truststore - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/users.truststore river/jtsk/trunk/qa/jtreg/certs/requests/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/ river/jtsk/trunk/qa/jtreg/certs/requests/test-user1A.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1A.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user1B.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1B.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user1C.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1C.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user1D.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1D.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user1E.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1E.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user2A.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2A.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user2B.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2B.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user2C.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2C.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user2D.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2D.request river/jtsk/trunk/qa/jtreg/certs/requests/test-user2E.request - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2E.request river/jtsk/trunk/src/org/apache/river/api/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/ river/jtsk/trunk/src/org/apache/river/api/delegates/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/ river/jtsk/trunk/src/org/apache/river/api/delegates/DelegatePermission.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/DelegatePermission.java river/jtsk/trunk/src/org/apache/river/api/delegates/FileInputStream.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/FileInputStream.java river/jtsk/trunk/src/org/apache/river/api/delegates/FileOutputStream.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/delegates/FileOutputStream.java river/jtsk/trunk/src/org/apache/river/api/lookup/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/lookup/ river/jtsk/trunk/src/org/apache/river/api/lookup/DefaultEntries.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/lookup/DefaultEntries.java river/jtsk/trunk/src/org/apache/river/api/lookup/ServiceItemClasspathSub.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/lookup/ServiceItemClasspathSub.java river/jtsk/trunk/src/org/apache/river/api/lookup/ServiceResultStreamFilter.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/lookup/ServiceResultStreamFilter.java river/jtsk/trunk/src/org/apache/river/api/lookup/ServiceResultStreamUnmarshaller.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/lookup/ServiceResultStreamUnmarshaller.java river/jtsk/trunk/src/org/apache/river/api/lookup/StreamServiceRegistrar.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/lookup/StreamServiceRegistrar.java river/jtsk/trunk/src/org/apache/river/api/security/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ river/jtsk/trunk/src/org/apache/river/api/security/CachingSecurityManager.java - copied, changed from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CachingSecurityManager.java river/jtsk/trunk/src/org/apache/river/api/security/CertificateGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CertificateGrant.java river/jtsk/trunk/src/org/apache/river/api/security/ClassLoaderGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ClassLoaderGrant.java river/jtsk/trunk/src/org/apache/river/api/security/CodeSourceGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CodeSourceGrant.java river/jtsk/trunk/src/org/apache/river/api/security/CodeSourceSetGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CodeSourceSetGrant.java river/jtsk/trunk/src/org/apache/river/api/security/ConcurrentPermissions.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPermissions.java river/jtsk/trunk/src/org/apache/river/api/security/ConcurrentPolicy.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPolicy.java river/jtsk/trunk/src/org/apache/river/api/security/ConcurrentPolicyFile.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPolicyFile.java river/jtsk/trunk/src/org/apache/river/api/security/DefaultPolicyParser.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/DefaultPolicyParser.java river/jtsk/trunk/src/org/apache/river/api/security/DefaultPolicyScanner.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/DefaultPolicyScanner.java river/jtsk/trunk/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java - copied, changed from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java river/jtsk/trunk/src/org/apache/river/api/security/Messages.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Messages.java river/jtsk/trunk/src/org/apache/river/api/security/PermissionComparator.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PermissionComparator.java river/jtsk/trunk/src/org/apache/river/api/security/PermissionGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PermissionGrant.java river/jtsk/trunk/src/org/apache/river/api/security/PermissionGrantBuilder.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PermissionGrantBuilder.java river/jtsk/trunk/src/org/apache/river/api/security/PermissionGrantBuilderImp.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PermissionGrantBuilderImp.java river/jtsk/trunk/src/org/apache/river/api/security/PolicyParser.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PolicyParser.java river/jtsk/trunk/src/org/apache/river/api/security/PolicyPermission.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PolicyPermission.java river/jtsk/trunk/src/org/apache/river/api/security/PolicyUtils.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PolicyUtils.java river/jtsk/trunk/src/org/apache/river/api/security/PrincipalGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/PrincipalGrant.java river/jtsk/trunk/src/org/apache/river/api/security/ProtectionDomainGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ProtectionDomainGrant.java river/jtsk/trunk/src/org/apache/river/api/security/RemotePolicy.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/RemotePolicy.java river/jtsk/trunk/src/org/apache/river/api/security/RevocablePolicy.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/RevocablePolicy.java river/jtsk/trunk/src/org/apache/river/api/security/Segment.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Segment.java river/jtsk/trunk/src/org/apache/river/api/security/URIGrant.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/URIGrant.java river/jtsk/trunk/src/org/apache/river/api/security/UnresolvedPrincipal.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/UnresolvedPrincipal.java river/jtsk/trunk/src/org/apache/river/api/security/Util.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Util.java river/jtsk/trunk/src/org/apache/river/api/security/messages.properties - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/messages.properties river/jtsk/trunk/src/org/apache/river/api/security/package.html - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/package.html river/jtsk/trunk/src/org/apache/river/api/util/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/util/ river/jtsk/trunk/src/org/apache/river/api/util/Facade.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/util/Facade.java river/jtsk/trunk/src/org/apache/river/api/util/ResultStream.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/util/ResultStream.java river/jtsk/trunk/src/org/apache/river/impl/security/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/ river/jtsk/trunk/src/org/apache/river/impl/security/LocalPermissions.java (props changed) - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/LocalPermissions.java river/jtsk/trunk/src/org/apache/river/impl/security/PermissionInfo.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/PermissionInfo.java river/jtsk/trunk/src/org/apache/river/impl/security/dos/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/dos/ river/jtsk/trunk/src/org/apache/river/impl/security/dos/DiscoveryV2ReadUncastResponseTask.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/dos/DiscoveryV2ReadUncastResponseTask.java river/jtsk/trunk/src/org/apache/river/impl/security/dos/IsolatedExecutor.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/dos/IsolatedExecutor.java river/jtsk/trunk/src/org/apache/river/impl/security/dos/IsolationException.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/dos/IsolationException.java river/jtsk/trunk/src/org/apache/river/impl/security/dos/ProxyIsolationHandler.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/dos/ProxyIsolationHandler.java river/jtsk/trunk/src/org/apache/river/impl/security/dos/RemoteExecutor.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/dos/RemoteExecutor.java river/jtsk/trunk/src/org/apache/river/impl/security/policy/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/policy/ river/jtsk/trunk/src/org/apache/river/impl/security/policy/util/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/policy/util/ river/jtsk/trunk/src/org/apache/river/impl/util/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ river/jtsk/trunk/src/org/apache/river/impl/util/AbstractReferenceComparator.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/AbstractReferenceComparator.java river/jtsk/trunk/src/org/apache/river/impl/util/AbstractReferrerWrapper.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/AbstractReferrerWrapper.java river/jtsk/trunk/src/org/apache/river/impl/util/CollectionWrapper.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/CollectionWrapper.java river/jtsk/trunk/src/org/apache/river/impl/util/CollectionsConcurrent.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/CollectionsConcurrent.java river/jtsk/trunk/src/org/apache/river/impl/util/ComparableReferrerWrapper.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ComparableReferrerWrapper.java river/jtsk/trunk/src/org/apache/river/impl/util/EntryConversionFactory.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/EntryConversionFactory.java river/jtsk/trunk/src/org/apache/river/impl/util/EntryFacadeConverter.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/EntryFacadeConverter.java river/jtsk/trunk/src/org/apache/river/impl/util/EntryIteratorFacade.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/EntryIteratorFacade.java river/jtsk/trunk/src/org/apache/river/impl/util/EntrySetFacade.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/EntrySetFacade.java river/jtsk/trunk/src/org/apache/river/impl/util/Factory.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/Factory.java river/jtsk/trunk/src/org/apache/river/impl/util/NullIterator.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/NullIterator.java river/jtsk/trunk/src/org/apache/river/impl/util/RC.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/RC.java river/jtsk/trunk/src/org/apache/river/impl/util/ReadResolveFixCollectionCircularReferences.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReadResolveFixCollectionCircularReferences.java river/jtsk/trunk/src/org/apache/river/impl/util/ReadResolveFixForMapCircularReferences.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReadResolveFixForMapCircularReferences.java river/jtsk/trunk/src/org/apache/river/impl/util/Ref.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/Ref.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceBlockingDeque.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceBlockingDeque.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceBlockingQueue.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceBlockingQueue.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceCollection.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceCollection.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceCollectionRefreshAfterSerialization.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceCollectionRefreshAfterSerialization.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceCollectionSerialData.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceCollectionSerialData.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceCollectionSerialDataDefensiveCopy.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceCollectionSerialDataDefensiveCopy.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceComparator.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceComparator.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceConcurrentMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceConcurrentMap.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMap.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceDeque.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceDeque.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceEntryFacade.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceEntryFacade.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceFactory.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceFactory.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceIterator.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceIterator.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceList.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceList.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceMap.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceMapSerialData.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceMapSerialData.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceNavigableMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceNavigableMap.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceNavigableSet.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceNavigableSet.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceProcessor.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceProcessor.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceQueuingFactory.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceQueuingFactory.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceSerializationFactory.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceSerializationFactory.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceSerializedForm.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceSerializedForm.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceSet.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceSet.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceSortedMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceSortedMap.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferenceSortedSet.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferenceSortedSet.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferencedQueue.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferencedQueue.java river/jtsk/trunk/src/org/apache/river/impl/util/Referrer.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/Referrer.java river/jtsk/trunk/src/org/apache/river/impl/util/ReferrerWrapper.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/ReferrerWrapper.java river/jtsk/trunk/src/org/apache/river/impl/util/SerializationOfReferenceCollection.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SerializationOfReferenceCollection.java river/jtsk/trunk/src/org/apache/river/impl/util/SerializationOfReferenceMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SerializationOfReferenceMap.java river/jtsk/trunk/src/org/apache/river/impl/util/SoftIdentityReferenceKey.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftIdentityReferenceKey.java river/jtsk/trunk/src/org/apache/river/impl/util/SoftReferenceKey.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/SoftReferenceKey.java river/jtsk/trunk/src/org/apache/river/impl/util/StrongReferenceKey.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/StrongReferenceKey.java river/jtsk/trunk/src/org/apache/river/impl/util/TempComparableReferrer.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/TempComparableReferrer.java river/jtsk/trunk/src/org/apache/river/impl/util/TempEqualReferrer.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/TempEqualReferrer.java river/jtsk/trunk/src/org/apache/river/impl/util/TempIdentityReferrer.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/TempIdentityReferrer.java river/jtsk/trunk/src/org/apache/river/impl/util/WeakIdentityReferenceKey.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakIdentityReferenceKey.java river/jtsk/trunk/src/org/apache/river/impl/util/WeakReferenceKey.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/util/WeakReferenceKey.java river/jtsk/trunk/test/src/org/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/ river/jtsk/trunk/test/src/org/apache/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/ river/jtsk/trunk/test/src/org/apache/river/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/ river/jtsk/trunk/test/src/org/apache/river/api/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/ river/jtsk/trunk/test/src/org/apache/river/api/security/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ river/jtsk/trunk/test/src/org/apache/river/api/security/CodeSourceGrantTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/CodeSourceGrantTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPermissionsTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ConcurrentPermissionsTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/DefaultPolicyParserTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/DefaultPolicyParserTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/DelegateCombinerSecurityManagerTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/DelegateCombinerSecurityManagerTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PermissionCollectionTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PermissionCollectionTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PermissionGrantTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PermissionGrantTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/Permissions_ImplTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/Permissions_ImplTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyEntryTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PolicyEntryTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyUtilsTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PolicyUtilsTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PrincipalGrantTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PrincipalGrantTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/SegmentTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/SegmentTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/policy/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/policy/ river/jtsk/trunk/test/src/org/apache/river/impl/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/ river/jtsk/trunk/test/src/org/apache/river/impl/security/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/ river/jtsk/trunk/test/src/org/apache/river/impl/security/dos/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/dos/ river/jtsk/trunk/test/src/org/apache/river/impl/security/dos/IsolateTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/dos/IsolateTest.java river/jtsk/trunk/test/src/org/apache/river/impl/security/policy/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/policy/ river/jtsk/trunk/test/src/org/apache/river/impl/security/policy/util/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/policy/util/ river/jtsk/trunk/test/src/org/apache/river/impl/util/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceBlockingQueueConcurrencyTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceBlockingQueueConcurrencyTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceBlockingQueueTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceBlockingQueueTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceConcurrentMapConcurrencyTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentMapConcurrencyTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceConcurrentMapTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentMapTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMapTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMapTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceDequeTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceDequeTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceListTest.java - copied, changed from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceListTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceMapTest.java - copied, changed from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceMapTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceNavigableMapTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceNavigableMapTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceNavigableSetTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceNavigableSetTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceSetTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSetTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceSortedMapTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSortedMapTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceSortedSetTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSortedSetTest.java river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferencedQueueTest.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferencedQueueTest.java river/jtsk/trunk/test/src/tests/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/ river/jtsk/trunk/test/src/tests/support/ - copied from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/ river/jtsk/trunk/test/src/tests/support/ArrayListOverflow.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/ArrayListOverflow.java river/jtsk/trunk/test/src/tests/support/EndlessLoopTask.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/EndlessLoopTask.java river/jtsk/trunk/test/src/tests/support/FakePrincipal.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/FakePrincipal.java river/jtsk/trunk/test/src/tests/support/MutableMap.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/MutableMap.java river/jtsk/trunk/test/src/tests/support/MyPrincipal.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/MyPrincipal.java river/jtsk/trunk/test/src/tests/support/PrintTask.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/PrintTask.java river/jtsk/trunk/test/src/tests/support/StackOverflowTask.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/StackOverflowTask.java river/jtsk/trunk/test/src/tests/support/StringComparator.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/StringComparator.java river/jtsk/trunk/test/src/tests/support/Support_Configuration.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Configuration.java river/jtsk/trunk/test/src/tests/support/Support_Exec.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Exec.java river/jtsk/trunk/test/src/tests/support/Support_GetLocal.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_GetLocal.java river/jtsk/trunk/test/src/tests/support/Support_Resources.java - copied unchanged from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Resources.java Removed: river/jtsk/trunk/test/src/com/sun/jini/discovery/ river/jtsk/trunk/test/src/com/sun/jini/jeri/ river/jtsk/trunk/test/src/net/jini/io/ river/jtsk/trunk/test/src/net/jini/security/policy/ Copied: river/jtsk/trunk/src/org/apache/river/api/security/CachingSecurityManager.java (from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CachingSecurityManager.java) URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/api/security/CachingSecurityManager.java?p2=river/jtsk/trunk/src/org/apache/river/api/security/CachingSecurityManager.java&p1=river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CachingSecurityManager.java&r1=1242503&r2=1242747&rev=1242747&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/CachingSecurityManager.java (original) +++ river/jtsk/trunk/src/org/apache/river/api/security/CachingSecurityManager.java Fri Feb 10 11:37:04 2012 @@ -19,18 +19,32 @@ package org.apache.river.api.security; import java.security.Permission; +import java.security.Principal; +import java.security.cert.Certificate; import java.util.Set; +import javax.security.auth.Subject; /** - * The CachingSecurityManager is designed to enable the use of DelegatePermission - * for Delegate Objects to encapsulate security sensitive objects using + * The CachingSecurityManager enables acceptable performance for * Li Gong's method guard pattern. * - * In this manner we can prevent references to security sensitive object's from - * escaping. - * * See "Inside Java 2 Platform Security" 2nd Edition, ISBN:0-201-78791-1, page 176. * + * The method guard pattern is better suited to application developers, since + * most uses of standard java permissions allow the guarded object + * reference to escape. + * + * DelegatePermission can be used to encapsulate another Permission to assist + * implementing the method guard pattern as an alternative for existing + * Permissions that allow guarded objects to escape. + * + * Apart from allowing implementations of the method guard pattern, the + * CachingSecurityManager can improve concurrency by caching repeated + * security checks. + * + * + * @see Permission + * @see DelegatePermission * @author Peter Firmstone. */ public interface CachingSecurityManager { @@ -38,14 +52,8 @@ public interface CachingSecurityManager /** * This method clears permissions from the checked cache, it should be * called after calling Policy.refresh(); - * - * If the Set provided contains permissions, only those of the same - * class will be removed from the checked cache. - * - * If the Set is null, the checked cache is cleared completely. * - * @throws java.lang.InterruptedException - * @throws java.util.concurrent.ExecutionException + * @throws SecurityException */ void clearCache() throws SecurityException; Copied: river/jtsk/trunk/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java (from r1242503, river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java) URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java?p2=river/jtsk/trunk/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java&p1=river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java&r1=1242503&r2=1242747&rev=1242747&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java (original) +++ river/jtsk/trunk/src/org/apache/river/api/security/DelegateCombinerSecurityManager.java Fri Feb 10 11:37:04 2012 @@ -24,14 +24,17 @@ import java.security.DomainCombiner; import java.security.Guard; import java.security.Permission; import java.security.Policy; +import java.security.Principal; import java.security.PrivilegedAction; import java.security.ProtectionDomain; import java.security.SecurityPermission; +import java.security.cert.Certificate; import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.NavigableSet; +import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListSet; @@ -45,6 +48,7 @@ import java.util.concurrent.ThreadPoolEx import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import javax.security.auth.Subject; import net.jini.security.Security; import net.jini.security.SecurityContext; import org.apache.river.api.delegates.DelegatePermission; @@ -306,7 +310,7 @@ extends SecurityManager implements Cachi inTrustedCodeRecursiveCall.set(Boolean.FALSE); // Must always happen, no matter what. } } - + // Action retrieves the optimised AccessControlContext. private class Action implements PrivilegedAction<AccessControlContext> { private Action(){} Propchange: river/jtsk/trunk/src/org/apache/river/impl/security/LocalPermissions.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 10 11:37:04 2012 @@ -0,0 +1 @@ +/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/impl/security/LocalPermissions.java:1137883-1242503 Copied: river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceListTest.java (from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceListTest.java) URL: http://svn.apache.org/viewvc/river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceListTest.java?p2=river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceListTest.java&p1=river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceListTest.java&r1=1242503&r2=1242747&rev=1242747&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceListTest.java (original) +++ river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceListTest.java Fri Feb 10 11:37:04 2012 @@ -62,7 +62,7 @@ public class ReferenceListTest { @Before public void setUp() { - instance = new ReferenceList<String>(new ArrayList<Referrer<String>>(), Ref.WEAK); + instance = RC.list(new ArrayList<Referrer<String>>(), Ref.WEAK); instance.add(truck); instance.add(shovel); instance.add(grader); Copied: river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceMapTest.java (from r1242503, river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceMapTest.java) URL: http://svn.apache.org/viewvc/river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceMapTest.java?p2=river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceMapTest.java&p1=river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceMapTest.java&r1=1242503&r2=1242747&rev=1242747&view=diff ============================================================================== --- river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceMapTest.java (original) +++ river/jtsk/trunk/test/src/org/apache/river/impl/util/ReferenceMapTest.java Fri Feb 10 11:37:04 2012 @@ -55,7 +55,7 @@ public class ReferenceMapTest { public void setUp() { Map<Referrer<Integer>, Referrer<String>> internal = new HashMap<Referrer<Integer>, Referrer<String>>(5); - instance = new ReferenceMap<Integer, String>(internal, Ref.WEAK, Ref.STRONG); + instance = RC.map(internal, Ref.WEAK, Ref.STRONG); i1 = 1; i2 = 2; i3 = 3;
