<AWT Dev> hg: jdk7/awt/jdk: 66 new changesets

lana.steuck at oracle.com lana.steuck at oracle.com
Fri Nov 12 20:57:24 PST 2010


Changeset: 3e6726bbf80a
Author:    cl
Date:      2010-10-28 13:31 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/3e6726bbf80a

Added tag jdk7-b116 for changeset 1657ed4e1d86

! .hgtags

Changeset: d87c1c06bbf9
Author:    cl
Date:      2010-11-04 15:54 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/d87c1c06bbf9

Added tag jdk7-b117 for changeset 3e6726bbf80a

! .hgtags

Changeset: 1bebd1f9445b
Author:    katakai
Date:      2010-11-07 19:48 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/1bebd1f9445b

4225362: localized DateFormatSymbols for fr_FR is wrong
Reviewed-by: yhuang, peytoia

! src/share/classes/sun/text/resources/FormatData_fr.java
! src/share/classes/sun/text/resources/FormatData_fr_BE.java
! src/share/classes/sun/text/resources/FormatData_fr_CA.java
! src/share/classes/sun/text/resources/FormatData_fr_CH.java
! test/sun/text/resources/LocaleData

Changeset: 0660c48dd705
Author:    yhuang
Date:      2010-11-07 23:33 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/0660c48dd705

Merge


Changeset: 565be51eb60e
Author:    cl
Date:      2010-11-09 11:45 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/565be51eb60e

Merge


Changeset: 12b65e7ee3e4
Author:    bae
Date:      2010-10-22 16:57 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/12b65e7ee3e4

6663447: D3D: excessive surface data replacements
Reviewed-by: prr, art

! src/windows/classes/sun/awt/windows/WWindowPeer.java

Changeset: 065e6c5a8027
Author:    dlila
Date:      2010-10-26 10:39 -0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/065e6c5a8027

6967434: Round joins/caps of scaled up lines have poor quality.
Summary: eliminated flattening from the rendering engine.
Reviewed-by: flar

+ src/share/classes/sun/java2d/pisces/Curve.java
! src/share/classes/sun/java2d/pisces/Dasher.java
+ src/share/classes/sun/java2d/pisces/Helpers.java
- src/share/classes/sun/java2d/pisces/LineSink.java
! src/share/classes/sun/java2d/pisces/PiscesCache.java
! src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
! src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
! src/share/classes/sun/java2d/pisces/Renderer.java
! src/share/classes/sun/java2d/pisces/Stroker.java
+ src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java

Changeset: d9890d8a8159
Author:    bae
Date:      2010-10-29 11:49 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/d9890d8a8159

6670881: Phantom lines appear when rendering polygons & ellipses with antialiasing OFF
Reviewed-by: prr, bae

! src/share/native/sun/java2d/loops/ProcessPath.c

Changeset: c63c38b956c7
Author:    lana
Date:      2010-11-02 12:24 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/c63c38b956c7

Merge

- src/share/classes/sun/java2d/pisces/LineSink.java
! src/windows/classes/sun/awt/windows/WWindowPeer.java

Changeset: 2b466aaec7af
Author:    lana
Date:      2010-11-02 12:25 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/2b466aaec7af

Merge


Changeset: 4a29a9ff158c
Author:    okutsu
Date:      2010-10-20 14:41 +0900
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/4a29a9ff158c

6991380: (cal) Calendar.cachedLocaleData should be transitioned from Hashtable to ConcurrentHashMap
6560965: [Fmt-Da] defaultCenturyStart In SimpleDateFormat should be protected
6560980: [Fmt-Da] DateFormatSymbols.cacheLookup doesn't update cache correctly.
Reviewed-by: naoto, peytoia

! src/share/classes/java/text/DateFormatSymbols.java
! src/share/classes/java/text/DecimalFormat.java
! src/share/classes/java/text/SimpleDateFormat.java
! src/share/classes/java/util/Calendar.java
! src/share/classes/java/util/TimeZone.java

Changeset: 1f45c4c1f3a7
Author:    amenkov
Date:      2010-10-20 15:08 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/1f45c4c1f3a7

6867515: Reduce impact of D3D initializion on startup time
6891435: Improve D3D preloading
6946559: AWTToolKit thread crashes in JNU_GetEnv
6987967: D3D preloading thread should initialize COM
Reviewed-by: igor, art, uta

