hg: jdk8/build/jdk: 3 new changesets

[kelly.ohair at oracle.com]

Changeset: c499fd3f1695
Author:    erikj
Date:      2012-06-07 18:05 -0700
URL:       http://hg.openjdk.java.net/jdk8/build/jdk/rev/c499fd3f1695

7170969: Add @GenerateNativeHeader to classes whose fields need to be exported for JNI
Reviewed-by: ohair, ohrstrom, ihse

! make/sun/awt/make.depend
! src/macosx/classes/apple/laf/JRSUIConstants.java
! src/macosx/classes/com/apple/eawt/FullScreenHandler.java
! src/macosx/classes/com/apple/eawt/event/GestureHandler.java
! src/macosx/classes/sun/java2d/OSXSurfaceData.java
! src/macosx/classes/sun/lwawt/LWLabelPeer.java
! src/macosx/classes/sun/lwawt/LWTextFieldPeer.java
! src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java
! src/share/classes/java/awt/Adjustable.java
! src/share/classes/java/awt/BasicStroke.java
! src/share/classes/java/awt/Choice.java
! src/share/classes/java/awt/DisplayMode.java
! src/share/classes/java/awt/Image.java
! src/share/classes/java/awt/List.java
! src/share/classes/java/awt/PopupMenu.java
! src/share/classes/java/awt/SystemColor.java
! src/share/classes/java/awt/TextComponent.java
! src/share/classes/java/awt/Transparency.java
! src/share/classes/java/awt/color/ColorSpace.java
! src/share/classes/java/awt/color/ICC_Profile.java
! src/share/classes/java/awt/datatransfer/Clipboard.java
! src/share/classes/java/awt/datatransfer/StringSelection.java
! src/share/classes/java/awt/dnd/DnDConstants.java
! src/share/classes/java/awt/event/ActionEvent.java
! src/share/classes/java/awt/event/AdjustmentEvent.java
! src/share/classes/java/awt/event/ComponentEvent.java
! src/share/classes/java/awt/event/InputMethodEvent.java
! src/share/classes/java/awt/event/MouseWheelEvent.java
! src/share/classes/java/awt/geom/PathIterator.java
! src/share/classes/java/awt/image/AffineTransformOp.java
! src/share/classes/java/awt/image/ConvolveOp.java
! src/share/classes/java/awt/image/DataBuffer.java
! src/share/classes/java/awt/image/DirectColorModel.java
! src/share/classes/java/awt/image/ImageConsumer.java
! src/share/classes/java/awt/image/ImageObserver.java
! src/share/classes/java/awt/peer/ComponentPeer.java
! src/share/classes/java/awt/print/PageFormat.java
! src/share/classes/java/awt/print/Pageable.java
! src/share/classes/java/awt/print/Printable.java
! src/share/classes/sun/awt/CharsetString.java
! src/share/classes/sun/awt/EmbeddedFrame.java
! src/share/classes/sun/awt/SunHints.java
! src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
! src/share/classes/sun/awt/image/BufImgSurfaceData.java
! src/share/classes/sun/java2d/SunGraphics2D.java
! src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
! src/share/classes/sun/java2d/opengl/OGLContext.java
! src/share/classes/sun/java2d/pipe/BufferedContext.java
! src/share/classes/sun/java2d/pipe/BufferedOpCodes.java
! src/share/classes/sun/java2d/pipe/BufferedPaints.java
! src/share/classes/sun/java2d/pipe/BufferedTextPipe.java
! src/share/classes/sun/java2d/pipe/RegionIterator.java
! src/share/classes/sun/java2d/pipe/RenderBuffer.java
! src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java
! src/share/classes/sun/java2d/pipe/hw/AccelSurface.java
! src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java
! src/share/classes/sun/nio/ch/DatagramChannelImpl.java
! src/share/classes/sun/nio/ch/IOStatus.java
! src/share/classes/sun/security/pkcs11/Secmod.java
! src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
! src/solaris/classes/sun/awt/X11/XComponentPeer.java
! src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
! src/windows/classes/sun/java2d/d3d/D3DContext.java
! src/windows/classes/sun/java2d/d3d/D3DPaints.java
! src/windows/native/java/net/TwoStacksPlainSocketImpl.c
! src/windows/native/sun/windows/awt_DataTransferer.cpp
! src/windows/native/sun/windows/awt_MenuItem.h

