changeset 1186:e4ba01b726e2 jdk9-b33

Merge
author lana
date Thu, 25 Sep 2014 16:19:51 -0700
parents e1e5dd0de2e8 555f3152c254
children 742af6ac75e1 d9a01c3a983d 89e2b423f537
files
diffstat 5 files changed, 359 insertions(+), 346 deletions(-) [+]
line wrap: on
line diff
--- a/common/bin/unshuffle_list.txt	Thu Sep 25 12:40:16 2014 -0700
+++ b/common/bin/unshuffle_list.txt	Thu Sep 25 16:19:51 2014 -0700
@@ -531,87 +531,87 @@
 jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java : jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java
 jdk/src/java.desktop/macosx/conf/flavormap.properties : jdk/src/macosx/lib/flavormap.properties
 jdk/src/java.desktop/macosx/native/include/jawt_md.h : jdk/src/macosx/javavm/export/jawt_md.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font : jdk/src/macosx/native/sun/font
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
+jdk/src/java.desktop/macosx/native/libawt_lwawt/font : jdk/src/macosx/native/sun/font
+jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
+jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl
 jdk/src/java.desktop/macosx/native/libjawt/jawt.m : jdk/src/macosx/native/sun/awt/jawt.m
 jdk/src/java.desktop/macosx/native/libjsound : jdk/src/macosx/native/com/sun/media/sound
 jdk/src/java.desktop/macosx/native/libosxapp : jdk/src/macosx/native/sun/osxapp
@@ -686,26 +686,26 @@
 jdk/src/java.desktop/share/conf/psfontj2d.properties : jdk/src/share/classes/sun/print/psfontj2d.properties
 jdk/src/java.desktop/share/conf/psfont.properties.ja : jdk/src/share/classes/sun/print/psfont.properties.ja
 jdk/src/java.desktop/share/conf/sound.properties : jdk/src/share/lib/sound.properties
-jdk/src/java.desktop/share/native/common/sun/awt/debug : jdk/src/share/native/sun/awt/debug
-jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
-jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
-jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c
-jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c
-jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c
-jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h
-jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h
-jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h
-jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL
-jdk/src/java.desktop/share/native/common/sun/java2d/opengl : jdk/src/share/native/sun/java2d/opengl
+jdk/src/java.desktop/share/native/common/awt/debug : jdk/src/share/native/sun/awt/debug
+jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
+jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
+jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c
+jdk/src/java.desktop/share/native/common/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c
+jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c
+jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h
+jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h
+jdk/src/java.desktop/share/native/common/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h
+jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL
+jdk/src/java.desktop/share/native/common/java2d/opengl : jdk/src/share/native/sun/java2d/opengl
 jdk/src/java.desktop/share/native/include/jawt.h : jdk/src/share/javavm/export/jawt.h
-jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils
-jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
-jdk/src/java.desktop/share/native/libawt/sun/awt/image : jdk/src/share/native/sun/awt/image
-jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
-jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
-jdk/src/java.desktop/share/native/libawt/sun/java2d : jdk/src/share/native/sun/java2d
-jdk/src/java.desktop/share/native/libawt/sun/java2d/loops : jdk/src/share/native/sun/java2d/loops
-jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe : jdk/src/share/native/sun/java2d/pipe
+jdk/src/java.desktop/share/native/libawt/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils
+jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
+jdk/src/java.desktop/share/native/libawt/awt/image : jdk/src/share/native/sun/awt/image
+jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
+jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
+jdk/src/java.desktop/share/native/libawt/java2d : jdk/src/share/native/sun/java2d
+jdk/src/java.desktop/share/native/libawt/java2d/loops : jdk/src/share/native/sun/java2d/loops
+jdk/src/java.desktop/share/native/libawt/java2d/pipe : jdk/src/share/native/sun/java2d/pipe
 jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c : jdk/src/share/native/sun/font/DrawGlyphList.c
 jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp : jdk/src/share/native/sun/font/FontInstanceAdapter.cpp
 jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h : jdk/src/share/native/sun/font/FontInstanceAdapter.h