! src/windows/bin/java_md.c
! src/windows/classes/sun/awt/windows/WToolkit.java
! src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp
! src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
! src/windows/native/sun/java2d/d3d/D3DPipelineManager.h
! src/windows/native/sun/java2d/windows/WindowsFlags.cpp
! src/windows/native/sun/windows/awt_Toolkit.cpp
! src/windows/native/sun/windows/awt_Toolkit.h

Changeset: db2bc901c702
Author:    alexp
Date:      2010-10-20 19:37 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/db2bc901c702

6989617: Enable JComponent to control repaintings of its children
Reviewed-by: rupashka

! src/share/classes/javax/swing/JComponent.java
! src/share/classes/javax/swing/JLayer.java
! src/share/classes/javax/swing/JViewport.java
! src/share/classes/javax/swing/RepaintManager.java
+ test/javax/swing/JComponent/6989617/bug6989617.java

Changeset: 64f599571511
Author:    malenkov
Date:      2010-10-21 20:41 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/64f599571511

4358979: javax.swing.border should have a DashedBorder
Reviewed-by: flar, alexp

! src/share/classes/java/awt/BasicStroke.java
! src/share/classes/java/awt/GradientPaint.java
! src/share/classes/java/awt/LinearGradientPaint.java
! src/share/classes/java/awt/RadialGradientPaint.java
! src/share/classes/java/awt/geom/AffineTransform.java
! src/share/classes/javax/swing/BorderFactory.java
+ src/share/classes/javax/swing/border/StrokeBorder.java
+ test/java/beans/XMLEncoder/java_awt_BasicStroke.java
+ test/java/beans/XMLEncoder/java_awt_GradientPaint.java
+ test/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java
+ test/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java
+ test/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java
+ test/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java

Changeset: 3e1415e9a52c
Author:    peterz
Date:      2010-10-22 16:25 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/3e1415e9a52c

6993140: protected constructor in javax.swing.plaf.synth.SynthTabbedPaneUI.SynthTabbedPaneUI is needed
Reviewed-by: rupashka

! src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java

Changeset: f52ad79e2826
Author:    naoto
Date:      2010-10-22 11:32 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/f52ad79e2826

6993339: Bug4168625Test.java fails
Reviewed-by: peytoia

! test/java/util/ResourceBundle/Bug4168625Test.java

Changeset: a2c3278c377c
Author:    rupashka
Date:      2010-10-25 18:25 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/a2c3278c377c

6816582: WindowsFileChooserUI throws NullPointer when awt.useSystemAAFontSettings=false
Reviewed-by: uta

! src/share/classes/java/awt/Toolkit.java

Changeset: e650bbeab2f2
Author:    rupashka
Date:      2010-10-25 19:24 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/e650bbeab2f2

6632810: javax.swing.plaf.basic.BasicScrollPaneUI.getBaseline(JComponent, int, int) doesn't throw NPE and IAE
Reviewed-by: alexp

! src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
+ test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java

Changeset: eb466bafbc00
Author:    rupashka
Date:      2010-10-26 12:35 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/eb466bafbc00

6735286: javax.swing.DefaultTableCellRender.getTableCellRendererComponent() doesn't allow passing null Tables
Reviewed-by: alexp

! src/share/classes/javax/swing/table/DefaultTableCellRenderer.java
+ test/javax/swing/JTable/6735286/bug6735286.java

Changeset: de89eec422c3
Author:    rupashka
Date:      2010-10-29 04:24 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/de89eec422c3

6659894: JDialog instance returns unexpected GraphicsConfiguration
Reviewed-by: alexp

! src/share/classes/javax/swing/JDialog.java

Changeset: 30bc265fa0d0
Author:    peytoia
Date:      2010-11-02 15:08 +0900
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/30bc265fa0d0

6996686: (tz) Support tzdata2010o
Reviewed-by: okutsu

! make/sun/javazic/tzdata/VERSION
! make/sun/javazic/tzdata/asia
! make/sun/javazic/tzdata/australasia
! make/sun/javazic/tzdata/zone.tab

Changeset: e86aef08aa1f
Author:    rupashka
Date:      2010-11-02 13:32 +0300
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/e86aef08aa1f

6432566: Replace usage of StringBuffer with StringBuilder in Swing
Reviewed-by: malenkov

