Changeset: 09dc601a8bb3 Author: dl Date: 2009-11-02 17:25 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/09dc601a8bb3
6865582: jsr166y - jsr166 maintenance update 6865571: Add a lightweight task framework known as ForkJoin 6445158: Phaser - an improved CyclicBarrier 6865579: Add TransferQueue/LinkedTransferQueue Reviewed-by: martin, chegar, dice ! make/java/java/FILES_java.gmk ! src/share/classes/java/util/AbstractList.java ! src/share/classes/java/util/AbstractQueue.java ! src/share/classes/java/util/HashMap.java ! src/share/classes/java/util/HashSet.java ! src/share/classes/java/util/Random.java ! src/share/classes/java/util/concurrent/ArrayBlockingQueue.java ! src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java ! src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java ! src/share/classes/java/util/concurrent/CountDownLatch.java ! src/share/classes/java/util/concurrent/ExecutorService.java + src/share/classes/java/util/concurrent/ForkJoinPool.java + src/share/classes/java/util/concurrent/ForkJoinTask.java + src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java + src/share/classes/java/util/concurrent/LinkedTransferQueue.java + src/share/classes/java/util/concurrent/Phaser.java + src/share/classes/java/util/concurrent/RecursiveAction.java + src/share/classes/java/util/concurrent/RecursiveTask.java ! src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java + src/share/classes/java/util/concurrent/ThreadLocalRandom.java + src/share/classes/java/util/concurrent/TransferQueue.java ! src/share/classes/java/util/concurrent/locks/Condition.java ! src/share/classes/java/util/concurrent/package-info.java ! test/java/util/Collection/BiggernYours.java ! test/java/util/Collection/IteratorAtEnd.java ! test/java/util/Collection/MOAT.java ! test/java/util/Collections/CheckedNull.java ! test/java/util/Collections/RacingCollections.java ! test/java/util/PriorityQueue/RemoveContains.java ! test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java ! test/java/util/concurrent/BlockingQueue/LastElement.java ! test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java ! test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java ! test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java ! test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java ! test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java ! test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java ! test/java/util/concurrent/ConcurrentQueues/GCRetention.java ! test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java ! test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java ! test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java + test/java/util/concurrent/Phaser/Arrive.java + test/java/util/concurrent/Phaser/Basic.java ! test/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java + test/java/util/concurrent/forkjoin/Integrate.java + test/java/util/concurrent/forkjoin/NQueensCS.java ! test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java ! test/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java Changeset: e2de121c27c4 Author: gbenson Date: 2009-10-15 13:27 +0100 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/e2de121c27c4 6891677: java/build integrate zero assembler JDK changes Summary: Build changes for the Zero assembler port Reviewed-by: ohair, tbell ! make/common/Defs-linux.gmk ! make/common/Program.gmk ! make/java/instrument/Makefile ! make/java/jli/Makefile ! make/java/redist/Makefile ! make/javax/sound/SoundDefs.gmk ! make/jdk_generic_profile.sh ! src/share/native/com/sun/media/sound/SoundDefs.h + src/solaris/bin/ergo_zero.c + src/solaris/bin/zero/jvm.cfg Changeset: bbf84ba4414c Author: ohair Date: 2009-10-20 16:15 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/bbf84ba4414c Merge Changeset: 9bc5338675e0 Author: andrew Date: 2009-10-26 21:42 +0000 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/9bc5338675e0 6895287: disable building fontchecker Summary: Changes to FontManager break bootstrap due to the fontchecker tool Reviewed-by: prr ! make/tools/Makefile - make/tools/fontchecker/Makefile - make/tools/src/build/tools/fontchecker/FontCheckDummy.java - make/tools/src/build/tools/fontchecker/FontChecker.java - make/tools/src/build/tools/fontchecker/FontCheckerConstants.java - make/tools/src/build/tools/fontchecker/FontFileFilter.java - make/tools/src/build/tools/fontchecker/README.txt Changeset: 009477966682 Author: ohair Date: 2009-10-28 16:26 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/009477966682 Merge - src/share/classes/sun/security/provider/certpath/LDAPCertStore.java Changeset: 1083413440ee Author: ohair Date: 2009-10-28 12:54 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/1083413440ee 6888701: Change all template java source files to a .java-template file suffix Reviewed-by: jjg, alanb, mr ! make/common/Release.gmk ! make/common/Rules.gmk ! make/java/nio/Makefile ! make/java/nio/genBuffer.sh ! make/java/version/Makefile ! make/netbeans/jconsole/build.properties ! make/netbeans/jconsole/build.xml ! make/sun/jconsole/Makefile ! make/sun/nio/Makefile - src/share/classes/java/nio/ByteBufferAs-X-Buffer.java + src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template - src/share/classes/java/nio/Direct-X-Buffer-bin.java + src/share/classes/java/nio/Direct-X-Buffer-bin.java.template - src/share/classes/java/nio/Direct-X-Buffer.java + src/share/classes/java/nio/Direct-X-Buffer.java.template - src/share/classes/java/nio/Heap-X-Buffer.java + src/share/classes/java/nio/Heap-X-Buffer.java.template - src/share/classes/java/nio/X-Buffer-bin.java + src/share/classes/java/nio/X-Buffer-bin.java.template - src/share/classes/java/nio/X-Buffer.java + src/share/classes/java/nio/X-Buffer.java.template - src/share/classes/java/nio/charset/Charset-X-Coder.java + src/share/classes/java/nio/charset/Charset-X-Coder.java.template - src/share/classes/sun/misc/Version-template.java + src/share/classes/sun/misc/Version.java.template - src/share/classes/sun/tools/jconsole/Version-template.java + src/share/classes/sun/tools/jconsole/Version.java.template - test/java/nio/Buffer/Basic-X.java + test/java/nio/Buffer/Basic-X.java.template - test/java/nio/Buffer/CopyDirect-X-Memory.java + test/java/nio/Buffer/CopyDirect-X-Memory.java.template ! test/java/nio/Buffer/genBasic.sh ! test/java/nio/Buffer/genCopyDirectMemory.sh Changeset: bf6b160b455d Author: ohair Date: 2009-10-28 13:00 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/bf6b160b455d 6888709: Change use of -DX=\""Y\"" to -DX='"Y"', consistently for all platforms Reviewed-by: jjg, tbell ! make/common/Defs.gmk ! make/common/Program.gmk ! make/java/main/java/Makefile ! make/java/main/javaw/Makefile ! make/javax/sound/Makefile ! make/launchers/Makefile.launcher Changeset: 72a511cf2019 Author: ohair Date: 2009-10-28 16:54 -0700 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/72a511cf2019 Merge - src/share/classes/java/nio/ByteBufferAs-X-Buffer.java - src/share/classes/java/nio/Direct-X-Buffer-bin.java - src/share/classes/java/nio/Direct-X-Buffer.java - src/share/classes/java/nio/Heap-X-Buffer.java - src/share/classes/java/nio/X-Buffer-bin.java - src/share/classes/java/nio/X-Buffer.java - src/share/classes/java/nio/charset/Charset-X-Coder.java - src/share/classes/sun/misc/Version-template.java - src/share/classes/sun/tools/jconsole/Version-template.java - test/java/nio/Buffer/Basic-X.java - test/java/nio/Buffer/CopyDirect-X-Memory.java Changeset: a340819de9b4 Author: tbell Date: 2009-11-02 00:06 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/a340819de9b4 Merge ! make/java/redist/Makefile - make/tools/fontchecker/Makefile - make/tools/src/build/tools/fontchecker/FontCheckDummy.java - make/tools/src/build/tools/fontchecker/FontChecker.java - make/tools/src/build/tools/fontchecker/FontCheckerConstants.java - make/tools/src/build/tools/fontchecker/FontFileFilter.java - make/tools/src/build/tools/fontchecker/README.txt - src/share/classes/java/nio/ByteBufferAs-X-Buffer.java - src/share/classes/java/nio/Direct-X-Buffer-bin.java - src/share/classes/java/nio/Direct-X-Buffer.java - src/share/classes/java/nio/Heap-X-Buffer.java - src/share/classes/java/nio/X-Buffer-bin.java - src/share/classes/java/nio/X-Buffer.java - src/share/classes/java/nio/charset/Charset-X-Coder.java - src/share/classes/sun/misc/Version-template.java - src/share/classes/sun/tools/jconsole/Version-template.java - test/java/nio/Buffer/Basic-X.java - test/java/nio/Buffer/CopyDirect-X-Memory.java Changeset: 31c37bff9a26 Author: tbell Date: 2009-11-02 22:23 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/31c37bff9a26 Merge Changeset: 7916c43cc007 Author: ohair Date: 2009-11-04 11:19 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/7916c43cc007 Merge ! make/java/redist/Makefile Changeset: 8fb602395be0 Author: ohair Date: 2009-11-08 14:49 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/8fb602395be0 Merge Changeset: 941b3fd6c22b Author: katleman Date: 2009-11-12 15:35 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/941b3fd6c22b Added tag jdk7-b76 for changeset 8fb602395be0 ! .hgtags Changeset: 951d0bbe3ce7 Author: gle...@misty.eyesbeyond.com Date: 2009-11-13 00:09 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/951d0bbe3ce7 Merge from main OpenJDK repository ! make/common/Defs-linux.gmk ! make/common/Defs.gmk ! make/common/Program.gmk ! make/common/Release.gmk ! make/java/instrument/Makefile ! make/java/jli/Makefile ! make/java/nio/Makefile ! make/java/redist/Makefile ! make/javax/sound/Makefile ! make/javax/sound/SoundDefs.gmk - make/tools/fontchecker/Makefile - make/tools/src/build/tools/fontchecker/FontCheckDummy.java - make/tools/src/build/tools/fontchecker/FontChecker.java - make/tools/src/build/tools/fontchecker/FontCheckerConstants.java - make/tools/src/build/tools/fontchecker/FontFileFilter.java - make/tools/src/build/tools/fontchecker/README.txt - src/share/classes/java/nio/ByteBufferAs-X-Buffer.java - src/share/classes/java/nio/Direct-X-Buffer-bin.java - src/share/classes/java/nio/Direct-X-Buffer.java - src/share/classes/java/nio/Heap-X-Buffer.java - src/share/classes/java/nio/X-Buffer-bin.java - src/share/classes/java/nio/X-Buffer.java - src/share/classes/java/nio/charset/Charset-X-Coder.java - src/share/classes/sun/misc/Version-template.java - src/share/classes/sun/tools/jconsole/Version-template.java ! src/share/native/com/sun/media/sound/SoundDefs.h - test/java/nio/Buffer/Basic-X.java - test/java/nio/Buffer/CopyDirect-X-Memory.java Changeset: fcc79b34e0c4 Author: gle...@misty.eyesbeyond.com Date: 2009-11-14 16:15 -0800 URL: http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/fcc79b34e0c4 . Merge in changes from the equivalent Linux file. . Slightly reduce the diffs to the Linux version. ! make/common/Defs-bsd.gmk