@@ -833,80 +833,80 @@
 jdk/src/java.desktop/unix/conf/flavormap.properties : jdk/src/solaris/lib/flavormap.properties
 jdk/src/java.desktop/unix/conf/fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir
 jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties : jdk/src/solaris/lib/images/cursors/cursors.properties
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h
-jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h
-jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h
-jdk/src/java.desktop/unix/native/common/sun/awt/color.h : jdk/src/solaris/native/sun/awt/color.h
-jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c
-jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h
-jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c
-jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h
-jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c
-jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
-jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
-jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
-jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h
-jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c
-jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h
-jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL
-jdk/src/java.desktop/unix/native/common/sun/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl
-jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
-jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
-jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
-jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
-jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
-jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
+jdk/src/java.desktop/unix/native/common/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h
+jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
+jdk/src/java.desktop/unix/native/common/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c
+jdk/src/java.desktop/unix/native/common/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h
+jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
+jdk/src/java.desktop/unix/native/common/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h
+jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h
+jdk/src/java.desktop/unix/native/common/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h
+jdk/src/java.desktop/unix/native/common/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h
+jdk/src/java.desktop/unix/native/common/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h
+jdk/src/java.desktop/unix/native/common/awt/color.h : jdk/src/solaris/native/sun/awt/color.h
+jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c
+jdk/src/java.desktop/unix/native/common/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h
+jdk/src/java.desktop/unix/native/common/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c
+jdk/src/java.desktop/unix/native/common/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h
+jdk/src/java.desktop/unix/native/common/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c
+jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
+jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
+jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
+jdk/src/java.desktop/unix/native/common/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h
+jdk/src/java.desktop/unix/native/common/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c
+jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h
+jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL
+jdk/src/java.desktop/unix/native/common/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl
+jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
+jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
+jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
+jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
+jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
 jdk/src/java.desktop/unix/native/include/jawt_md.h : jdk/src/solaris/javavm/export/jawt_md.h
-jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
-jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c
-jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
-jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c
-jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
-jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
-jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
-jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h
-jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops : jdk/src/solaris/native/sun/java2d/loops
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c : jdk/src/solaris/native/sun/awt/list.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h : jdk/src/solaris/native/sun/awt/list.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
-jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt : jdk/src/solaris/native/sun/xawt
+jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
+jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c
+jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
+jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c
+jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
+jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
+jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
+jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h
+jdk/src/java.desktop/unix/native/libawt/java2d/loops : jdk/src/solaris/native/sun/java2d/loops
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c : jdk/src/solaris/native/sun/awt/list.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h : jdk/src/solaris/native/sun/awt/list.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h
+jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h
+jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
+jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
+jdk/src/java.desktop/unix/native/libawt_xawt/xawt : jdk/src/solaris/native/sun/xawt
 jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c : jdk/src/solaris/native/sun/font/X11FontScaler.c
 jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c : jdk/src/solaris/native/sun/font/X11TextRenderer.c
 jdk/src/java.desktop/unix/native/libjawt/jawt.c : jdk/src/solaris/native/sun/awt/jawt.c
@@ -978,168 +978,168 @@
 jdk/src/java.desktop/windows/classes/sun/font : jdk/src/windows/classes/sun/font
 jdk/src/java.desktop/windows/conf/flavormap.properties : jdk/src/windows/lib/flavormap.properties
 jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties : jdk/src/windows/lib/images/cursors/cursors.properties
-jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h
+jdk/src/java.desktop/windows/native/common/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h
 jdk/src/java.desktop/windows/native/include/jawt_md.h : jdk/src/windows/javavm/export/jawt_md.h
-jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d
-jdk/src/java.desktop/windows/native/libawt/sun/java2d : jdk/src/windows/native/sun/java2d
-jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur
-jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI
-jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico
-jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico
-jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico
-jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h
-jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
-jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp
+jdk/src/java.desktop/windows/native/libawt/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d
+jdk/src/java.desktop/windows/native/libawt/java2d : jdk/src/windows/native/sun/java2d
+jdk/src/java.desktop/windows/native/libawt/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h
+jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h
+jdk/src/java.desktop/windows/native/libawt/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp
+jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h
+jdk/src/java.desktop/windows/native/libawt/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h
+jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h
+jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h
+jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h
+jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h
+jdk/src/java.desktop/windows/native/libawt/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur
+jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h
+jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h
+jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h
+jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h
+jdk/src/java.desktop/windows/native/libawt/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI
+jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico
+jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico
+jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico
+jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h
+jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
+jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp
 jdk/src/java.desktop/windows/native/libfontmanager : jdk/src/windows/native/sun/font
 jdk/src/java.desktop/windows/native/libjawt/jawt.cpp : jdk/src/windows/native/sun/windows/jawt.cpp
 jdk/src/java.desktop/windows/native/libjsound : jdk/src/windows/native/com/sun/media/sound