! src/share/classes/javax/swing/DebugGraphics.java
! src/share/classes/javax/swing/text/DefaultCaret.java
! src/share/classes/javax/swing/text/DefaultStyledDocument.java
! src/share/classes/javax/swing/text/InternationalFormatter.java
! src/share/classes/javax/swing/text/JTextComponent.java
! src/share/classes/javax/swing/text/MaskFormatter.java
! src/share/classes/javax/swing/text/NumberFormatter.java
! src/share/classes/javax/swing/text/PlainDocument.java
! src/share/classes/javax/swing/text/TabSet.java
! src/share/classes/javax/swing/text/html/FormView.java
! src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
! src/share/classes/javax/swing/text/html/StyleSheet.java
! src/share/classes/javax/swing/text/html/parser/Parser.java
! src/share/classes/javax/swing/text/rtf/AbstractFilter.java

Changeset: 12dc06e49f49
Author:    amenkov
Date:      2010-11-02 14:59 +0300
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/12dc06e49f49

6950553: Applet: IE process crash in OLE32.DLL when playing a sound
Reviewed-by: poonam

! make/javax/sound/jsoundds/Makefile
! src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp

Changeset: ff9d09604606
Author:    amenkov
Date:      2010-11-02 15:04 +0300
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/ff9d09604606

Merge


Changeset: e4d839f8dfee
Author:    naoto
Date:      2010-11-02 10:34 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/e4d839f8dfee

6989111: Incorrect default locale for New Zealand
6990452: Provide system properties for the user specified script
6992312: Currency becomes XXX if do not specify user.country.format
Reviewed-by: okutsu

! src/share/classes/java/util/Locale.java
! src/share/classes/sun/util/resources/LocaleNames.properties
! src/share/native/java/lang/System.c
! src/share/native/java/lang/java_props.h
! src/solaris/native/java/lang/java_props_md.c
! src/solaris/native/java/lang/locale_str.h
! src/windows/classes/sun/awt/windows/WInputMethod.java
! src/windows/native/java/lang/java_props_md.c
! src/windows/native/sun/windows/awt_InputMethod.cpp
! test/java/util/Locale/data/deflocale.rhel5
! test/java/util/Locale/data/deflocale.rhel5.fmtasdefault
! test/java/util/Locale/data/deflocale.sol10
! test/java/util/Locale/data/deflocale.sol10.fmtasdefault
! test/java/util/Locale/data/deflocale.win7
! test/java/util/Locale/data/deflocale.win7.fmtasdefault

Changeset: ea5fd0550613
Author:    lana
Date:      2010-11-02 12:45 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/ea5fd0550613

Merge

! src/share/native/java/lang/System.c
! src/solaris/native/java/lang/java_props_md.c
! src/windows/native/java/lang/java_props_md.c
! src/windows/native/sun/windows/awt_Toolkit.cpp

Changeset: 617ada000804
Author:    mchung
Date:      2010-10-19 09:49 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/617ada000804

6992968: test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh should not hang
Reviewed-by: alanb, dholmes

! test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
! test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh

Changeset: c6320457db65
Author:    mchung
Date:      2010-10-19 10:02 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/c6320457db65

6992121: StringBuilder.ensureCapacity(int minCap) throws OutOfMemoryError with minCap=Integer.MIN_VALUE
Reviewed-by: dholmes, alanb

! src/share/classes/java/lang/AbstractStringBuilder.java
! src/share/classes/java/util/ArrayList.java
! src/share/classes/java/util/Vector.java
+ test/java/lang/StringBuilder/EnsureCapacity.java
+ test/java/util/ArrayList/EnsureCapacity.java

Changeset: d9057727e2fa
Author:    alanb
Date:      2010-10-21 14:39 +0100
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/d9057727e2fa

6993267: TEST_BUG: java/nio/file/Path/InterruptCopy.java fails intermittently (win)
Reviewed-by: forax

! test/java/nio/file/Path/InterruptCopy.java

Changeset: 70bf328b7c65
Author:    chegar
Date:      2010-10-21 16:49 +0100
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/70bf328b7c65

6993490: SocketTimeoutException on HTTP keep-alive connections
Reviewed-by: michaelm

! src/share/classes/sun/net/NetworkClient.java
! src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
! src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
! test/sun/net/www/http/HttpClient/B6726695.java
! test/sun/net/www/http/KeepAliveCache/B5045306.java
! test/sun/net/www/protocol/http/ChunkedErrorStream.java

Changeset: 19cbbf152335
Author:    chegar
Date:      2010-10-21 16:51 +0100
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/19cbbf152335

6992859: InetAddressCachePolicy.setIfNotSet() fails
Reviewed-by: michaelm

! src/share/classes/sun/net/InetAddressCachePolicy.java

Changeset: 549257d35662
Author:    chegar
Date:      2010-10-22 09:20 +0100
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/549257d35662

