changeset 138:c7a0c6c4c2db

Move jcstress annotations to o.o.j.annotations.
author shade
date Sat, 15 Mar 2014 02:04:28 +0400
parents 036c423872e5
children d2d41e3309f6
files jcstress-core/src/main/java/org/openjdk/jcstress/annotations/Actor.java jcstress-core/src/main/java/org/openjdk/jcstress/annotations/Arbiter.java jcstress-core/src/main/java/org/openjdk/jcstress/annotations/ConcurrencyStressTest.java jcstress-core/src/main/java/org/openjdk/jcstress/annotations/Result.java jcstress-core/src/main/java/org/openjdk/jcstress/annotations/State.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/Actor.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/Arbiter.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/ConcurrencyStressTest.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/Result.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/State.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/ConcurrencyStressTestProcessor.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/TestInfo.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult3.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult8.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult3.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult8.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult3.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult1.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult2.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult4.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/runners/Runner.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/runners/TerminationRunner.java jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/ResultGenerator.java jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java jcstress-test-gen/src/main/java/org/openjdk/jcstress/tracer/TraceGen.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferViewsAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/CharBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferViewsAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DoubleBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/FloatBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/IntBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/LongBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ShortBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/ByteBufferIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/DirectByteBufferIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/UnsafeIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/BooleanLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ByteLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/CharLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/DoubleLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/FloatLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/IntLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/LongLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ObjectLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ShortLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/BooleanLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ByteLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/CharLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/DoubleLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/FloatLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/IntLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/LongLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ObjectLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ShortLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/BooleanLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ByteLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/CharLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/DoubleLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/FloatLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/IntLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/LongLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ObjectLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ShortLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedAcquireReleaseTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedDekkerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedPublicationTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedReadTwiceTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedAcquireReleaseTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedDekkerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedPublicationTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedReadTwiceTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/future/FutureTaskSetTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/BooleanFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ByteFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/CharFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/DoubleFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/FloatFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/IntFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/LongFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ShortFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/BooleanFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ByteFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/CharFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/DoubleFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/FloatFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/IntFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/LongFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ShortFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/BooleanInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ByteInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/CharInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/DoubleInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/FloatInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/IntInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/LongInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ShortInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BooleanPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BytePlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/CharPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/DoublePlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/FloatPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/IntPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/LongPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/ShortPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/BooleanVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ByteVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/CharVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/DoubleVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/FloatVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/IntVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/LongVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ShortVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier0Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier1Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier2Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier3Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantLockMutexTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantRWLockMutexTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/SynchronizedMutexTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/AQSTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/BitSetTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/FailingCASTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/Unsafe_GetDoubleVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_1_Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_2_Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/SynchronizedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadJoinTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadStartTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/VolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/FinalWrapperSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/HolderSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCLSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCLSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCLSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/ArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeIntTearingTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ByteBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/CharBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DirectByteBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DoubleBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/FloatBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/IntBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/LongBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ShortBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong1.java tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong42.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DekkerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DoubleVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/IRIWTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/LazySetTransitivityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadAfterVolatileReadTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadTwiceOverVolatileReadTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileAcquireReleaseTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIRIWTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIncrementAtomicityTest.java
diffstat 273 files changed, 966 insertions(+), 971 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/Actor.java	Sat Mar 15 02:04:28 2014 +0400
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Actors actively mutate the states and may produce results.
+ * <p/>
+ * Actor-annotated methods can have only the {@link State} or {@link Result}-annotated
+ * classes as the parameters.
+ * <p/>
+ * A few important invariants are maintained:
+ *   - the method is called only by single actor thread, once per {@link State} instance;
+ *   - for any given {@link State}, the order vs another actors is deliberately unspecified;
+ *   - any given {@link State} instance will be eventually visited by all actors;
+ *
+ * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Actor {
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/Arbiter.java	Sat Mar 15 02:04:28 2014 +0400
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Arbiters are similar {@link Actor}, but with a few important differences:
+ *  - arbiter visits the {@link State} instance after all the actors have already visited that instance;
+ *  - all memory effects from actors are visible in arbiter;
+ * <p/>
+ * Arbiter-annotated methods can have only the {@link State} or {@link Result}-annotated
+ * classes as the parameters.
+ * <p/>
+ * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Arbiter {
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/ConcurrencyStressTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks the class that should be treated as the concurrency stress test.
+ * <p/>
+ * {@link Actor} and {@link Arbiter} annotations are used to describe test
+ * behavior. {@link State} and {@link Result} annotations are used to
+ * describe the test state.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ConcurrencyStressTest {
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/Result.java	Sat Mar 15 02:04:28 2014 +0400
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates the class that is treated as the result object.
+ * <p/>
+ * Important invariants:
+ *   - Result classes usually mimic value types: they do not have identity, and harness
+ *     may reuse the objects, and also auto-magically clear the fields;
+ *   - All fields in Result classes should be public;
+ *   - All fields in Result classes should be primitive;
+ *   - Result classes should be serializable;
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Result {
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/State.java	Sat Mar 15 02:04:28 2014 +0400
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates the class treated as test state.
+ * <p/>
+ * Important invariants:
+ *   - State classes should have a default constructor;
+ *   - All initializations in constructors and instance intializers are visible to all actors;
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface State {
+}
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/Actor.java	Sat Mar 15 01:49:53 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.infra.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Actors actively mutate the states and may produce results.
- * <p/>
- * Actor-annotated methods can have only the {@link State} or {@link Result}-annotated
- * classes as the parameters.
- * <p/>
- * A few important invariants are maintained:
- *   - the method is called only by single actor thread, once per {@link State} instance;
- *   - for any given {@link State}, the order vs another actors is deliberately unspecified;
- *   - any given {@link State} instance will be eventually visited by all actors;
- *
- * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Actor {
-}
\ No newline at end of file
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/Arbiter.java	Sat Mar 15 01:49:53 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.infra.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Arbiters are similar {@link Actor}, but with a few important differences:
- *  - arbiter visits the {@link State} instance after all the actors have already visited that instance;
- *  - all memory effects from actors are visible in arbiter;
- * <p/>
- * Arbiter-annotated methods can have only the {@link State} or {@link Result}-annotated
- * classes as the parameters.
- * <p/>
- * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Arbiter {
-}
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/ConcurrencyStressTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.infra.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks the class that should be treated as the concurrency stress test.
- * <p/>
- * {@link Actor} and {@link Arbiter} annotations are used to describe test
- * behavior. {@link State} and {@link Result} annotations are used to
- * describe the test state.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ConcurrencyStressTest {
-}
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/Result.java	Sat Mar 15 01:49:53 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.infra.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotates the class that is treated as the result object.
- * <p/>
- * Important invariants:
- *   - Result classes usually mimic value types: they do not have identity, and harness
- *     may reuse the objects, and also auto-magically clear the fields;
- *   - All fields in Result classes should be public;
- *   - All fields in Result classes should be primitive;
- *   - Result classes should be serializable;
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Result {
-}
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/annotations/State.java	Sat Mar 15 01:49:53 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.infra.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotates the class treated as test state.
- * <p/>
- * Important invariants:
- *   - State classes should have a default constructor;
- *   - All initializations in constructors and instance intializers are visible to all actors;
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface State {
-}
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/ConcurrencyStressTestProcessor.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/ConcurrencyStressTestProcessor.java	Sat Mar 15 02:04:28 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.infra.processors;
 
 import org.openjdk.jcstress.Options;
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.Result;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.Result;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.collectors.TestResultCollector;
 import org.openjdk.jcstress.infra.runners.Control;
 import org.openjdk.jcstress.infra.runners.Runner;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/TestInfo.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/TestInfo.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.infra.processors;
 
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.Result;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.Result;
+import org.openjdk.jcstress.annotations.State;
 
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/BooleanResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult3.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult3.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult8.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ByteResult8.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/CharResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/DoubleResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/FloatResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult3.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult3.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult8.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/IntResult8.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult3.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult3.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/LongResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult2.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult2.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult4.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/results/ShortResult4.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,7 +24,7 @@
  */
 package org.openjdk.jcstress.infra.results;
 
-import org.openjdk.jcstress.infra.annotations.Result;
+import org.openjdk.jcstress.annotations.Result;
 import sun.misc.Contended;
 
 import java.io.Serializable;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/runners/Runner.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/runners/Runner.java	Sat Mar 15 02:04:28 2014 +0400
@@ -25,7 +25,6 @@
 package org.openjdk.jcstress.infra.runners;
 
 import org.openjdk.jcstress.Options;
-import org.openjdk.jcstress.infra.annotations.Result;
 import org.openjdk.jcstress.infra.Status;
 import org.openjdk.jcstress.infra.collectors.TestResult;
 import org.openjdk.jcstress.infra.collectors.TestResultCollector;
@@ -33,12 +32,9 @@
 import org.openjdk.jcstress.util.NullOutputStream;
 import org.openjdk.jcstress.util.VMSupport;
 
-import javax.xml.bind.JAXBException;
-import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Collection;
-import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/runners/TerminationRunner.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/runners/TerminationRunner.java	Sat Mar 15 02:04:28 2014 +0400
@@ -25,7 +25,6 @@
 package org.openjdk.jcstress.infra.runners;
 
 import org.openjdk.jcstress.Options;
-import org.openjdk.jcstress.infra.annotations.Result;
 import org.openjdk.jcstress.infra.collectors.TestResultCollector;
 import org.openjdk.jcstress.tests.TerminationTest;
 import org.openjdk.jcstress.util.Counter;
--- a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/ResultGenerator.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/ResultGenerator.java	Sat Mar 15 02:04:28 2014 +0400
@@ -67,7 +67,7 @@
         pw.println("package org.openjdk.jcstress.infra.results;");
         pw.println("");
         pw.println("import java.io.Serializable;");
-        pw.println("import org.openjdk.jcstress.infra.annotations.Result;");
+        pw.println("import org.openjdk.jcstress.annotations.Result;");
         pw.println("");
         pw.println("@Result");
         pw.println("public class " + name + " implements Serializable {");
--- a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java	Sat Mar 15 02:04:28 2014 +0400
@@ -142,9 +142,9 @@
             pw.println("import " + prim.getClassName() + ";");
         }
         pw.println("import org.openjdk.jcstress.infra.results." + resultName + ";");
-        pw.println("import org.openjdk.jcstress.infra.annotations.Actor;");
-        pw.println("import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;");
-        pw.println("import org.openjdk.jcstress.infra.annotations.State;");
+        pw.println("import org.openjdk.jcstress.annotations.Actor;");
+        pw.println("import org.openjdk.jcstress.annotations.ConcurrencyStressTest;");
+        pw.println("import org.openjdk.jcstress.annotations.State;");
         pw.println();
         pw.println("@ConcurrencyStressTest");
         pw.println("@State");
--- a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/tracer/TraceGen.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/tracer/TraceGen.java	Sat Mar 15 02:04:28 2014 +0400
@@ -205,9 +205,9 @@
         pw.println("package " + pkg + ";");
         pw.println();
         pw.println("import org.openjdk.jcstress.infra.results." + resultName + ";");
-        pw.println("import org.openjdk.jcstress.infra.annotations.Actor;");
-        pw.println("import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;");
-        pw.println("import org.openjdk.jcstress.infra.annotations.State;");
+        pw.println("import org.openjdk.jcstress.annotations.Actor;");
+        pw.println("import org.openjdk.jcstress.annotations.ConcurrencyStressTest;");
+        pw.println("import org.openjdk.jcstress.annotations.State;");
         pw.println();
         pw.println("@ConcurrencyStressTest");
         pw.println("@State");
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferViewsAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferViewsAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/CharBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/CharBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.CharBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferViewsAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferViewsAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DoubleBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DoubleBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.DoubleBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/FloatBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/FloatBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.FloatBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/IntBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/IntBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.IntBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/LongBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/LongBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,8 +24,8 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.LongBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ShortBufferAtomicityTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ShortBufferAtomicityTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.nio.ShortBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/ByteBufferIntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/ByteBufferIntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.crosscache;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/DirectByteBufferIntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/DirectByteBufferIntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.crosscache;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/UnsafeIntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/UnsafeIntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.crosscache;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ByteAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ByteAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/CharAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/CharAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/DoubleAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/DoubleAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/FloatAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/FloatAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/IntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/IntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/LongAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/LongAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ShortAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ShortAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileByteAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileByteAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileCharAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileCharAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileDoubleAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileDoubleAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileFloatAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileFloatAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileIntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileIntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileLongAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileLongAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileShortAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileShortAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanInitialValueTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanInitialValueTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomics.booleans;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 import java.util.concurrent.atomic.AtomicBoolean;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomics.booleans;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 import java.util.concurrent.atomic.AtomicBoolean;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInitialValueTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInitialValueTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomics.integer;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.integer;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.integer;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.integer;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerInitialValueTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerInitialValueTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomics.integer;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 import java.util.concurrent.atomic.AtomicInteger;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.integer;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInitialValueTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInitialValueTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomics.longs;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
 import java.util.concurrent.atomic.AtomicLongArray;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.longs;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.util.concurrent.atomic.AtomicLongArray;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.longs;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.longs;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongInitialValueTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongInitialValueTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.atomics.longs;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.util.concurrent.atomic.AtomicLong;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.atomics.longs;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/BooleanLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/BooleanLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ByteLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ByteLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/CharLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/CharLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/DoubleLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/DoubleLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/FloatLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/FloatLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/IntLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/IntLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/LongLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/LongLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ObjectLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ObjectLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ShortLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ShortLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/BooleanLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/BooleanLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ByteLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ByteLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/CharLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/CharLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/DoubleLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/DoubleLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/FloatLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/FloatLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/IntLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/IntLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/LongLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/LongLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ObjectLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ObjectLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ShortLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ShortLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/BooleanLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/BooleanLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ByteLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ByteLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/CharLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/CharLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/DoubleLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/DoubleLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/FloatLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/FloatLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/IntLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/IntLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/LongLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/LongLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ObjectLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ObjectLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ShortLazyTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ShortLazyTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedAcquireReleaseTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedAcquireReleaseTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedDekkerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedDekkerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedPublicationTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedPublicationTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedReadTwiceTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedReadTwiceTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedAcquireReleaseTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedAcquireReleaseTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedDekkerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedDekkerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -25,9 +25,9 @@
 package org.openjdk.jcstress.tests.fences;
 
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedPublicationTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedPublicationTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedReadTwiceTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedReadTwiceTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.fences;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/future/FutureTaskSetTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/future/FutureTaskSetTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.future;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 import java.util.concurrent.Callable;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -25,9 +25,9 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -25,9 +25,9 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/BooleanFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/BooleanFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ByteFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ByteFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/CharFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/CharFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/DoubleFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/DoubleFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/FloatFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/FloatFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/IntFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/IntFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/LongFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/LongFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ShortFencedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ShortFencedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/BooleanFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/BooleanFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ByteFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ByteFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/CharFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/CharFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/DoubleFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/DoubleFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/FloatFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/FloatFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/IntFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/IntFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/LongFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/LongFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ShortFinalTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ShortFinalTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/BooleanInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/BooleanInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ByteInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ByteInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/CharInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/CharInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/DoubleInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/DoubleInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/FloatInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/FloatInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/IntInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/IntInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/LongInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/LongInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ShortInstanceInitializerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ShortInstanceInitializerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BooleanPlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BooleanPlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BytePlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BytePlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/CharPlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/CharPlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/DoublePlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/DoublePlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/FloatPlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/FloatPlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/IntPlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/IntPlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/LongPlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/LongPlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/ShortPlainTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/ShortPlainTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/BooleanVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/BooleanVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ByteVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ByteVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/CharVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/CharVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/DoubleVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/DoubleVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/FloatVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/FloatVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/IntVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/IntVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/LongVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/LongVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ShortVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ShortVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier0Test.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier0Test.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.barriers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier1Test.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier1Test.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.barriers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier2Test.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier2Test.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.barriers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier3Test.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier3Test.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.barriers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantLockMutexTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantLockMutexTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.mutex;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 import java.util.concurrent.TimeUnit;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantRWLockMutexTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantRWLockMutexTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.mutex;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 import java.util.concurrent.TimeUnit;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/SynchronizedMutexTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/SynchronizedMutexTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.mutex;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.stamped;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 import java.util.concurrent.TimeUnit;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.stamped;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 import java.util.concurrent.locks.StampedLock;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/AQSTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/AQSTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/BitSetTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/BitSetTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.scratch;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
 import java.util.BitSet;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/FailingCASTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/FailingCASTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/Unsafe_GetDoubleVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/Unsafe_GetDoubleVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_1_Test.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_1_Test.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_2_Test.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_2_Test.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/SynchronizedTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/SynchronizedTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch.basic;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadJoinTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadJoinTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch.basic;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadStartTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadStartTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch.basic;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/VolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/VolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.scratch.basic;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/FinalWrapperSingletonTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/FinalWrapperSingletonTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.singletons;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/HolderSingletonTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/HolderSingletonTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.singletons;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCLSingletonTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCLSingletonTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.singletons;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCLSingletonTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCLSingletonTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.singletons;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCLSingletonTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCLSingletonTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.singletons;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/ArrayInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/ArrayInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeArrayInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeArrayInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeIntTearingTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeIntTearingTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ByteBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ByteBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/CharBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/CharBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.CharBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DirectByteBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DirectByteBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.ByteBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DoubleBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DoubleBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.DoubleBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/FloatBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/FloatBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.FloatBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/IntBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/IntBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.IntBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/LongBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/LongBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.LongBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ShortBufferInterleaveTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ShortBufferInterleaveTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,10 +24,10 @@
  */
 package org.openjdk.jcstress.tests.tearing.buffers;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.Arbiter;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.nio.ShortBuffer;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong1.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong1.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.unsafe;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 import sun.misc.Contended;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong42.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong42.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.unsafe;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
 import sun.misc.Contended;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DekkerTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DekkerTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DoubleVolatileTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DoubleVolatileTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/IRIWTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/IRIWTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/LazySetTransitivityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/LazySetTransitivityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.util.concurrent.atomic.AtomicInteger;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadAfterVolatileReadTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadAfterVolatileReadTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadTwiceOverVolatileReadTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadTwiceOverVolatileReadTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileAcquireReleaseTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileAcquireReleaseTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIRIWTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIRIWTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 @ConcurrencyStressTest
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIncrementAtomicityTest.java	Sat Mar 15 01:49:53 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIncrementAtomicityTest.java	Sat Mar 15 02:04:28 2014 +0400
@@ -24,9 +24,9 @@
  */
 package org.openjdk.jcstress.tests.volatiles;
 
-import org.openjdk.jcstress.infra.annotations.Actor;
-import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.infra.annotations.State;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
 /**