You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2008/11/30 19:26:04 UTC
svn commit: r721868 - in /harmony/enhanced/classlib/trunk: make/
modules/concurrent/ modules/concurrent/make/
modules/concurrent/src/main/java/java/util/concurrent/
modules/concurrent/src/main/java/java/util/concurrent/atomic/
modules/concurrent/src/ma...
Author: ndbeyer
Date: Sun Nov 30 10:26:02 2008
New Revision: 721868
URL: http://svn.apache.org/viewvc?rev=721868&view=rev
Log:
Move concurrent code into 'enhanced' portion of repository, per conversation [1].
[1] http://harmony.markmail.org/message/xbzlwwgoaozgbnan
Added:
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Callable.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executor.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executors.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Future.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Future.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/ (props changed)
- copied from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/atomic/
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/ (props changed)
- copied from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/locks/
harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/package.html (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/main/java/java/util/concurrent/package.html
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AbstractQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicBooleanTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicBooleanTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicIntegerTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongArrayTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicLongArrayTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicLongTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicReferenceTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentHashMapTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CountDownLatchTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/CountDownLatchTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CyclicBarrierTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/CyclicBarrierTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/DelayQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/DelayQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExchangerTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ExchangerTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorsTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ExecutorsTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/FutureTaskTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/FutureTaskTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/JSR166TestCase.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/JSR166TestCase.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedListTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/LinkedListTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LockSupportTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/LockSupportTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/PriorityQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantLockTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ReentrantLockTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ScheduledExecutorTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ScheduledExecutorTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SemaphoreTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/SemaphoreTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SynchronousQueueTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/SynchronousQueueTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SystemTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/SystemTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadLocalTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ThreadLocalTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/ThreadTest.java
harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/TimeUnitTest.java (props changed)
- copied unchanged from r721712, harmony/standard/classlib/branches/java5/modules/concurrent/src/test/java/TimeUnitTest.java
Modified:
harmony/enhanced/classlib/trunk/make/build-java.xml
harmony/enhanced/classlib/trunk/modules/concurrent/ (props changed)
harmony/enhanced/classlib/trunk/modules/concurrent/.classpath
harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml
Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=721868&r1=721867&r2=721868&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Sun Nov 30 10:26:02 2008
@@ -129,7 +129,6 @@
<src path="modules/awt/src/main/java/common" />
<src path="modules/beans/src/main/java" />
<src path="modules/concurrent/src/main/java/" />
- <src path="modules/concurrent/standard/src/main/java/" />
<src path="modules/crypto/src/main/java" />
<src path="modules/instrument/src/main/java" />
<src path="modules/imageio/src/main/java" />
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/
('svn:externals' removed)
Modified: harmony/enhanced/classlib/trunk/modules/concurrent/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/.classpath?rev=721868&r1=721867&r2=721868&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/.classpath (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/.classpath Sun Nov 30 10:26:02 2008
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry output="bin/main" kind="src" path="standard/src/main/java"/>
- <classpathentry output="bin/main" kind="src" path="standard/src/main/resources"/>
- <classpathentry output="bin/test" kind="src" path="standard/src/test/java"/>
- <classpathentry output="bin/test" kind="src" path="standard/src/test/resources"/>
- <classpathentry output="bin/main" kind="src" path="src/main/java"/>
- <classpathentry output="bin/main" kind="src" path="src/main/resources"/>
- <classpathentry output="bin/test" kind="src" path="src/test/java"/>
- <classpathentry output="bin/test" kind="src" path="src/test/resources"/>
+ <classpathentry kind="src" output="bin/main" path="src/main/java"/>
+ <classpathentry kind="src" output="bin/main" path="src/main/resources"/>
+ <classpathentry kind="src" output="bin/test" path="src/test/java"/>
+ <classpathentry kind="src" output="bin/test" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin/main"/>
Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=721868&r1=721867&r2=721868&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Sun Nov 30 10:26:02 2008
@@ -28,14 +28,8 @@
<fileset id="classes" dir="${hy.build}">
<or>
- <present targetdir="src/main/java" />
- <present targetdir="src/main/java">
- <mapper type="regexp"
- from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
- to="\1.java"/>
- </present>
- <present targetdir="standard/src/main/java" />
- <present targetdir="standard/src/main/java">
+ <present targetdir="${hy.concurrent.src.main.java}" />
+ <present targetdir="${hy.concurrent.src.main.java}">
<mapper type="regexp"
from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
to="\1.java"/>
@@ -64,8 +58,8 @@
<target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
<target name="clean">
- <delete file="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}-src.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/concurrent.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/concurrent-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
@@ -77,8 +71,9 @@
<mkdir dir="${hy.build}" />
- <javac destdir="${hy.build}"
- sourcepath=""
+ <javac sourcepath=""
+ srcdir="${hy.concurrent.src.main.java}"
+ destdir="${hy.build}"
compiler="${hy.javac.compiler}"
memoryMaximumSize="${hy.javac.maxmem}"
source="${hy.javac.source}"
@@ -87,8 +82,6 @@
<compilerarg line="${build.compilerarg}" />
- <src path="src/main/java" />
- <src path="standard/src/main/java" />
<bootclasspath>
<fileset dir="${hy.jdk}/jre/lib/boot">
<include name="**/*.jar" />
@@ -98,7 +91,7 @@
</target>
<target name="build-jar" depends="svn-info">
- <jar destfile="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}.jar"
+ <jar destfile="${hy.jdk}/jre/lib/boot/concurrent.jar"
manifest="${hy.concurrent}/META-INF/MANIFEST.MF"
compress="${hy.jar.compress}">
<fileset refid="classes" />
@@ -109,9 +102,8 @@
<metainf refid="hy.required.metainf-files"/>
</jar>
- <jar destfile="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}-src.jar">
- <fileset dir="src/main/java" />
- <fileset dir="standard/src/main/java" />
+ <jar destfile="${hy.jdk}/jre/lib/boot/concurrent-src.jar">
+ <fileset dir="${hy.concurrent.src.main.java}" />
<manifest>
<attribute name="Implementation-Version" value="${svn.info}"/>
</manifest>
@@ -125,25 +117,21 @@
<mkdir dir="${hy.concurrent.bin.test}" />
- <javac destdir="${hy.concurrent.bin.test}"
- sourcepath=""
+ <javac sourcepath=""
+ srcdir="${hy.concurrent.src.test.java}"
+ destdir="${hy.concurrent.bin.test}"
compiler="${hy.javac.compiler}"
memoryMaximumSize="${hy.javac.maxmem}"
source="${hy.javac.source}"
target="${hy.javac.target}"
debug="${hy.javac.debug}">
-
<compilerarg line="${build.compilerarg}" />
-
- <src path="src/test/java" />
- <src path="standard/src/test/java" />
<bootclasspath>
<fileset dir="${hy.jdk}/jre/lib/boot">
<include name="**/*.jar" />
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
- <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -189,13 +177,6 @@
<include name="**/*Test.java" unless="test.case" />
<excludesfile name="${concurrent.exclude.file}" unless="test.case" />
</fileset>
- <fileset dir="${hy.concurrent.src.test.standard}">
- <!-- if ${test.case} -->
- <include name="${converted.tc}" if="test.case" />
- <!-- unless ${test.case} -->
- <include name="**/*Test.java" unless="test.case" />
- <excludesfile name="${concurrent.exclude.file}" unless="test.case" />
- </fileset>
</batchtest>
</junit>
<antcall target="touch-failures-file" />
Modified: harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml?rev=721868&r1=721867&r2=721868&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml Sun Nov 30 10:26:02 2008
@@ -21,12 +21,10 @@
<src>
<main>
<java location="src/main/java" />
- <standard location="standard/src/main/java" />
<resources location="src/main/resources" />
</main>
<test>
<java location="src/test/java" />
- <standard location="standard/src/test/java" />
<resources location="src/test/resources" />
</test>
</src>
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Future.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Future.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/package.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicBooleanTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicBooleanTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongArrayTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongArrayTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CountDownLatchTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CountDownLatchTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CyclicBarrierTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CyclicBarrierTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/DelayQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/DelayQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExchangerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExchangerTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorsTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/FutureTaskTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/FutureTaskTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/JSR166TestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/JSR166TestCase.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedListTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedListTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LockSupportTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LockSupportTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantLockTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantLockTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ScheduledExecutorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ScheduledExecutorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SemaphoreTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SemaphoreTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SynchronousQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SynchronousQueueTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SystemTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SystemTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadLocalTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadLocalTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/TimeUnitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/TimeUnitTest.java
------------------------------------------------------------------------------
svn:mergeinfo =