6947677: InetAddress.isReachable() throws "java.net.SocketException:Invalid argument" on Linux if run as root
Reviewed-by: alanb

! src/solaris/native/java/net/Inet4AddressImpl.c
! src/solaris/native/java/net/Inet6AddressImpl.c

Changeset: 3740c2da7cc5
Author:    alanb
Date:      2010-10-22 17:40 +0100
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/3740c2da7cc5

6816049: (bf) MappedByteBuffer.force() method does not flush data correctly
Reviewed-by: chegar

! src/share/classes/java/nio/Direct-X-Buffer.java.template
! src/share/classes/java/nio/MappedByteBuffer.java
! src/share/classes/sun/nio/ch/FileChannelImpl.java
! src/share/classes/sun/nio/ch/FileDispatcher.java
! src/share/classes/sun/nio/ch/Util.java
! src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java
! src/solaris/native/java/nio/MappedByteBuffer.c
! src/windows/classes/sun/nio/ch/FileDispatcherImpl.java
! src/windows/native/java/nio/MappedByteBuffer.c
! src/windows/native/sun/nio/ch/FileDispatcherImpl.c
! test/java/nio/MappedByteBuffer/Basic.java

Changeset: 0fd9c87a9b7b
Author:    mchung
Date:      2010-10-22 11:22 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/0fd9c87a9b7b

6985460: PlatformLogger throws ArrayStoreException when j.u.logging is initialized
Reviewed-by: dholmes

! src/share/classes/java/util/logging/LogRecord.java
! src/share/classes/sun/util/logging/PlatformLogger.java
! test/sun/util/logging/PlatformLoggerTest.java
+ test/sun/util/logging/SourceClassName.java

Changeset: 0b07344d5526
Author:    chegar
Date:      2010-10-22 20:27 +0100
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/0b07344d5526

6994079: PlainSocketImpl should close the socket if it fails
Reviewed-by: alanb

! src/share/classes/java/net/AbstractPlainSocketImpl.java

Changeset: defd25291e27
Author:    ksrini
Date:      2010-10-25 10:34 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/defd25291e27

6989469: (launcher) compiler warnings in jli native code
Reviewed-by: darcy, ohair, sherman

! src/share/bin/java.c
! src/share/bin/parse_manifest.c
! src/share/bin/wildcard.c
! src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c
! src/solaris/bin/java_md.c
! src/solaris/bin/jexec.c
! src/windows/bin/java_md.c

Changeset: 613f1b310cdb
Author:    kamg
Date:      2010-10-26 18:41 -0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/613f1b310cdb

6541462: outdated specification for CCC 6339875
Summary: Add documentation to java.lang.ClassLoader.defineClass()
Reviewed-by: dcubed, darcy

! src/share/classes/java/lang/ClassLoader.java

Changeset: 69646b4db21d
Author:    skoppar
Date:      2010-09-28 01:09 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/69646b4db21d

6559775: Race allows defaultReadObject to be invoked instead of readFields during deserialization
Reviewed-by: hawtin

! make/java/java/FILES_java.gmk
! src/share/classes/java/io/ObjectInputStream.java
! src/share/classes/java/io/ObjectOutputStream.java
+ src/share/classes/java/io/SerialCallbackContext.java
+ test/java/io/Serializable/6559775/README
+ test/java/io/Serializable/6559775/SerialRace.java
+ test/java/io/Serializable/6559775/SerialVictim.java
+ test/java/io/Serializable/6559775/Test6559775.sh

Changeset: 2070c497e241
Author:    skoppar
Date:      2010-09-28 01:13 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/2070c497e241

6966692: defaultReadObject can set a field multiple times
Reviewed-by: hawtin

! src/share/classes/java/io/ObjectStreamClass.java
+ test/java/io/Serializable/6966692/Attack.java
+ test/java/io/Serializable/6966692/README
+ test/java/io/Serializable/6966692/Test6966692.sh
+ test/java/io/Serializable/6966692/Victim.java

Changeset: 7f4006dec750
Author:    asaha
Date:      2010-10-11 16:05 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/7f4006dec750

Merge

