changeset 7103:a8715770b814

cleanup of flotsam diffs between jdk8 mainline and lambda repo.
author mduigou
date Tue, 15 Jan 2013 12:44:25 -0800
parents 1216b8dcfa47
children c52c3fc6dbbf
files README make/com/sun/crypto/provider/Makefile make/com/sun/net/httpserver/Makefile make/common/shared/Defs-java.gmk make/docs/CORE_PKGS.gmk make/java/invoke/Makefile make/java/java/FILES_java.gmk make/java/java/Makefile make/netbeans/README make/netbeans/awt2d/nbproject/project.xml make/netbeans/common/java-data-native.ent make/netbeans/common/java-data-no-native.ent make/netbeans/j2se/nbproject/project.xml make/netbeans/jarzip/nbproject/project.xml make/netbeans/jconsole/nbproject/project.xml make/netbeans/jmx/nbproject/project.xml make/sun/osxapp/Makefile make/sun/security/other/Makefile make/sun/util/Makefile makefiles/Setup.gmk src/macosx/native/sun/osxapp/NSApplicationAWT.m src/share/classes/java/io/BufferedReader.java src/solaris/classes/sun/nio/fs/UnixPath.java src/windows/classes/sun/nio/fs/WindowsPath.java
diffstat 24 files changed, 110 insertions(+), 150 deletions(-) [+]
line wrap: on
line diff
--- a/README	Tue Jan 15 11:11:23 2013 -0800
+++ b/README	Tue Jan 15 12:44:25 2013 -0800
@@ -1,28 +1,3 @@
-   /*
-    * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-    * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-    *
-    * This code is free software; you can redistribute it and/or modify it
-    * under the terms of the GNU General Public License version 2 only, as
-    * published by the Free Software Foundation.  Oracle designates this
-    * particular file as subject to the "Classpath" exception as provided
-    * by Oracle in the LICENSE file that accompanied this code.
-    *
-    * This code is distributed in the hope that it will be useful, but WITHOUT
-    * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    * version 2 for more details (a copy is included in the LICENSE file that
-    * accompanied this code).
-    *
-    * You should have received a copy of the GNU General Public License version
-    * 2 along with this work; if not, write to the Free Software Foundation,
-    * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-    *
-    * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-    * or visit www.oracle.com if you need additional information or have any
-    * questions.
-    */
-
 README:
   This file should be located at the top of the jdk Mercurial repository.
 
--- a/make/com/sun/crypto/provider/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/com/sun/crypto/provider/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -114,7 +114,7 @@
 endif
 
 JAVAC_MAX_WARNINGS = false
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation,-auxiliaryclass
+JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
 JAVAC_WARNINGS_FATAL = true
 include $(BUILDDIR)/common/Defs.gmk
 
--- a/make/com/sun/net/httpserver/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/com/sun/net/httpserver/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -27,7 +27,6 @@
 PACKAGE = com.sun.net.httpserver
 PRODUCT = sun
 JAVAC_MAX_WARNINGS = true
-JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-auxiliaryclass
 JAVAC_WARNINGS_FATAL = true
 include $(BUILDDIR)/common/Defs.gmk
 
--- a/make/common/shared/Defs-java.gmk	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/common/shared/Defs-java.gmk	Tue Jan 15 12:44:25 2013 -0800
@@ -225,9 +225,7 @@
   BOOT_JAVACFLAGS  += -Werror
 endif
 
-BOOT_SOURCE_LANGUAGE_VERSION = 7
-BOOT_TARGET_CLASS_VERSION = 7
-BOOT_JAVACFLAGS  += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+BOOT_JAVACFLAGS  += -encoding ascii
 BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
 
 BOOT_JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
--- a/make/docs/CORE_PKGS.gmk	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/docs/CORE_PKGS.gmk	Tue Jan 15 12:44:25 2013 -0800
@@ -138,8 +138,6 @@
   java.util.regex                                \
   java.util.spi                                  \
   java.util.stream                               \