Changeset: 898ce0cf7476
Author:    ohair
Date:      2012-06-07 20:40 -0700
URL:       http://hg.openjdk.java.net/jdk8/build/jdk/rev/898ce0cf7476

Merge

! src/macosx/classes/sun/lwawt/LWTextFieldPeer.java
! src/share/classes/sun/nio/ch/DatagramChannelImpl.java

Changeset: 1953cf522107
Author:    erikj
Date:      2012-06-07 20:40 -0700
URL:       http://hg.openjdk.java.net/jdk8/build/jdk/rev/1953cf522107

7170079: Adjustments to build-infra makefiles
Reviewed-by: ohair, ohrstrom, ihse, jonas
Contributed-by: jonas <jonas.oreland at oracle.com>, erikj <erik.joelsson at oracle.com>, ihse <magnus.ihse.bursie at oracle.com>, tgranat <torbjorn.granat at oracle.com>, ykantser <yekaterina.kantserova at oracle.com>

! makefiles/CompileDemos.gmk
! makefiles/CompileJavaClasses.gmk
! makefiles/CompileLaunchers.gmk
! makefiles/CompileNativeLibraries.gmk
! makefiles/CopyFiles.gmk
! makefiles/CopyIntoClasses.gmk
! makefiles/CopySamples.gmk
+ makefiles/CreateJars.gmk
! makefiles/GendataBreakIterator.gmk
+ makefiles/GendataFontConfig.gmk
+ makefiles/GendataHtml32dtd.gmk
+ makefiles/GendataTimeZone.gmk
! makefiles/GenerateClasses.gmk
! makefiles/GenerateData.gmk
! makefiles/GenerateJavaSources.gmk
+ makefiles/GensrcBuffer.gmk
! makefiles/GensrcCharacterData.gmk
+ makefiles/GensrcCharsetCoder.gmk
+ makefiles/GensrcCharsetMapping.gmk
+ makefiles/GensrcExceptions.gmk
+ makefiles/GensrcIcons.gmk
! makefiles/GensrcJDWP.gmk
! makefiles/GensrcLocaleDataMetaInfo.gmk
! makefiles/GensrcMisc.gmk
! makefiles/GensrcProperties.gmk
+ makefiles/GensrcSwing.gmk
+ makefiles/GensrcX11Wrappers.gmk
! makefiles/Images.gmk
! makefiles/LegacyMakefiles.gmk
! makefiles/Makefile
+ makefiles/OldImages.gmk
! makefiles/Setup.gmk
! makefiles/Tools.gmk
- makefiles/altclasses/Makefile
- makefiles/apple/Makefile
- makefiles/apple/applescript/Makefile
- makefiles/com/Makefile
- makefiles/com/apple/Makefile
- makefiles/com/apple/osx/Makefile
- makefiles/com/apple/osxui/Makefile
- makefiles/com/oracle/Makefile
- makefiles/com/oracle/jfr/Makefile
- makefiles/com/oracle/security/ucrypto/FILES_c.gmk
- makefiles/com/oracle/security/ucrypto/Makefile
- makefiles/com/oracle/security/ucrypto/mapfile-vers
- makefiles/com/sun/Makefile
! makefiles/common/Defs-macosx.gmk
! makefiles/common/Release-macosx.gmk
! makefiles/common/Release.gmk
- makefiles/common/shared/Defs-utils.gmk
! makefiles/common/shared/Defs.gmk
! makefiles/docs/CORE_PKGS.gmk
! makefiles/java/Makefile
- makefiles/java/fdlibm/FILES_c.gmk
- makefiles/java/fdlibm/Makefile
- makefiles/java/instrument/Makefile
- makefiles/java/instrument/mapfile-vers
- makefiles/java/java/Exportedfiles.gmk
- makefiles/java/java/FILES_c.gmk
- makefiles/java/java/FILES_java.gmk
- makefiles/java/java/Makefile
- makefiles/java/java/localelist.sh
- makefiles/java/java/mapfile-vers
- makefiles/java/java/reflect/Makefile
- makefiles/java/java/reorder-i586
- makefiles/java/java/reorder-sparc
- makefiles/java/java/reorder-sparcv9
- makefiles/java/java_crw_demo/Makefile
- makefiles/java/java_crw_demo/mapfile-vers
- makefiles/java/java_hprof_demo/Makefile
- makefiles/java/java_hprof_demo/mapfile-vers
- makefiles/java/jexec/Makefile
- makefiles/java/jli/Makefile
- makefiles/java/jli/mapfile-vers
- makefiles/java/jobjc/Makefile
- makefiles/java/jvm/Makefile
- makefiles/java/main/Makefile
- makefiles/java/main/java/Makefile
- makefiles/java/main/java/mapfile-amd64
- makefiles/java/main/java/mapfile-i586
- makefiles/java/main/java/mapfile-sparc
- makefiles/java/main/java/mapfile-sparcv9
- makefiles/java/main/javaw/Makefile
- makefiles/java/management/Exportedfiles.gmk
- makefiles/java/management/FILES_c.gmk
- makefiles/java/management/Makefile
- makefiles/java/management/mapfile-vers
- makefiles/java/net/FILES_c.gmk
- makefiles/java/net/Makefile
- makefiles/java/net/mapfile-vers
- makefiles/java/nio/Exportedfiles.gmk
- makefiles/java/nio/FILES_c.gmk
- makefiles/java/nio/FILES_java.gmk
- makefiles/java/nio/Makefile
- makefiles/java/nio/addNotices.sh
- makefiles/java/nio/genBuffer.sh
- makefiles/java/nio/genCharsetProvider.sh
- makefiles/java/nio/genCoder.sh
- makefiles/java/nio/genExceptions.sh
- makefiles/java/nio/mapfile-bsd
- makefiles/java/nio/mapfile-linux
- makefiles/java/nio/mapfile-solaris
- makefiles/java/nio/reorder-i586
- makefiles/java/nio/reorder-sparc
- makefiles/java/nio/reorder-sparcv9
- makefiles/java/npt/Makefile
- makefiles/java/npt/mapfile-vers
! makefiles/java/redist/Makefile
- makefiles/java/redist/fonts/Makefile
- makefiles/java/security/Makefile
- makefiles/java/sun_nio/FILES_java.gmk
- makefiles/java/sun_nio/Makefile
- makefiles/java/util/FILES_java.gmk
- makefiles/java/util/FILES_properties.gmk
- makefiles/java/util/Makefile
- makefiles/java/verify/Makefile
- makefiles/java/verify/mapfile-vers
- makefiles/java/verify/reorder-i586
- makefiles/java/verify/reorder-sparc
- makefiles/java/verify/reorder-sparcv9
- makefiles/javax/Makefile
- makefiles/javax/imageio/Makefile
- makefiles/javax/management/Makefile
- makefiles/javax/sound/FILES_c.gmk
- makefiles/javax/sound/Makefile
- makefiles/javax/sound/SoundDefs.gmk
- makefiles/javax/sound/jsoundalsa/Makefile
- makefiles/javax/sound/jsoundalsa/mapfile-vers
- makefiles/javax/sound/jsoundds/Makefile
- makefiles/javax/sound/mapfile-vers
- makefiles/javax/sql/Makefile
- makefiles/javax/swing/FILES.gmk
- makefiles/javax/swing/Makefile
- makefiles/javax/swing/beaninfo/FILES.gmk
- makefiles/javax/swing/beaninfo/Makefile
- makefiles/javax/swing/beaninfo/SwingBeans.gmk
- makefiles/javax/swing/beaninfo/manifest
- makefiles/javax/swing/html32dtd/Makefile
- makefiles/javax/swing/plaf/FILES.gmk
- makefiles/javax/swing/plaf/Makefile
+ makefiles/mapfiles/libawt/mapfile-mawt-vers
+ makefiles/mapfiles/libawt/mapfile-vers
+ makefiles/mapfiles/libawt/mapfile-vers-linux
+ makefiles/mapfiles/libawt_headless/mapfile-vers
+ makefiles/mapfiles/libawt_headless/reorder-i586
+ makefiles/mapfiles/libawt_headless/reorder-sparc
+ makefiles/mapfiles/libawt_headless/reorder-sparcv9
+ makefiles/mapfiles/libawt_xawt/mapfile-vers
+ makefiles/mapfiles/libdcpr/mapfile-vers
+ makefiles/mapfiles/libhprof/mapfile-vers
+ makefiles/mapfiles/libinstrument/mapfile-vers
+ makefiles/mapfiles/libj2gss/mapfile-vers
+ makefiles/mapfiles/libj2pcsc/mapfile-vers
+ makefiles/mapfiles/libj2pkcs11/mapfile-vers
+ makefiles/mapfiles/libj2ucrypto/mapfile-vers
+ makefiles/mapfiles/libjava/mapfile-vers
+ makefiles/mapfiles/libjava/reorder-i586
+ makefiles/mapfiles/libjava/reorder-sparc
+ makefiles/mapfiles/libjava/reorder-sparcv9
+ makefiles/mapfiles/libjava_crw_demo/mapfile-vers
+ makefiles/mapfiles/libjdga/mapfile-vers
+ makefiles/mapfiles/libjfr/mapfile-vers
+ makefiles/mapfiles/libjli/mapfile-vers
! makefiles/mapfiles/libjpeg/reorder-i586
! makefiles/mapfiles/libjpeg/reorder-sparc
! makefiles/mapfiles/libjpeg/reorder-sparcv9
+ makefiles/mapfiles/libjsound/mapfile-vers
+ makefiles/mapfiles/libjsoundalsa/mapfile-vers
+ makefiles/mapfiles/libkcms/mapfile-vers
+ makefiles/mapfiles/libmanagement/mapfile-vers
+ makefiles/mapfiles/libmlib_image/mapfile-vers
+ makefiles/mapfiles/libnet/mapfile-vers
+ makefiles/mapfiles/libnio/mapfile-bsd
+ makefiles/mapfiles/libnio/mapfile-linux
+ makefiles/mapfiles/libnio/mapfile-solaris
+ makefiles/mapfiles/libnio/reorder-i586
+ makefiles/mapfiles/libnio/reorder-sparc
+ makefiles/mapfiles/libnio/reorder-sparcv9
+ makefiles/mapfiles/libnpt/mapfile-vers
+ makefiles/mapfiles/libsplashscreen/mapfile-vers
+ makefiles/mapfiles/libsunec/mapfile-vers
! makefiles/mapfiles/libverify/reorder-i586
! makefiles/mapfiles/libverify/reorder-sparc
! makefiles/mapfiles/libverify/reorder-sparcv9
! makefiles/mapfiles/libzip/reorder-i586
! makefiles/mapfiles/libzip/reorder-sparc
! makefiles/mapfiles/libzip/reorder-sparcv9
+ makefiles/scripts/addNotices.sh
+ makefiles/scripts/genCharsetProvider.sh
+ makefiles/scripts/genExceptions.sh
+ makefiles/scripts/localelist.sh
- makefiles/sun/Makefile
- makefiles/sun/awt/CondenseRules.awk
- makefiles/sun/awt/Depend.mak
- makefiles/sun/awt/Depend.sed
- makefiles/sun/awt/FILES_c_macosx.gmk
- makefiles/sun/awt/FILES_c_unix.gmk
- makefiles/sun/awt/FILES_c_windows.gmk
- makefiles/sun/awt/FILES_export_macosx.gmk
- makefiles/sun/awt/FILES_export_unix.gmk
- makefiles/sun/awt/FILES_export_windows.gmk
- makefiles/sun/awt/Makefile
- makefiles/sun/awt/README
- makefiles/sun/awt/make.depend
- makefiles/sun/awt/mapfile-mawt-vers
- makefiles/sun/awt/mapfile-vers
- makefiles/sun/awt/mapfile-vers-linux
- makefiles/sun/awt/mawt.gmk
- makefiles/sun/cmm/Makefile
- makefiles/sun/cmm/kcms/FILES_c_unix.gmk
- makefiles/sun/cmm/kcms/FILES_c_windows.gmk
- makefiles/sun/cmm/kcms/Makefile
- makefiles/sun/cmm/kcms/mapfile-vers
- makefiles/sun/dcpr/FILES_c.gmk
- makefiles/sun/dcpr/Makefile
- makefiles/sun/dcpr/mapfile-vers
- makefiles/sun/headless/Makefile
- makefiles/sun/headless/mapfile-vers
- makefiles/sun/headless/reorder-i586
- makefiles/sun/headless/reorder-sparc
- makefiles/sun/headless/reorder-sparcv9
- makefiles/sun/image/Makefile
- makefiles/sun/image/generic/FILES_c.gmk
- makefiles/sun/image/generic/Makefile
- makefiles/sun/image/generic/mapfile-vers
- makefiles/sun/image/vis/FILES_c.gmk
- makefiles/sun/image/vis/Makefile
- makefiles/sun/javazic/Makefile
- makefiles/sun/jdbc/Makefile
- makefiles/sun/jdga/Makefile
- makefiles/sun/jdga/mapfile-vers
- makefiles/sun/lwawt/FILES_c_macosx.gmk
- makefiles/sun/lwawt/FILES_export_macosx.gmk
- makefiles/sun/lwawt/Makefile
- makefiles/sun/nio/Makefile
- makefiles/sun/nio/cs/FILES_java.gmk
- makefiles/sun/nio/cs/Makefile
- makefiles/sun/org/Makefile
- makefiles/sun/org/mozilla/Makefile
- makefiles/sun/org/mozilla/javascript/Makefile
- makefiles/sun/osxapp/Makefile
- makefiles/sun/security/Makefile
- makefiles/sun/security/ec/FILES_c.gmk
- makefiles/sun/security/ec/mapfile-vers
- makefiles/sun/security/jgss/Makefile
- makefiles/sun/security/jgss/wrapper/FILES_c.gmk
- makefiles/sun/security/jgss/wrapper/Makefile
- makefiles/sun/security/jgss/wrapper/mapfile-vers
- makefiles/sun/security/krb5/FILES_c_windows.gmk
- makefiles/sun/security/krb5/Makefile
- makefiles/sun/security/mscapi/FILES_cpp.gmk
- makefiles/sun/security/mscapi/Makefile
- makefiles/sun/security/other/Makefile
- makefiles/sun/security/smartcardio/FILES_c.gmk
- makefiles/sun/security/smartcardio/Makefile
- makefiles/sun/security/smartcardio/mapfile-vers
- makefiles/sun/security/tools/Makefile
- makefiles/sun/security/util/Makefile
- makefiles/sun/splashscreen/FILES_c.gmk
- makefiles/sun/splashscreen/Makefile
- makefiles/sun/splashscreen/mapfile-vers
- makefiles/sun/xawt/FILES_c_unix.gmk
- makefiles/sun/xawt/FILES_export_unix.gmk
- makefiles/sun/xawt/Makefile
- makefiles/sun/xawt/mapfile-vers