- make/common/Rules-SCCS.gmk
! make/java/java/FILES_java.gmk
- src/linux/doc/man/ja/kinit.1
- src/linux/doc/man/ja/klist.1
- src/linux/doc/man/ja/ktab.1
- src/share/classes/com/sun/media/sound/MidiDeviceReceiver.java
- src/share/classes/sun/java2d/pisces/PiscesMath.java
- src/share/classes/sun/java2d/pisces/Transform4.java
- src/share/native/sun/java2d/cmm/lcms/cmscam97.c
- src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
- src/share/native/sun/java2d/cmm/lcms/icc34.h
- src/share/native/sun/java2d/cmm/lcms/lcms.h
- src/solaris/classes/sun/net/spi/SdpProvider.java
- src/solaris/native/sun/net/spi/SdpProvider.c
- test/java/net/Socket/AccurateTimeout.java
- test/java/util/Locale/data/deflocale.exe
- test/java/util/Locale/data/deflocale.jds3
- test/java/util/Locale/data/deflocale.rhel4
- test/java/util/Locale/data/deflocale.winvista
- test/java/util/Locale/data/deflocale.winxp
- test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
- test/tools/launcher/VerifyExceptions.java
- test/tools/pack200/Pack200Simple.sh
- test/tools/pack200/SegmentLimit.java

Changeset: 96c75aec5545
Author:    asaha
Date:      2010-10-27 13:09 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/96c75aec5545

Merge

! make/java/java/FILES_java.gmk
- test/java/io/Serializable/6559775/README
- test/java/io/Serializable/6559775/SerialRace.java
- test/java/io/Serializable/6559775/SerialVictim.java
- test/java/io/Serializable/6559775/Test6559775.sh
- test/java/io/Serializable/6966692/Attack.java
- test/java/io/Serializable/6966692/README
- test/java/io/Serializable/6966692/Test6966692.sh
- test/java/io/Serializable/6966692/Victim.java

Changeset: 82eb9c5fa896
Author:    asaha
Date:      2010-10-27 13:44 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/82eb9c5fa896

6993206: Removing non-functional tests.
Reviewed-by: mchung

- test/java/io/Serializable/6559775/README
- test/java/io/Serializable/6559775/SerialRace.java
- test/java/io/Serializable/6559775/SerialVictim.java
- test/java/io/Serializable/6559775/Test6559775.sh
- test/java/io/Serializable/6966692/Attack.java
- test/java/io/Serializable/6966692/README
- test/java/io/Serializable/6966692/Test6966692.sh
- test/java/io/Serializable/6966692/Victim.java

Changeset: 72e09416a65d
Author:    asaha
Date:      2010-10-27 13:53 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/72e09416a65d

Merge


Changeset: 4f91da528c68
Author:    asaha
Date:      2010-10-27 22:10 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/4f91da528c68

Merge


Changeset: dfce5a0cc460
Author:    weijun
Date:      2010-10-28 21:14 +0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/dfce5a0cc460

6950546: "ktab -d name etype" to "ktab -d name [-e etype] [kvno | all | old]"
6984764: kerberos fails if service side keytab is generated using JDK ktab
Reviewed-by: valeriep

! src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
! src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
! test/sun/security/krb5/auto/KDC.java
+ test/sun/security/krb5/tools/KtabCheck.java
+ test/sun/security/krb5/tools/ktcheck.sh
+ test/sun/security/krb5/tools/onlythree.conf

Changeset: 7fee717f4707
Author:    emcmanus
Date:      2010-10-29 12:35 +0200
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/7fee717f4707

6984037: jmx/management rebranding vendor changes needed
Reviewed-by: ohair

! make/netbeans/jmx/build.properties
! src/share/classes/com/sun/jmx/defaults/ServiceName.java
! src/share/classes/com/sun/jmx/snmp/ServiceName.java
! src/share/classes/com/sun/management/package.html
! src/share/classes/javax/management/ObjectName.java
! src/share/classes/javax/management/build.xml
! src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java

Changeset: 93cd7e89adb8
Author:    xuelei
Date:      2010-10-30 18:39 +0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/93cd7e89adb8

4873188: Support TLS 1.1
Reviewed-by: wetmore, weijun

! src/share/classes/javax/net/ssl/SSLSocketFactory.java
! src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
! src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
! src/share/classes/sun/security/ssl/CipherBox.java
! src/share/classes/sun/security/ssl/CipherSuite.java
! src/share/classes/sun/security/ssl/ClientHandshaker.java
! src/share/classes/sun/security/ssl/Debug.java
! src/share/classes/sun/security/ssl/HandshakeMessage.java
! src/share/classes/sun/security/ssl/Handshaker.java
! src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
! src/share/classes/sun/security/ssl/MAC.java
! src/share/classes/sun/security/ssl/ProtocolList.java
! src/share/classes/sun/security/ssl/ProtocolVersion.java
! src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
! src/share/classes/sun/security/ssl/Record.java
! src/share/classes/sun/security/ssl/SSLEngineImpl.java
! src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
! src/share/classes/sun/security/ssl/SSLSocketImpl.java
! src/share/classes/sun/security/ssl/ServerHandshaker.java
! src/share/classes/sun/security/ssl/SunJSSE.java
! src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
! src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
! test/sun/security/pkcs11/fips/CipherTest.java
! test/sun/security/pkcs11/sslecc/CipherTest.java
+ test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java
+ test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java
+ test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java
+ test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java
+ test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java
! test/sun/security/ssl/sanity/interop/CipherTest.java