-  java.util.stream.primitive                     \
-  java.util.stream.op                            \
   java.util.zip                                  \
   javax.accessibility                            \
   javax.activation                               \
--- a/make/java/invoke/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/java/invoke/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/make/java/java/FILES_java.gmk	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/java/java/FILES_java.gmk	Tue Jan 15 12:44:25 2013 -0800
@@ -315,19 +315,6 @@
     java/util/UUID.java \
     java/util/concurrent/AbstractExecutorService.java \
     java/util/concurrent/ArrayBlockingQueue.java \
-    java/util/concurrent/atomic/AtomicBoolean.java \
-    java/util/concurrent/atomic/AtomicIntegerArray.java \
-    java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
-    java/util/concurrent/atomic/AtomicInteger.java \
-    java/util/concurrent/atomic/AtomicLongArray.java \
-    java/util/concurrent/atomic/AtomicLongFieldUpdater.java \
-    java/util/concurrent/atomic/AtomicLong.java \
-    java/util/concurrent/atomic/AtomicMarkableReference.java \
-    java/util/concurrent/atomic/AtomicReferenceArray.java \
-    java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
-    java/util/concurrent/atomic/AtomicReference.java \
-    java/util/concurrent/atomic/AtomicStampedReference.java \
-    java/util/concurrent/atomic/package-info.java \
     java/util/concurrent/BlockingDeque.java \
     java/util/concurrent/BlockingQueue.java \
     java/util/concurrent/BrokenBarrierException.java \
@@ -346,19 +333,16 @@
     java/util/concurrent/CountDownLatch.java \
     java/util/concurrent/CountedCompleter.java \
     java/util/concurrent/CyclicBarrier.java \
+    java/util/concurrent/DelayQueue.java \
     java/util/concurrent/Delayed.java \
-    java/util/concurrent/DelayQueue.java \
     java/util/concurrent/DoubleAdder.java \
     java/util/concurrent/DoubleMaxUpdater.java \
     java/util/concurrent/Exchanger.java \
     java/util/concurrent/ExecutionException.java \
-    java/util/concurrent/ExecutorCompletionService.java \
     java/util/concurrent/Executor.java \
     java/util/concurrent/ExecutorService.java \
+    java/util/concurrent/ExecutorCompletionService.java \
     java/util/concurrent/Executors.java \
-    java/util/concurrent/extra/AtomicDoubleArray.java \
-    java/util/concurrent/extra/AtomicDouble.java \
-    java/util/concurrent/extra/ReadMostlyVector.java \
     java/util/concurrent/ForkJoinPool.java \
     java/util/concurrent/ForkJoinTask.java \
     java/util/concurrent/ForkJoinWorkerThread.java \
@@ -367,16 +351,6 @@
     java/util/concurrent/LinkedBlockingDeque.java \
     java/util/concurrent/LinkedBlockingQueue.java \
     java/util/concurrent/LinkedTransferQueue.java \
-    java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
-    java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
-    java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
-    java/util/concurrent/locks/Condition.java \
-    java/util/concurrent/locks/Lock.java \
-    java/util/concurrent/locks/LockSupport.java \
-    java/util/concurrent/locks/package-info.java \
-    java/util/concurrent/locks/ReadWriteLock.java \
-    java/util/concurrent/locks/ReentrantLock.java \
-    java/util/concurrent/locks/ReentrantReadWriteLock.java \
     java/util/concurrent/LongAdder.java \
     java/util/concurrent/LongAdderTable.java \
     java/util/concurrent/LongMaxUpdater.java \
@@ -399,9 +373,35 @@
     java/util/concurrent/ThreadFactory.java \
     java/util/concurrent/ThreadLocalRandom.java \
     java/util/concurrent/ThreadPoolExecutor.java \
+    java/util/concurrent/TimeUnit.java \
     java/util/concurrent/TimeoutException.java \
-    java/util/concurrent/TimeUnit.java \
     java/util/concurrent/TransferQueue.java \
