harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r727683 [1/11] - in /harmony/enhanced/classlib/branches/java6: ./ doc/ make/ modules/accessibility/src/main/java/javax/accessibility/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/main/java/java/util/zip/ modules/archive/...
Date Thu, 18 Dec 2008 09:46:26 GMT
Author: tonywu
Date: Thu Dec 18 01:46:12 2008
New Revision: 727683

URL: http://svn.apache.org/viewvc?rev=727683&view=rev
Log:
Merge updates from classlib trunk@727674 since r713673

Added:
    harmony/enhanced/classlib/branches/java6/doc/.project
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/doc/.project
    harmony/enhanced/classlib/branches/java6/doc/overview.html
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/doc/overview.html
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/www/
      - copied from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/www/
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/
      - copied from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/
      - copied from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/gif.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/gif.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/jpeg.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/jpeg.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/png.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/www/content/image/png.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Callable.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executor.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executors.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Future.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Future.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
      - copied from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/package.html
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/package.html
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
      - copied from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/Condition.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/Condition.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/Lock.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/Lock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ReentrantLock.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/ReentrantLock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/package.html
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/package.html
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/package.html   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/package.html
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AbstractQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicBooleanTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicBooleanTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicIntegerTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicIntegerTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicLongArrayTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongArrayTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicLongTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicLongTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicReferenceTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicReferenceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ConcurrentHashMapTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/CountDownLatchTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CountDownLatchTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/CyclicBarrierTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/CyclicBarrierTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/DelayQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/DelayQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ExchangerTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExchangerTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ExecutorsTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ExecutorsTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/FutureTaskTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/FutureTaskTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/JSR166TestCase.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/JSR166TestCase.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/LinkedListTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LinkedListTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/LockSupportTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/LockSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/PriorityQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/PriorityQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ReentrantLockTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantLockTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ScheduledExecutorTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ScheduledExecutorTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/SemaphoreTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SemaphoreTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/SynchronousQueueTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SynchronousQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/SystemTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/SystemTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ThreadLocalTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadLocalTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ThreadTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/ThreadTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/TimeUnitTest.java   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/concurrent/src/test/java/TimeUnitTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSMemory.c   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSMemory.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSMemory.h   (props changed)
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSMemory.h
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/MetadataBandGroup.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/MetadataBandGroup.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/jndi.jar
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/jndi.jar
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/jndiUnpacked.jar
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/jndiUnpacked.jar
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/package-info.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/package-info.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/package-info.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/javax/net/ssl/package-info.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/SpiEngUtils.java
      - copied unchanged from r727674, harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/SpiEngUtils.java
Removed:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/content/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainMulticastSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainServerSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl2.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketImplProvider.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdaptable.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterFactory.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterManager.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/ISystemComponent.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponentFactory.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemory.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemory.h
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSMemory.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSMemory.h
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/ContextImpl.java
Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt
    harmony/enhanced/classlib/branches/java6/doc/build.xml
    harmony/enhanced/classlib/branches/java6/make/build-java.xml
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/jgss/kerberos/toolbox/KerberosToolboxImpl.java
    harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Component.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Font.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagLayout.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Toolkit.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Font.cpp
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/.classpath
    harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Class.java
    harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/FilterInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/InputStreamReader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/OutputStreamWriter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramSocket.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/MulticastSocket.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Socket.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Hashtable.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/nethelp.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSMemoryWin32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/RandomAccessFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/AuthenticatorTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashtableTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/unix/org/apache/harmony/luni/tests/java/io/UnixFileTest.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/hyniochar.def   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeDefinitionBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CPClass.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CPSignature.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/IcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ArchiveTest.java
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hyerrorhelpers.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hyfile.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycpu/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hycunit/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyfiletext/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyfiletext/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyfiletext/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hygp/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hygp/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hygp/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyipcmutex/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyipcmutex/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyipcmutex/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymem/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymem/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymem/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymmap/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymmap/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymmap/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hynls/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hynls/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hynls/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyport/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyport/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hyport/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hystr/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hystr/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hystr/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hysysinfo/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hysysinfo/shared/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hysysinfo/windows/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/KeyStore.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/UnresolvedPermission.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x501/AttributeTypeAndValue.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java.injected/java/security/UnresolvedPermission_ImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/JoinRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/suncompat/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoderImpl.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.common
    harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/ImageIcon.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/synth/ColorPainter.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/synth/ColorType.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/View.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/FormView.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/rtf/RTFEditorKit.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/Bidi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/.settings/org.eclipse.jdt.core.prefs
    harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/DefaultServerSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/DefaultSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ServerSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/SocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/HostnameVerifier.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/HttpsURLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManager.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLContext.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLContextSpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLEngine.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLEngineResult.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLHandshakeException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLKeyException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLPermission.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLProtocolException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLServerSocket.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLSession.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLSessionContext.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLSocket.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/TrustManager.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/TrustManagerFactory.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/X509KeyManager.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/javax/net/ssl/X509TrustManager.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ContentType.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DataStream.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfBufferException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfSourceException.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineDataStream.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory1Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory2Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/classlib/trunk:713674-727674

