hg: jdk6/jdk6/jdk: 2 new changesets

[kelly.ohair at oracle.com]

Changeset: f5a3d4293629
Author:    ohair
Date:      2010-12-22 20:11 -0800
URL:       http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/f5a3d4293629

6962318: Update copyright year
Reviewed-by: andrew

! make/common/Defs-linux.gmk
! make/common/Defs.gmk
! make/common/Program.gmk
! make/common/Release.gmk
! make/common/shared/Defs-control.gmk
! make/common/shared/Defs-java.gmk
! make/common/shared/Defs-windows.gmk
! make/common/shared/Platform.gmk
! make/common/shared/Sanity-Settings.gmk
! make/java/instrument/Makefile
! make/java/java/FILES_java.gmk
! make/java/main/java/Makefile
! make/java/main/javaw/Makefile
! make/java/redist/Makefile
! make/javax/sound/Makefile
! make/javax/sound/SoundDefs.gmk
! make/javax/sound/jsoundds/Makefile
! make/javax/swing/FILES.gmk
! make/javax/swing/Makefile
! make/javax/swing/plaf/Makefile
! make/jdk_generic_profile.sh
! make/launchers/Makefile.launcher
! make/netbeans/world/build.xml
! make/sun/xawt/mapfile-vers
! make/tools/src/build/tools/jarreorder/JarReorder.java
! make/tools/src/build/tools/javazic/RuleDay.java
! src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java
! src/share/classes/com/sun/java/swing/plaf/nimbus/Defaults.template
! src/share/classes/com/sun/java/swing/plaf/nimbus/LoweredBorder.java
! src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
! src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusStyle.java
! src/share/classes/com/sun/java/swing/plaf/nimbus/TableScrollPaneCorner.java
! src/share/classes/com/sun/java/swing/plaf/nimbus/skin.laf
! src/share/classes/com/sun/jndi/dns/DnsContextFactory.java
! src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
! src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
! src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java
! src/share/classes/com/sun/media/sound/ModelInstrument.java
! src/share/classes/com/sun/media/sound/SoftVoice.java
! src/share/classes/java/awt/Font.java
! src/share/classes/java/awt/SystemTray.java
! src/share/classes/java/awt/image/IndexColorModel.java
! src/share/classes/java/lang/ProcessBuilder.java
! src/share/classes/java/lang/Thread.java
! src/share/classes/java/math/BigDecimal.java
! src/share/classes/java/math/BigInteger.java
! src/share/classes/java/math/BitSieve.java
! src/share/classes/java/math/MathContext.java
! src/share/classes/java/math/MutableBigInteger.java
! src/share/classes/java/math/SignedMutableBigInteger.java
! src/share/classes/java/net/HttpURLConnection.java
! src/share/classes/java/net/NetworkInterface.java
! src/share/classes/javax/net/SocketFactory.java
! src/share/classes/javax/swing/JSplitPane.java
! src/share/classes/javax/swing/JTable.java
! src/share/classes/javax/swing/MultiUIDefaults.java
! src/share/classes/javax/swing/UIDefaults.java
! src/share/classes/javax/swing/UIManager.java
! src/share/classes/javax/swing/plaf/metal/OceanTheme.java
! src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
! src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
! src/share/classes/sun/awt/image/BufImgSurfaceData.java
! src/share/classes/sun/awt/image/ImageRepresentation.java
! src/share/classes/sun/font/AttributeValues.java
! src/share/classes/sun/font/FontManager.java
! src/share/classes/sun/java2d/SunGraphicsEnvironment.java
! src/share/classes/sun/java2d/pisces/PiscesCache.java
! src/share/classes/sun/misc/SharedSecrets.java
! src/share/classes/sun/net/NetworkClient.java
! src/share/classes/sun/net/www/MessageHeader.java
! src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
! src/share/classes/sun/net/www/protocol/https/HttpsClient.java
! src/share/classes/sun/nio/cs/ISO_8859_15.java
! src/share/classes/sun/rmi/rmic/BatchEnvironment.java
! src/share/classes/sun/security/jgss/krb5/InitialToken.java
! src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
! src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
! src/share/classes/sun/security/tools/JarSigner.java
! src/share/classes/sun/security/x509/X509Key.java
! src/share/classes/sun/swing/SwingLazyValue.java
! src/share/classes/sun/util/resources/TimeZoneNames.java
! src/share/classes/sun/util/resources/TimeZoneNames_de.java
! src/share/classes/sun/util/resources/TimeZoneNames_es.java
! src/share/classes/sun/util/resources/TimeZoneNames_fr.java
! src/share/classes/sun/util/resources/TimeZoneNames_it.java
! src/share/classes/sun/util/resources/TimeZoneNames_ja.java
! src/share/classes/sun/util/resources/TimeZoneNames_ko.java
! src/share/classes/sun/util/resources/TimeZoneNames_sv.java
! src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java
! src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java
! src/share/native/com/sun/java/util/jar/pack/bytes.cpp
! src/share/native/com/sun/java/util/jar/pack/unpack.cpp
! src/share/native/com/sun/media/sound/SoundDefs.h
! src/share/native/sun/awt/image/BufImgSurfaceData.c
! src/share/native/sun/awt/image/jpeg/imageioJPEG.c
! src/share/native/sun/awt/medialib/awt_ImagingLib.c
! src/share/native/sun/awt/medialib/safe_alloc.h
! src/share/native/sun/font/freetypeScaler.c
! src/share/native/sun/java2d/cmm/lcms/LCMS.c
! src/solaris/bin/ergo_zero.c
! src/solaris/bin/zero/jvm.cfg
! src/solaris/classes/sun/awt/X11/MotifDnDConstants.java
! src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
! src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
! src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java
! src/solaris/classes/sun/awt/X11/XAWTXSettings.java
! src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
! src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java
! src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java
! src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java
! src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java
! src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java
! src/solaris/classes/sun/awt/X11/XErrorHandler.java
! src/solaris/classes/sun/awt/X11/XProtocol.java
! src/solaris/classes/sun/awt/X11/XQueryTree.java
! src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java
! src/solaris/classes/sun/awt/X11/XToolkit.java
! src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java
! src/solaris/classes/sun/awt/X11/XWM.java
! src/solaris/classes/sun/awt/X11/XlibUtil.java
! src/solaris/classes/sun/awt/X11/XlibWrapper.java
! src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties
! src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties
! src/solaris/demo/jni/Poller/Poller.c
! src/solaris/native/sun/awt/awt_GraphicsEnv.c
! src/solaris/native/sun/awt/awt_GraphicsEnv.h
! src/solaris/native/sun/awt/awt_InputMethod.c
! src/solaris/native/sun/awt/awt_MToolkit.c
! src/solaris/native/sun/xawt/XToolkit.c
! src/solaris/native/sun/xawt/XlibWrapper.c
! src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp
! test/ProblemList.txt
! test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
! test/com/sun/java/swing/plaf/nimbus/ColorCustomizationTest.java
! test/com/sun/java/swing/plaf/nimbus/Test6849805.java
! test/com/sun/java/swing/plaf/nimbus/Test6919629.java
! test/com/sun/net/httpserver/Test1.java
! test/com/sun/net/httpserver/Test11.java
! test/com/sun/net/httpserver/Test12.java
! test/com/sun/net/httpserver/Test13.java
! test/com/sun/net/httpserver/Test6a.java
! test/com/sun/net/httpserver/Test7a.java
! test/com/sun/net/httpserver/Test8a.java
! test/com/sun/net/httpserver/Test9.java
! test/com/sun/net/httpserver/Test9a.java
! test/com/sun/net/httpserver/bugs/B6361557.java
! test/com/sun/net/httpserver/bugs/B6373555.java
! test/java/awt/Graphics2D/DrawString/RotTransText.java
! test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java
! test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java
! test/java/awt/font/TextLayout/TestSinhalaChar.java
! test/java/math/BigDecimal/AddTests.java
! test/java/math/BigDecimal/DivideTests.java
! test/java/math/BigDecimal/MultiplyTests.java
! test/java/net/MulticastSocket/SetOutgoingIf.java
! test/java/nio/charset/coders/CheckSJISMappingProp.sh
! test/java/security/Provider/Turkish.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java
! test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java
! test/javax/swing/MultiUIDefaults/4300666/bug4300666.html
! test/javax/swing/MultiUIDefaults/4300666/bug4300666.java
! test/javax/swing/MultiUIDefaults/4331767/bug4331767.java
! test/javax/swing/MultiUIDefaults/Test6860438.java
! test/javax/swing/UIDefaults/6795356/SwingLazyValueTest.java
! test/javax/swing/UIDefaults/6795356/TableTest.java
! test/javax/swing/UIDefaults/6795356/bug6795356.java
! test/sun/nio/cs/Test4200310.sh
! test/sun/pisces/ScaleTest.java
! test/sun/rmi/rmic/manifestClassPath/run.sh
! test/tools/pack200/MemoryAllocatorTest.java

Changeset: 05ae23d9f31f
Author:    ohair
Date:      2010-12-22 20:16 -0800
URL:       http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/05ae23d9f31f

Merge