+    java/util/concurrent/atomic/AtomicBoolean.java \
+    java/util/concurrent/atomic/AtomicInteger.java \
+    java/util/concurrent/atomic/AtomicIntegerArray.java \
+    java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
+    java/util/concurrent/atomic/AtomicLong.java \
+    java/util/concurrent/atomic/AtomicLongArray.java \
+    java/util/concurrent/atomic/AtomicLongFieldUpdater.java \
+    java/util/concurrent/atomic/AtomicMarkableReference.java \
+    java/util/concurrent/atomic/AtomicReference.java \
+    java/util/concurrent/atomic/AtomicReferenceArray.java \
+    java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
+    java/util/concurrent/atomic/AtomicStampedReference.java \
+    java/util/concurrent/atomic/package-info.java \
+    java/util/concurrent/extra/AtomicDoubleArray.java \
+    java/util/concurrent/extra/AtomicDouble.java \
+    java/util/concurrent/extra/ReadMostlyVector.java \
+    java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
+    java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
+    java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
+    java/util/concurrent/locks/Condition.java \
+    java/util/concurrent/locks/Lock.java \
+    java/util/concurrent/locks/LockSupport.java \
+    java/util/concurrent/locks/package-info.java \
+    java/util/concurrent/locks/ReadWriteLock.java \
+    java/util/concurrent/locks/ReentrantLock.java \
+    java/util/concurrent/locks/ReentrantReadWriteLock.java \
     java/util/regex/Pattern.java \
     java/util/regex/Matcher.java \
     java/util/regex/MatchResult.java \
--- a/make/java/java/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/java/java/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -32,12 +32,12 @@
 PACKAGE = java.lang
 LIBRARY = java
 PRODUCT = java
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=false
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=false
-JAVAC_MAX_WARNINGS=false
+SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
+SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
+JAVAC_MAX_WARNINGS=true
 include $(BUILDDIR)/common/Defs.gmk
 
-AUTO_FILES_JAVA_DIRS = java/util/function java/util/stream
+AUTO_FILES_JAVA_DIRS = java/util/concurrent java/util/function java/util/stream
 
 # windows compiler flags
 ifeq ($(PLATFORM),windows)
@@ -65,8 +65,6 @@
 include FILES_java.gmk
 include Exportedfiles.gmk
 
-AUTO_FILES_JAVA_DIRS = java/util/concurrent java/util/function java/util/stream
-
 ifeq ($(PLATFORM),windows)
 FILES_java += 	java/io/WinNTFileSystem.java \
 		java/util/prefs/WindowsPreferences.java \
--- a/make/netbeans/README	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/README	Tue Jan 15 12:44:25 2013 -0800
@@ -47,11 +47,6 @@
         "jtreg" is the test harness for running OpenJDK's regression tests.
         Get it from http://openjdk.java.net/jtreg
 
-    TestNG
-        TestNG is a testing library and test harness used for some of the
-        OpenJDK tests. New tests for OpenJDK should be developed using TestNG
-        rather than jtreg or JUnit.
-
     Ant
        NetBeans comes with ant, but if you use a separately-installed copy
        please make sure that it is at least version 1.8.1.
@@ -88,9 +83,6 @@
     * jtreg.home
         Set to the location where you installed jtreg.
 
-    * testng.home
-        Set to the location where you installed testng.
-
     * make.options
         Some of the projects invoke "make", since they compile native code.
         The make.options property is for passing information about what you
--- a/make/netbeans/awt2d/nbproject/project.xml	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/awt2d/nbproject/project.xml	Tue Jan 15 12:44:25 2013 -0800
@@ -38,7 +38,6 @@
     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
     <!ENTITY demo-sources SYSTEM "../../common/demo-sources.ent">
     <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY testng-sources SYSTEM "../../common/testng-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