Changeset: d26730767789
Author:    xuelei
Date:      2010-11-01 07:57 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/d26730767789

6792180: Enhance to reject weak algorithms or conform to crypto recommendations
Reviewed-by: mullan, weijun, wetmore

+ src/share/classes/java/security/AlgorithmConstraints.java
+ src/share/classes/java/security/CryptoPrimitive.java
! src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
! src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
! src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
! src/share/classes/sun/security/provider/certpath/OCSPChecker.java
! src/share/classes/sun/security/provider/certpath/OCSPResponse.java
! src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
! src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
! src/share/classes/sun/security/provider/certpath/ReverseState.java
! src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
+ src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
! src/share/classes/sun/security/validator/PKIXValidator.java
! src/share/classes/sun/security/validator/SimpleValidator.java
! src/share/classes/sun/security/validator/Validator.java
! src/share/classes/sun/security/x509/X509CRLImpl.java
! src/share/lib/security/java.security
! src/share/lib/security/java.security-solaris
! src/share/lib/security/java.security-windows

Changeset: 2eade65eab5b
Author:    ksrini
Date:      2010-11-01 10:12 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/2eade65eab5b

6995674: (launcher) make of jli fails on windows if directory exists
Reviewed-by: darcy, ohair

! make/java/jli/Makefile

Changeset: e95c7f8979ee
Author:    mchung
Date:      2010-11-01 10:59 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/e95c7f8979ee

6994413: JDK_GetVersionInfo0 only expects a two digit build number
Reviewed-by: dholmes

! src/share/native/common/jdk_util.c
+ test/sun/misc/Version/Version.java

Changeset: 9d6a9f65d2bf
Author:    xuelei
Date:      2010-11-01 22:02 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/9d6a9f65d2bf

6916074: Add support for TLS 1.2
6985179: To support Server Name Indication extension for JSSE client
Summary: Introduces the algorithm constraints to support signature and hash algorithm selection. Includes contributions from wetmore and weijung.
Reviewed-by: wetmore, weijun

! src/share/classes/com/sun/crypto/provider/AESCrypt.java
! src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
! src/share/classes/com/sun/crypto/provider/DESedeCipher.java
! src/share/classes/com/sun/crypto/provider/DHPrivateKey.java
! src/share/classes/com/sun/crypto/provider/DHPublicKey.java
! src/share/classes/com/sun/crypto/provider/JceKeyStore.java
! src/share/classes/com/sun/crypto/provider/OAEPParameters.java
! src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
! src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
! src/share/classes/com/sun/crypto/provider/SunJCE.java
! src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
! src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java
! src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
! src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
+ src/share/classes/javax/net/ssl/ExtendedSSLSession.java
! src/share/classes/javax/net/ssl/HttpsURLConnection.java
! src/share/classes/javax/net/ssl/SSLEngine.java
! src/share/classes/javax/net/ssl/SSLParameters.java
! src/share/classes/javax/net/ssl/SSLServerSocket.java
! src/share/classes/javax/net/ssl/SSLSocket.java
+ src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
! src/share/classes/sun/net/www/protocol/https/HttpsClient.java
! src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
! src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
! src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
! src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
! src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
! src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
! src/share/classes/sun/security/pkcs11/SunPKCS11.java
! src/share/classes/sun/security/rsa/RSASignature.java
! src/share/classes/sun/security/ssl/CipherSuite.java
! src/share/classes/sun/security/ssl/ClientHandshaker.java
! src/share/classes/sun/security/ssl/HandshakeHash.java
! src/share/classes/sun/security/ssl/HandshakeMessage.java
! src/share/classes/sun/security/ssl/Handshaker.java
! src/share/classes/sun/security/ssl/HelloExtensions.java
! src/share/classes/sun/security/ssl/MAC.java
! src/share/classes/sun/security/ssl/ProtocolList.java
! src/share/classes/sun/security/ssl/ProtocolVersion.java
! src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+ src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
! src/share/classes/sun/security/ssl/SSLContextImpl.java
! src/share/classes/sun/security/ssl/SSLEngineImpl.java
! src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
! src/share/classes/sun/security/ssl/SSLSessionImpl.java
! src/share/classes/sun/security/ssl/SSLSocketImpl.java
! src/share/classes/sun/security/ssl/ServerHandshaker.java
+ src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
! src/share/classes/sun/security/ssl/SunJSSE.java
! src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
! src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
! src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
! test/com/sun/crypto/provider/TLS/TestKeyMaterial.java
! test/com/sun/crypto/provider/TLS/TestMasterSecret.java
! test/com/sun/crypto/provider/TLS/TestPRF.java
+ test/com/sun/crypto/provider/TLS/TestPRF12.java
! test/com/sun/crypto/provider/TLS/TestPremaster.java
! test/com/sun/crypto/provider/TLS/Utils.java
+ test/com/sun/crypto/provider/TLS/prf12data.txt
! test/sun/security/ec/TestEC.java
! test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
! test/sun/security/pkcs11/tls/TestKeyMaterial.java
! test/sun/security/pkcs11/tls/TestMasterSecret.java
! test/sun/security/pkcs11/tls/TestPRF.java
! test/sun/security/pkcs11/tls/TestPremaster.java
! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java
! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java
+ test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
+ test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
+ test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java
! test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java
! test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java
! test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java
! test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java
! test/sun/security/ssl/sanity/interop/CipherTest.java
! test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java
! test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java