Modified: harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt (original)
+++ harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt Thu Dec 18 01:46:12 2008
@@ -119,10 +119,10 @@
 
 
 
-License Notice for Bouncy Castle version 1.38
-============================================
+License Notice for Bouncy Castle version 1.41
+=============================================
 
-Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2008 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

Modified: harmony/enhanced/classlib/branches/java6/doc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/doc/build.xml?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/doc/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/doc/build.xml Thu Dec 18 01:46:12 2008
@@ -104,7 +104,7 @@
           
           This is work in progress, and currently requires you to manually download and
           extract the source code for MX4J, Yoko, and XML commons into a 'temp' directory.
-          Plans are to automate that one the doc generation is up and running ok.
+          Plans are to automate that once the doc generation is up and running ok.
           
           The task description for jdocs is similar to the javadoc task - so to test it
           you can always temporarily change it to javadoc and view the output. 
@@ -113,7 +113,9 @@
         <property name="modules.dir" location="${basedir}/../modules"/>
         <taskdef name="jdocs" classname="com.dzone.jdocs.ant.jdk15.task.Jdocs"/>
         <jdocs destdir="${basedir}/javadoc"
-            access="protected" >
+            overview="overview.html"
+            additionalparam=""
+            access="protected">
 
             <!-- Source files maintained by Harmony -->
             <packageset dir="${modules.dir}/accessibility/src/main/java/">

Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Thu Dec 18 01:46:12 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" />

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java Thu Dec 18 01:46:12 2008
@@ -15,18 +15,16 @@
  *  limitations under the License.
  */
 