@@ -46,7 +45,6 @@
     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
     <!ENTITY demo-view SYSTEM "../../common/demo-view.ent">
     <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY testng-view SYSTEM "../../common/testng-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
     <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
     <!ENTITY java-data-native SYSTEM "../../common/java-data-native.ent">
@@ -66,7 +64,6 @@
                 &windows-sources;
                 &demo-sources;
                 &jtreg-sources;
-                &testng-sources;
                 &build-folder;
             </folders>
             <ide-actions>
@@ -85,7 +82,6 @@
                     &windows-view;
                     &demo-view;
                     &jtreg-view;
-                    &testng-view;
                     &file-view;
                 </items>
                 <context-menu>
--- a/make/netbeans/common/java-data-native.ent	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/common/java-data-native.ent	Tue Jan 15 12:44:25 2013 -0800
@@ -46,11 +46,4 @@
         <unit-tests/>
         <source-level>1.8</source-level>
     </compilation-unit>
-    <compilation-unit>
-        <package-root>${root}/test-ng/tests</package-root>
-        <unit-tests/>
-        <classpath mode="compile">${root}/test-ng/lib/testng-6.7.jar</classpath>
-        <built-to>${root}/build/${platform}-${arch}/test-ng/classes</built-to>
-        <source-level>1.8</source-level>
-    </compilation-unit>
 </java-data>
--- a/make/netbeans/common/java-data-no-native.ent	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/common/java-data-no-native.ent	Tue Jan 15 12:44:25 2013 -0800
@@ -44,11 +44,4 @@
         <unit-tests/>
         <source-level>1.8</source-level>
     </compilation-unit>
-    <compilation-unit>
-        <package-root>${root}/test-ng/tests</package-root>
-        <unit-tests/>
-        <classpath mode="compile">${root}/test-ng/lib/testng-6.7.jar</classpath>
-        <built-to>${root}/build/${platform}-${arch}/test-ng/classes</built-to>
-        <source-level>1.8</source-level>
-    </compilation-unit>
 </java-data>
--- a/make/netbeans/j2se/nbproject/project.xml	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/j2se/nbproject/project.xml	Tue Jan 15 12:44:25 2013 -0800
@@ -37,14 +37,12 @@
     <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
     <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY testng-sources SYSTEM "../../common/testng-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
     <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
     <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY testng-view SYSTEM "../../common/testng-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
     <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
     <!ENTITY java-data-native SYSTEM "../../common/java-data-native.ent">
@@ -62,9 +60,8 @@
                 &share-sources;
                 &unix-sources;
                 &windows-sources;
+                &build-folder;
 		&jtreg-sources;
-		&testng-sources;
-                &build-folder;
             </folders>
             <ide-actions>
                 <action name="build">
@@ -89,7 +86,6 @@
                     &unix-view;
                     &windows-view;
                     &jtreg-view;
-                    &testng-view;
                     &file-view;
                 </items>
                 <context-menu>
--- a/make/netbeans/jarzip/nbproject/project.xml	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/jarzip/nbproject/project.xml	Tue Jan 15 12:44:25 2013 -0800
@@ -35,12 +35,10 @@
     <!ENTITY properties SYSTEM "../../common/properties.ent">
     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
     <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY testng-sources SYSTEM "../../common/testng-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
     <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY testng-view SYSTEM "../../common/testng-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
     <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
     <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
@@ -57,7 +55,6 @@
             <folders>
                 &share-sources;
                 &jtreg-sources;
-                &testng-sources;
                 &build-folder;
             </folders>
             <ide-actions>
@@ -67,7 +64,6 @@
                 <items>
                     &share-view;
                     &jtreg-view;
-                    &testng-view;
                     &file-view;
                 </items>
                 <context-menu>
--- a/make/netbeans/jconsole/nbproject/project.xml	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/jconsole/nbproject/project.xml	Tue Jan 15 12:44:25 2013 -0800
@@ -35,12 +35,10 @@
     <!ENTITY properties SYSTEM "../../common/properties.ent">
     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
     <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY testng-sources SYSTEM "../../common/testng-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
     <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY testng-view SYSTEM "../../common/testng-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
     <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
     <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