--- a/common/bin/unshuffle_patch.sh	Thu Sep 25 12:40:16 2014 -0700
+++ b/common/bin/unshuffle_patch.sh	Thu Sep 25 16:19:51 2014 -0700
@@ -35,11 +35,11 @@
       exit 1
 }
 
-SCRIPT_DIR=`pwd`/`dirname $0`
+SCRIPT_DIR=`dirname $0`
 UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
 
 if [ ! -f "$UNSHUFFLE_LIST" ] ; then
-  echo "FATAL: cannot find $UNSHUFFLE_LIST"
+  echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
   exit 1
 fi
 
@@ -68,7 +68,7 @@
 
 # Make sure we have the right number of arguments
 if [ ! $# -eq 3 ] ; then
-  echo "ERROR: Invalid number of arguments."
+  echo "ERROR: Invalid number of arguments." >&2
   usage
 fi
 
@@ -83,21 +83,28 @@
   fi 
 done
 if [ $found = "false" ] ; then
-  echo "ERROR: Unknown repo: $repo. Should be one of [$repos]."
+  echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
   usage
 fi
 
 # Check given input/output files
 input="$2"
-output="$3"
+if [ "x$input" = "x-" ] ; then
+  input="/dev/stdin"
+fi
 
-if [ ! -f $input ] ; then
-  echo "ERROR: Cannot find input patch file: $input"
+if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
+  echo "ERROR: Cannot find input patch file: $input" >&2
   exit 1
 fi
 
-if [ -f $output ] ; then
-  echo "ERROR: Output patch already exists: $output"
+output="$3"
+if [ "x$output" = "x-" ] ; then
+  output="/dev/stdout"
+fi
+
+if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
+  echo "ERROR: Output patch already exists: $output" >&2
   exit 1
 fi
 
@@ -105,7 +112,7 @@
 
 verbose() {
   if [ ${vflag} = "true" ] ; then
-    echo "$@"
+    echo "$@" >&2
   fi
 }
 
@@ -117,7 +124,7 @@
   path=
   if echo "$line" | egrep '^diff' > /dev/null ; then
     if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
-      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'."
+      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
       exit 1
     fi
     path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
--- a/make/Main.gmk	Thu Sep 25 12:40:16 2014 -0700
+++ b/make/Main.gmk	Thu Sep 25 16:19:51 2014 -0700
@@ -384,6 +384,10 @@
   # header file used by jdk.jdwp libs.
   jdk.jdwp.agent-libs: jdk.jdi-gensrc
 
+  # The swing beans need to have java base properly generated to avoid errors
+  # in javadoc.
+  java.desktop-gensrc: java.base-gensrc
+
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec
 
--- a/make/common/JavaCompilation.gmk	Thu Sep 25 12:40:16 2014 -0700
+++ b/make/common/JavaCompilation.gmk	Thu Sep 25 16:19:51 2014 -0700
@@ -443,6 +443,7 @@
   #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
   #   HEADERS:=path to directory where all generated c-headers are written.
   #   DEPENDS:=Extra dependecy
+  #   DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit.
   $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
   $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
   $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
--- a/make/common/Modules.gmk	Thu Sep 25 12:40:16 2014 -0700
+++ b/make/common/Modules.gmk	Thu Sep 25 16:19:51 2014 -0700
@@ -67,7 +67,8 @@
     SETUP := BOOT_JAVAC, \
     SRC := $(JDK_TOPDIR)/make/src/classes, \
     INCLUDES := build/tools/module, \
-    BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist))
+    BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist, \
+    DISABLE_SJAVAC := true))
 
 TOOL_GENMODULESLIST = $(JAVA_SMALL) \
     -cp "$(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist" \