-/**
- * @author Dennis Ushakov
- * @version $Revision$
- */
-
 package javax.accessibility;
 
 public interface AccessibleAction {
-    static final String TOGGLE_EXPAND = "toggle expand"; //$NON-NLS-1$
-    static final String INCREMENT = "increment"; //$NON-NLS-1$
-    static final String DECREMENT = "decrement"; //$NON-NLS-1$
+    static final String TOGGLE_EXPAND = new String("toggle expand"); //$NON-NLS-1$
+    static final String INCREMENT = new String("increment"); //$NON-NLS-1$
+    static final String DECREMENT = new String("decrement"); //$NON-NLS-1$
+
     int getAccessibleActionCount();
+
     String getAccessibleActionDescription(int i);
+
     boolean doAccessibleAction(int i);
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java Thu Dec 18 01:46:12 2008
@@ -15,20 +15,15 @@
  *  limitations under the License.
  */
 
-/**
- * @author Dennis Ushakov
- * @version $Revision$
- */
-
 package javax.accessibility;
 
 
 public class AccessibleRelation extends AccessibleBundle {
-    public static final String LABEL_FOR = "labelFor"; //$NON-NLS-1$
-    public static final String LABELED_BY = "labeledBy"; //$NON-NLS-1$
-    public static final String MEMBER_OF = "memberOf"; //$NON-NLS-1$
-    public static final String CONTROLLER_FOR = "controllerFor"; //$NON-NLS-1$
-    public static final String CONTROLLED_BY = "controlledBy"; //$NON-NLS-1$
+    public static final String LABEL_FOR = new String("labelFor"); //$NON-NLS-1$
+    public static final String LABELED_BY = new String("labeledBy"); //$NON-NLS-1$
+    public static final String MEMBER_OF = new String("memberOf"); //$NON-NLS-1$
+    public static final String CONTROLLER_FOR = new String("controllerFor"); //$NON-NLS-1$
+    public static final String CONTROLLED_BY = new String("controlledBy"); //$NON-NLS-1$
     public static final String FLOWS_TO = "flowsTo"; //$NON-NLS-1$
     public static final String FLOWS_FROM = "flowsFrom"; //$NON-NLS-1$
     public static final String SUBWINDOW_OF = "subwindowOf"; //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java Thu Dec 18 01:46:12 2008
@@ -110,7 +110,7 @@
             name = buf;
         }
 
-        public byte[] getBytes() {
+        byte[] getBytes() {
             return name;
         }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java Thu Dec 18 01:46:12 2008
@@ -17,7 +17,6 @@
 
 package java.util.jar;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -255,8 +254,7 @@
             return manifest;
         }
         try {
-            ByteArrayInputStream is = (ByteArrayInputStream) super
-                    .getInputStream(manifestEntry);
+            InputStream is = super.getInputStream(manifestEntry);
             if (verifier != null) {
                 byte[] buf = new byte[is.available()];
                 is.mark(buf.length);

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java Thu Dec 18 01:46:12 2008
@@ -258,7 +258,6 @@
      *            of no use
      */
     @Override
-    @SuppressWarnings("unused")
     public void mark(int readlimit) {
         // do nothing
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java Thu Dec 18 01:46:12 2008
@@ -140,7 +140,7 @@
         try {
             InputStream is = new URL(jarDirUrl + "/jarlist.txt").openStream();
             while (is.available() > 0) {
-                StringBuffer linebuff = new StringBuffer(80); // Typical line
+                StringBuilder linebuff = new StringBuilder(80); // Typical line
                 // length
                 done: while (true) {
                     int nextByte = is.read();
@@ -516,4 +516,39 @@
             }
         }
     }
+    
+    /*
+     * @test JarFile.getInputStream()
+     */
+    public void testGetInputStreamLjava_util_jar_JarEntry() throws IOException {
+        Support_Resources.copyFile(resources, null, JAR1);
+        JarFile jf = new JarFile(new File(resources, JAR1));
+        InputStream is = jf.getInputStream(jf.getEntry(JAR1_ENTRY1));
+        assertTrue(is.available() > 0);
+
+        byte[] buffer = new byte[1024];
+        int r = is.read(buffer, 0, 1024);
+        jf.close();
+        is.close();
+
+        StringBuilder sb = new StringBuilder(r);
+        for (int i = 0; i < r; i++) {
+            sb.append((char) (buffer[i] & 0xff));
+        }
+        String contents = sb.toString();
+        assertTrue(contents.indexOf("foo") > 0);
+        assertTrue(contents.indexOf("bar") > 0);
+
+        try {
+            jf.getInputStream(jf.getEntry(JAR1_ENTRY1));
+            fail("should throw IllegalStateException");
+        } catch (IllegalStateException e) {
+            // Expected
+        }
+
+        jf = new JarFile(new File(resources, JAR1));
+        is = jf.getInputStream(new JarEntry("invalid"));
+        assertNull(is);
+        jf.close(); 
+    }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java Thu Dec 18 01:46:12 2008
@@ -226,6 +226,87 @@
     public void test_size() {
         assertEquals(6, zfile.size());
     }
+    
+    /**
+     * @tests java.io.InputStream#reset()
+     */
+    public void test_reset() throws IOException {
+        // read an uncompressed entry
+        ZipEntry zentry = zfile.getEntry("File1.txt");
+        InputStream is = zfile.getInputStream(zentry);
+        byte[] rbuf1 = new byte[6];
+        byte[] rbuf2 = new byte[6];
+        int r1, r2;
+        r1 = is.read(rbuf1);
+        assertEquals(rbuf1.length, r1);
+        r2 = is.read(rbuf2);
+        assertEquals(rbuf2.length, r2);
+        
+        is.reset();
+        r2 = is.read(rbuf2);
+        assertEquals(rbuf2.length, r2);
+        is.close();
+
+        // read a compressed entry
+        byte[] rbuf3 = new byte[4185];
+        ZipEntry zentry2 = zfile.getEntry("File3.txt");
+        is = zfile.getInputStream(zentry2);
+        r1 = is.read(rbuf3);
+        assertEquals(4183, r1);
+        is.reset();
+        
+        r1 = is.read(rbuf3);
+        assertEquals(4183, r1);
+        is.close();
+
+        is = zfile.getInputStream(zentry2);
+        r1 = is.read(rbuf3, 0, 3000);
+        assertEquals(3000, r1);
+        is.reset();
+        r1 = is.read(rbuf3, 0, 3000);
+        assertEquals(3000, r1);
+        is.close();
+    }
+    
+    /**
+     * @tests java.io.InputStream#reset()
+     */
+    public void test_reset_subtest0() throws IOException {
+        // read an uncompressed entry
+        ZipEntry zentry = zfile.getEntry("File1.txt");
+        InputStream is = zfile.getInputStream(zentry);
+        byte[] rbuf1 = new byte[12];
+        byte[] rbuf2 = new byte[12];
+        int r = is.read(rbuf1, 0, 4);
+        assertEquals(4, r);
+        is.mark(0);
+        r = is.read(rbuf1);
+        assertEquals(8, r);
+        assertEquals(-1, is.read());
+        
+        is.reset();
+        r = is.read(rbuf2);
+        assertEquals(8, r);
+        assertEquals(-1, is.read());
+        is.close();
+
+        // read a compressed entry
+        byte[] rbuf3 = new byte[4185];
+        ZipEntry zentry2 = zfile.getEntry("File3.txt");
+        is = zfile.getInputStream(zentry2);
+        r = is.read(rbuf3, 0, 3000);
+        assertEquals(3000, r);
+        is.mark(0);
+        r = is.read(rbuf3);
+        assertEquals(1183, r);
+        assertEquals(-1, is.read());
+        
+        is.reset();
+        r = is.read(rbuf3);
+        assertEquals(1183, r);
+        assertEquals(-1, is.read());
+        is.close();
+    }
 
 	/**
 	 * Sets up the fixture, for example, open a network connection. This method

Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/jgss/kerberos/toolbox/KerberosToolboxImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/jgss/kerberos/toolbox/KerberosToolboxImpl.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/jgss/kerberos/toolbox/KerberosToolboxImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/jgss/kerberos/toolbox/KerberosToolboxImpl.java Thu Dec 18 01:46:12 2008
@@ -33,22 +33,22 @@
         this.kdc = kdc;
     }
     
-    public KerberosTicket getTGS(String serverPrincipalName, KerberosTicket TGT) {
+    public KerberosTicket getTGS(String serverPrincipalName, KerberosTicket TGT) throws NotImplementedException {
         // TODO Auto-generated method stub
         throw new NotImplementedException();
     }
 
-    public KerberosTicket getTGT(String clientPrincipalName, char[] password) {
+    public KerberosTicket getTGT(String clientPrincipalName, char[] password) throws NotImplementedException {
         // TODO Auto-generated method stub
         throw new NotImplementedException();
     }
 
-	public KerberosApplicationRequest decodeApplicationRequest(byte[] token) {
+	public KerberosApplicationRequest decodeApplicationRequest(byte[] token) throws NotImplementedException {
 		// TODO Auto-generated method stub
 		throw new NotImplementedException();
 	}
 
-	public byte[] encodeApplicationRequest(KerberosApplicationRequest kerberosApplicationRequest) {
+	public byte[] encodeApplicationRequest(KerberosApplicationRequest kerberosApplicationRequest) throws NotImplementedException {
 		// TODO Auto-generated method stub
 		throw new NotImplementedException();
 	}

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF Thu Dec 18 01:46:12 2008
@@ -38,7 +38,8 @@
  org.apache.harmony.luni.util,
  org.apache.harmony.misc,
  org.apache.harmony.misc.accessors,
- org.apache.harmony.x.print
+ org.apache.harmony.x.print,
+ tests.support.resource;hy_usage=test;resolution:=optional
 Export-Package: java.awt,
  java.awt.color,
  java.awt.datatransfer,
@@ -57,6 +58,7 @@
  org.apache.harmony.awt.gl,
  org.apache.harmony.awt.gl.image,
  org.apache.harmony.awt.gl.windows,
+ org.apache.harmony.awt.www.content.image,
  org.apache.harmony.awt.nativebridge,
  org.apache.harmony.awt.nativebridge.windows,
  org.apache.harmony.awt.text



Mime
View raw message