@@ -57,7 +55,6 @@
             <folders>
                 &share-sources;
                 &jtreg-sources;
-                &testng-sources;
                 &build-folder;
             </folders>
             <ide-actions>
@@ -73,7 +70,6 @@
                 <items>
                     &share-view;
                     &jtreg-view;
-                    &testng-view;
                     &file-view;
                 </items>
                 <context-menu>
--- a/make/netbeans/jmx/nbproject/project.xml	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/netbeans/jmx/nbproject/project.xml	Tue Jan 15 12:44:25 2013 -0800
@@ -36,12 +36,10 @@
     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
     <!ENTITY sample-sources SYSTEM "../../common/sample-sources.ent">
     <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY testng-sources SYSTEM "../../common/testng-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
     <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY testng-view SYSTEM "../../common/testng-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
     <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
     <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
@@ -58,7 +56,6 @@
             <folders>
                 &share-sources;
                 &jtreg-sources;
-                &testng-sources;
                 &build-folder;
             </folders>
             <ide-actions>
@@ -68,7 +65,6 @@
                 <items>
                     &share-view;
                     &jtreg-view;
-                    &testng-view;
                     &file-view;
                 </items>
                 <context-menu>
--- a/make/sun/osxapp/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/sun/osxapp/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -28,6 +28,11 @@
 PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
+GEN_DIR=$(GENSRCDIR)/sun/osxapp
+ICON_DATA = $(GEN_DIR)/AWTIconData.h
+
+CLASSES_INIT += $(ICON_DATA)
+
 #
 # Files
 #
@@ -63,6 +68,7 @@
 	-framework QuartzCore
 
 CPPFLAGS += \
+        -I$(GEN_DIR) \
         $(call NativeSrcDirList,-I,/native/sun/osxapp)
 
 
@@ -70,6 +76,34 @@
   CPPFLAGS += -DINTERNAL_BUILD
 endif
 
-clean clobber::
+TEMPDIR_CLASSES = $(TEMPDIR)/classes
 