Changeset: 5a6c63deacf3
Author:    alanb
Date:      2010-11-02 10:05 +0000
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/5a6c63deacf3

6993126: (aio) remove AsynchronousDatagramChannel
Reviewed-by: chegar

! make/java/nio/FILES_java.gmk
- src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
! src/share/classes/java/nio/channels/package-info.java
! src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
- src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
! src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java
! src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
! src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java
! test/java/nio/channels/AsynchronousChannelGroup/Basic.java
- test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
! test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java
! test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java

Changeset: 88462abbf774
Author:    alanb
Date:      2010-11-02 10:07 +0000
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/88462abbf774

6431343: (dc) DatagramChannel may not report its local address correctly after connect or disconnect
Reviewed-by: chegar

! src/share/classes/sun/nio/ch/DatagramChannelImpl.java
+ test/java/nio/channels/DatagramChannel/ChangingAddress.java

Changeset: fdcb0f667b7d
Author:    alanb
Date:      2010-11-02 10:15 +0000
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/fdcb0f667b7d

Merge


Changeset: e127cb5c2fbd
Author:    vinnie
Date:      2010-11-02 15:04 +0000
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/e127cb5c2fbd

6945529: Apply fix for CR 6921001 to platform-specific java.security configuration files
Reviewed-by: mullan

! src/share/lib/security/java.security-solaris
! src/share/lib/security/java.security-windows

Changeset: 45601fbddedf
Author:    lana
Date:      2010-11-02 19:40 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/45601fbddedf

Merge

- src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
- src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
! src/windows/bin/java_md.c
- test/java/nio/channels/AsynchronousDatagramChannel/Basic.java

Changeset: ddb39b2582b1
Author:    naoto
Date:      2010-11-05 20:58 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/ddb39b2582b1

6997928: LocaleCategory test fails with b118 PIT
Reviewed-by: sherman

! test/java/util/Locale/LocaleCategory.java
! test/java/util/Locale/LocaleCategory.sh

Changeset: bb30977193b0
Author:    lana
Date:      2010-11-09 22:53 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/bb30977193b0

Merge

- src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
- src/share/classes/sun/java2d/pisces/LineSink.java
- src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
- test/java/nio/channels/AsynchronousDatagramChannel/Basic.java

Changeset: 48f0b94573c8
Author:    jrose
Date:      2010-09-08 18:40 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/48f0b94573c8

6964498: JSR 292 invokedynamic sites need local bootstrap methods
Summary: Add JVM_CONSTANT_InvokeDynamic records to constant pool to determine per-instruction BSMs; add MethodHandleProvider.
Reviewed-by: twisti

+ src/share/classes/java/dyn/BootstrapMethod.java
! src/share/classes/java/dyn/CallSite.java
+ src/share/classes/java/dyn/ConstantCallSite.java
! src/share/classes/java/dyn/InvokeDynamic.java
! src/share/classes/java/dyn/InvokeDynamicBootstrapError.java
! src/share/classes/java/dyn/Linkage.java
! src/share/classes/java/dyn/LinkagePermission.java
! src/share/classes/java/dyn/MethodHandle.java
+ src/share/classes/java/dyn/MethodHandleProvider.java
! src/share/classes/java/dyn/package-info.java
! src/share/classes/sun/dyn/CallSiteImpl.java
! test/java/dyn/MethodHandlesTest.java

