Revision 1290926

Jump to revision:
Author:	peter_firmstone
Date:	Sun Feb 19 03:05:33 2012 UTC (12 years, 2 months ago)
Changed paths:	60
Log Message:	Incremental merge

Changed paths

Path	Details
river/jtsk/merge/test/lib/MultithreadedTC-1.01.jar	deleted
river/jtsk/merge/test/lib/imunit-1.3.jar (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/lib/imunit-1.3.jar, r1290923)	added
river/jtsk/merge/test/src/net/jini/core/event/RemoteEventTest.java	modified , text changed
river/jtsk/merge/test/src/net/jini/io/	deleted
river/jtsk/merge/test/src/net/jini/security/GrantPermissionTest.java	modified , text changed
river/jtsk/merge/test/src/net/jini/security/policy/	deleted
river/jtsk/merge/test/src/org/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org, r1290923)	added
river/jtsk/merge/test/src/org/apache/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/CodeSourceGrantTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/CodeSourceGrantTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/ConcurrentPermissionsTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ConcurrentPermissionsTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/DefaultPolicyParserTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/DefaultPolicyParserTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/DelegateCombinerSecurityManagerTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/DelegateCombinerSecurityManagerTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/PermissionCollectionTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PermissionCollectionTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/PermissionGrantTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PermissionGrantTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/Permissions_ImplTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/Permissions_ImplTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/PolicyEntryTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PolicyEntryTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/PolicyUtilsTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PolicyUtilsTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/PrincipalGrantTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/PrincipalGrantTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/SegmentTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/SegmentTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/api/security/policy/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/api/security/policy, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/security/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/security/dos/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/dos, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/security/dos/IsolateTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/dos/IsolateTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/security/policy/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/policy, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/security/policy/util/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/security/policy/util, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceBlockingQueueConcurrencyTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceBlockingQueueConcurrencyTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceBlockingQueueTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceBlockingQueueTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceCollectionTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceConcurrentMapConcurrencyTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentMapConcurrencyTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceConcurrentMapTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentMapTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMapTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceConcurrentNavigableMapTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceDequeTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceDequeTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceListTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceListTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceMapTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceMapTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceNavigableMapTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceNavigableMapTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceNavigableSetTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceNavigableSetTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceSetTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSetTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceSortedMapTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSortedMapTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferenceSortedSetTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferenceSortedSetTest.java, r1290923)	replaced
river/jtsk/merge/test/src/org/apache/river/impl/util/ReferencedQueueTest.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/org/apache/river/impl/util/ReferencedQueueTest.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests, r1290923)	added
river/jtsk/merge/test/src/tests/support/ (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/ArrayListOverflow.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/ArrayListOverflow.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/EndlessLoopTask.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/EndlessLoopTask.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/FakePrincipal.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/FakePrincipal.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/MutableMap.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/MutableMap.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/MyPrincipal.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/MyPrincipal.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/PrintTask.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/PrintTask.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/StackOverflowTask.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/StackOverflowTask.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/StringComparator.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/StringComparator.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/Support_Configuration.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Configuration.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/Support_Exec.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Exec.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/Support_GetLocal.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_GetLocal.java, r1290923)	replaced
river/jtsk/merge/test/src/tests/support/Support_Resources.java (Copied from river/jtsk/skunk/peterConcurrentPolicy/test/src/tests/support/Support_Resources.java, r1290923)	replaced