-.PHONY:
+$(TEMPDIR_CLASSES)/sun/osxapp/ToBin.class: ToBin.java
+	@$(prep-target)
+	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
+
+ifdef OPENJDK
+    ICONS_PATH_PREFIX=$(PLATFORM_SRC_MACOS)
+else
+    ICONS_PATH_PREFIX=$(CLOSED_SRC)/macosx
+endif
+
+generated.clean:
+	$(RM) -r $(GEN_DIR)/*.h
+
+ICONPATH=$(ICONS_PATH_PREFIX)/native/sun/osxapp/resource/icons
+ICON = $(ICONPATH)/JavaApp.icns
+
+$(GEN_DIR)/AWTIconData.h: $(TEMPDIR_CLASSES)/sun/osxapp/ToBin.class $(ICON) 
+	$(prep-target)
+	$(RM) $(ICON_DATA)
+	$(ECHO) "static unsigned char sAWTIconData[] = { " >> $(ICON_DATA);  \
+	$(CAT) $(ICON) | \
+	    $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) -Djava.awt.headless=true \
+	    sun.osxapp.ToBin >> $(ICON_DATA); \
+	$(ECHO) "};" >> $(ICON_DATA);
+
+
+clean clobber:: generated.clean
+
+.PHONY: generated.clean
--- a/make/sun/security/other/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/sun/security/other/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -27,7 +27,7 @@
 PACKAGE = sun.security.other
 PRODUCT = sun
 JAVAC_MAX_WARNINGS=true
-JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-auxiliaryclass
+JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
 JAVAC_WARNINGS_FATAL=true
 include $(BUILDDIR)/common/Defs.gmk
 
--- a/make/sun/util/Makefile	Tue Jan 15 11:11:23 2013 -0800
+++ b/make/sun/util/Makefile	Tue Jan 15 12:44:25 2013 -0800
@@ -26,10 +26,8 @@
 BUILDDIR = ../..
 PACKAGE = sun.util
 PRODUCT = sun
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=false
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=false
-JAVAC_MAX_WARNINGS = false
-JAVAC_WARNINGS_FATAL = false
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
 
 include $(BUILDDIR)/common/Defs.gmk
 
--- a/makefiles/Setup.gmk	Tue Jan 15 11:11:23 2013 -0800
+++ b/makefiles/Setup.gmk	Tue Jan 15 12:44:25 2013 -0800
@@ -27,7 +27,7 @@
 JAVAH_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar
 JAVADOC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
 
-DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally,-auxiliaryclass
+DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
 
 # The generate old bytecode javac setup uses the new compiler to compile for the
 # boot jdk to generate tools that need to be run with the boot jdk.
--- a/src/macosx/native/sun/osxapp/NSApplicationAWT.m	Tue Jan 15 11:11:23 2013 -0800
+++ b/src/macosx/native/sun/osxapp/NSApplicationAWT.m	Tue Jan 15 12:44:25 2013 -0800
@@ -31,6 +31,7 @@
 #import "PropertiesUtilities.h"
 #import "ThreadUtilities.h"
 #import "QueuingApplicationDelegate.h"
+#import "AWTIconData.h"
 
 
 static BOOL sUsingDefaultNIB = YES;
@@ -258,25 +259,26 @@
         theIconPath = [PropertiesUtilities javaSystemPropertyForKey:@"apple.awt.application.icon" withEnv:env];
     }
 
-    // If the icon file wasn't specified as an argument and we need to get an icon
-    // we'll use the generic java app icon.
-    NSString *defaultIconPath = [NSString stringWithFormat:@"%@%@", SHARED_FRAMEWORK_BUNDLE, @"/Resources/GenericApp.icns"];
-    if (theIconPath == nil) {
+    // Use the path specified to get the icon image
+    NSImage* iconImage = nil;
+    if (theIconPath != nil) {
+        iconImage = [[NSImage alloc] initWithContentsOfFile:theIconPath];
+    } 
+
+    // If no icon file was specified or we failed to get the icon image
+    // and there is no bundle's icon, then use the default icon
+    if (iconImage == nil) {
         NSString* bundleIcon = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIconFile"];
         if (bundleIcon == nil) {
-            theIconPath = defaultIconPath;
+            NSData* iconData;
+            iconData = [[NSData alloc] initWithBytesNoCopy: sAWTIconData length: sizeof(sAWTIconData) freeWhenDone: NO];
+            iconImage = [[NSImage alloc] initWithData: iconData];
+            [iconData release];
         }
     } 
 
-    // Set up the dock icon if we have an icon name.
-    if (theIconPath != nil) {
-        NSImage *iconImage = [[NSImage alloc] initWithContentsOfFile:theIconPath];
-
-        // If we failed for some reason fall back to the default icon.
-    if (iconImage == nil) {
-            iconImage = [[NSImage alloc] initWithContentsOfFile:defaultIconPath];
-    }
-
+    // Set up the dock icon if we have an icon image.
+    if (iconImage != nil) {
         [NSApp setApplicationIconImage:iconImage];
         [iconImage release];
     }
--- a/src/share/classes/java/io/BufferedReader.java	Tue Jan 15 11:11:23 2013 -0800
+++ b/src/share/classes/java/io/BufferedReader.java	Tue Jan 15 12:44:25 2013 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011-2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/src/solaris/classes/sun/nio/fs/UnixPath.java	Tue Jan 15 11:11:23 2013 -0800
+++ b/src/solaris/classes/sun/nio/fs/UnixPath.java	Tue Jan 15 12:44:25 2013 -0800
@@ -168,7 +168,7 @@
         if (getFileSystem().needToResolveAgainstDefaultDirectory()) {
             return resolve(getFileSystem().defaultDirectory(), path);
         } else {
-            if (!isEmptyPath()) {
+            if (!isEmpty()) {
                 return path;
             } else {
                 // empty path case will access current directory
@@ -209,7 +209,7 @@
             // count names
             count = 0;
             index = 0;
-            if (isEmptyPath()) {
+            if (isEmpty()) {
                 // empty path has one name
                 count = 1;
             } else {
@@ -245,7 +245,7 @@
     }
 
     // returns {@code true} if this path is an empty path
-    private boolean isEmptyPath() {
+    private boolean isEmpty() {
         return path.length == 0;
     }
 
@@ -416,7 +416,7 @@
             throw new IllegalArgumentException("'other' is different type of Path");
 
         // this path is the empty path
-        if (this.isEmptyPath())
+        if (this.isEmpty())
             return other;
 
         int bn = this.getNameCount();
@@ -439,14 +439,14 @@
                 return remainder;
 
             // other is the empty path
-            boolean isOtherEmpty = other.isEmptyPath();
+            boolean isOtherEmpty = other.isEmpty();
 
             // result is a  "../" for each remaining name in base
             // followed by the remaining names in other. If the remainder is
             // the empty path then we don't add the final trailing slash.
             int len = dotdots*3 + remainder.path.length;
             if (isOtherEmpty) {
-                assert remainder.isEmptyPath();
+                assert remainder.isEmpty();
                 len--;
             }
             byte[] result = new byte[len];
@@ -619,7 +619,7 @@
 
         // other path has no name elements
         if (thatOffsetCount == 0 && this.isAbsolute()) {
-            return that.isEmptyPath() ? false : true;
+            return that.isEmpty() ? false : true;
         }
 
         // given path has more elements that this path
--- a/src/windows/classes/sun/nio/fs/WindowsPath.java	Tue Jan 15 11:11:23 2013 -0800
+++ b/src/windows/classes/sun/nio/fs/WindowsPath.java	Tue Jan 15 12:44:25 2013 -0800
@@ -223,7 +223,7 @@
         // Relative path ("foo" for example)
         if (type == WindowsPathType.RELATIVE) {
             String defaultDirectory = getFileSystem().defaultDirectory();
-            if (isEmptyPath())
+            if (isEmpty())
                 return defaultDirectory;
             if (defaultDirectory.endsWith("\\")) {
                 return defaultDirectory + path;
@@ -300,7 +300,7 @@
 
     // -- Path operations --
 
-    private boolean isEmptyPath() {
+    private boolean isEmpty() {
         return path.length() == 0;
     }
 
@@ -423,7 +423,7 @@
     @Override
     public Path normalize() {
         final int count = getNameCount();
-        if (count == 0 || isEmptyPath())
+        if (count == 0 || isEmpty())
             return this;
 
         boolean[] ignore = new boolean[count];      // true => ignore name
@@ -523,7 +523,7 @@
     @Override
     public WindowsPath resolve(Path obj) {
         WindowsPath other = toWindowsPath(obj);
-        if (other.isEmptyPath())
+        if (other.isEmpty())
             return this;
         if (other.isAbsolute())
             return other;
@@ -576,7 +576,7 @@
     private void initOffsets() {
         if (offsets == null) {
             ArrayList<Integer> list = new ArrayList<>();
-            if (isEmptyPath()) {
+            if (isEmpty()) {
                 // empty path considered to have one name element
                 list.add(0);
             } else {
@@ -656,8 +656,8 @@
         }
 
         // empty path starts with itself
-        if (other.isEmptyPath())
-            return this.isEmptyPath();
+        if (other.isEmpty())
+            return this.isEmpty();
 
         // roots match so compare elements
         int thisCount = getNameCount();
@@ -687,8 +687,8 @@
         }
 
         // empty path ends in itself
-        if (other.isEmptyPath()) {
-            return this.isEmptyPath();
+        if (other.isEmpty()) {
+            return this.isEmpty();
         }
 
         int thisCount = this.getNameCount();