Changeset: d30ca8bcad63
Author:    jrose
Date:      2010-09-08 18:40 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/d30ca8bcad63

6980096: JSR 292 reflective lookup should throw checked exceptions
Summary: Make NoAccessException be a checked exception.  Also remove JavaMethodHandle.
Reviewed-by: twisti

! src/share/classes/java/dyn/CallSite.java
- src/share/classes/java/dyn/JavaMethodHandle.java
! src/share/classes/java/dyn/MethodHandles.java
! src/share/classes/java/dyn/MethodType.java
! src/share/classes/java/dyn/NoAccessException.java
! src/share/classes/sun/dyn/BoundMethodHandle.java
! src/share/classes/sun/dyn/CallSiteImpl.java
! src/share/classes/sun/dyn/FilterGeneric.java
! src/share/classes/sun/dyn/FilterOneArgument.java
! src/share/classes/sun/dyn/FromGeneric.java
! src/share/classes/sun/dyn/Invokers.java
+ src/share/classes/sun/dyn/JavaMethodHandle.java
! src/share/classes/sun/dyn/MemberName.java
! src/share/classes/sun/dyn/MethodHandleImpl.java
! src/share/classes/sun/dyn/MethodHandleNatives.java
! src/share/classes/sun/dyn/SpreadGeneric.java
! src/share/classes/sun/dyn/ToGeneric.java
! src/share/classes/sun/dyn/util/ValueConversions.java
+ test/java/dyn/JavaDocExamples.java
! test/java/dyn/MethodHandlesTest.java

Changeset: 93f36769ecef
Author:    jrose
Date:      2010-09-08 18:40 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/93f36769ecef

6953246: JSR 292 should support SAM conversion
Summary: Conversion function MethodHandles.asInstance; initial slow implementation based on Proxy.
Reviewed-by: twisti

! src/share/classes/java/dyn/MethodHandles.java
! test/java/dyn/MethodHandlesTest.java

Changeset: 4ed243e9e9d9
Author:    jrose
Date:      2010-09-14 01:42 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/4ed243e9e9d9

6982752: dynamic languages need to decorate types with runtime information
Summary: Add ClassValue
Reviewed-by: twisti

+ src/share/classes/java/dyn/ClassValue.java
+ test/java/dyn/ClassValueTest.java

Changeset: aec1afae879d
Author:    trims
Date:      2010-11-04 16:09 -0700
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/aec1afae879d

Merge

- make/common/Rules-SCCS.gmk
- src/share/classes/com/sun/media/sound/MidiDeviceReceiver.java
! src/share/classes/java/dyn/InvokeDynamicBootstrapError.java
! src/share/classes/java/dyn/LinkagePermission.java
! src/share/classes/java/dyn/NoAccessException.java
- src/share/native/sun/java2d/cmm/lcms/cmscam97.c
- src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
- src/share/native/sun/java2d/cmm/lcms/icc34.h
- src/share/native/sun/java2d/cmm/lcms/lcms.h
- src/solaris/classes/sun/net/spi/SdpProvider.java
- src/solaris/native/sun/net/spi/SdpProvider.c
- test/java/util/Locale/data/deflocale.exe
- test/java/util/Locale/data/deflocale.jds3
- test/java/util/Locale/data/deflocale.rhel4
- test/java/util/Locale/data/deflocale.winvista
- test/java/util/Locale/data/deflocale.winxp
- test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
- test/tools/launcher/VerifyExceptions.java

Changeset: b357910aa04a
Author:    trims
Date:      2010-11-10 20:40 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/b357910aa04a

Merge

- src/share/classes/java/dyn/JavaMethodHandle.java

Changeset: ecab7eefb8f2
Author:    cl
Date:      2010-11-11 11:02 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/ecab7eefb8f2

Added tag jdk7-b118 for changeset b357910aa04a

! .hgtags

Changeset: b2e5858615d2
Author:    lana
Date:      2010-11-12 15:07 -0800
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/b2e5858615d2

Merge

- src/share/classes/java/dyn/JavaMethodHandle.java
- src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
- src/share/classes/sun/java2d/pisces/LineSink.java
- src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
- test/java/nio/channels/AsynchronousDatagramChannel/Basic.java




More information about the awt-dev mailing list