Merge

make/com/apple/osxui/Makefile

@@ -98,7 +98,7 @@ CPPFLAGS += \
 
 OTHER_LDLIBS = \
     -lawt -losxapp \
-    -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \
+    -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
     -framework Cocoa \
     -framework Carbon \
     -framework ApplicationServices \

make/sun/headless/Makefile

@@ -29,11 +29,6 @@ NO_ROBOT = true
 MOTIF_VERSION = none
 MOTIF_VERSION_STRING=none
 
-ifeq ($(PLATFORM), macosx)
-LIB_LOCATION = $(LIBDIR)/headless
-else
-endif
-
 PACKAGE = sun.awt
 LIBRARY = awt_headless
 PRODUCT = sun

make/sun/jawt/Makefile

@@ -133,7 +133,7 @@ endif # PLATFORM
 
 ifeq ($(PLATFORM), macosx)
 vpath %.m   $(call NativeSrcDirList,,native/sun/awt)
-OTHER_LDLIBS = -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \
+OTHER_LDLIBS = -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
                -framework Cocoa
 endif # PLATFORM
 

make/sun/lwawt/Makefile

@@ -26,10 +26,10 @@
 BUILDDIR = ../..
 MODULE  = awt
 PACKAGE = sun.lwawt
-LIBRARY = lwawt
+LIBRARY = awt_lwawt
 PRODUCT = sun
 
-LIB_LOCATION = $(LIBDIR)/lwawt
+LIB_LOCATION = $(LIBDIR)
 
 include $(BUILDDIR)/common/Defs.gmk
 

make/sun/xawt/Makefile

@@ -28,10 +28,6 @@ PACKAGE = sun.awt.X11
 LIBRARY = awt_xawt
 PRODUCT = sun
 
-ifeq ($(PLATFORM), macosx)
-LIB_LOCATION = $(LIBDIR)/xawt
-endif
-
 include $(BUILDDIR)/common/Defs.gmk
 
 GEN_DIR=$(GENSRCDIR)/sun/awt/X11

src/share/classes/java/lang/annotation/ContainerAnnotation.java

+/*
+ * 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.
+ */
+
+package java.lang.annotation;
+
+/**
+ * A meta-annotation to indicate which annotation type should be used
+ * as a container for repeated values of the annotation type modified
+ * by the {@code ContainerAnnotation} annotation.
+ *
+ * @since 1.8
+ * @jls 9.6 Annotation Types
+ * @jls 9.7 Annotations
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.ANNOTATION_TYPE)
+public @interface ContainerAnnotation {
+    /**
+     * The annotation type to use to store repeated values of another
+     * annotation.
+     */
+    Class<? extends Annotation> value();
+}

src/solaris/native/sun/awt/awt_LoadLibrary.c

@@ -77,11 +77,12 @@ JNIEXPORT jboolean JNICALL AWTIsHeadless() {
  * Pathnames to the various awt toolkits
  */
 
+
 #ifdef MACOSX
-  #define XAWT_PATH "/xawt/libawt_xawt.dylib"
-  #define LWAWT_PATH "/lwawt/liblwawt.dylib"
+  #define XAWT_PATH "/libawt_xawt.dylib"
+  #define LWAWT_PATH "/libawt_lwawt.dylib"
   #define DEFAULT_PATH LWAWT_PATH
-  #define HEADLESS_PATH "/headless/libawt_headless.dylib"
+  #define HEADLESS_PATH "/libawt_headless.dylib"
 #else
   #define XAWT_PATH "/libawt_xawt.so"
   #define DEFAULT_PATH XAWT_PATH