OpenJDK / jdk7u / jdk7u-dev / jdk
changeset 5653:afe4d2b7b8cc
Merge
author | lana |
---|---|
date | Tue, 22 Jan 2013 22:49:00 -0800 |
parents | 20e8d3977fde 9eb82fb221f3 |
children | db6b554d3072 |
files | .hgtags |
diffstat | 7 files changed, 25 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jan 22 15:15:17 2013 +0400 +++ b/.hgtags Tue Jan 22 22:49:00 2013 -0800 @@ -243,3 +243,4 @@ cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07 b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08 2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09 +e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10
--- a/make/com/oracle/jfr/Makefile Tue Jan 22 15:15:17 2013 +0400 +++ b/make/com/oracle/jfr/Makefile Tue Jan 22 22:49:00 2013 -0800 @@ -42,6 +42,11 @@ AUTO_FILES_JAVA_DIRS = com/oracle/jrockit/jfr oracle/jrockit/jfr +JFC_XSD = oracle/jrockit/jfr/settings/jfc.xsd +JFC_XSD_SRC = $(CLOSED_SHARE_SRC)/classes/$(JFC_XSD) +JFC_XSD_FILE = $(CLASSDESTDIR)/$(JFC_XSD) + + # Find C source files # vpath %.c $(CLOSED_SHARE_SRC)/native/oracle/jfr @@ -59,15 +64,17 @@ $(RM) -r $(CLASSDESTDIR)/com/oracle/jrockit/jfr $(RM) -r $(CLASSDESTDIR)/oracle/jrockit/jfr +# Copy pre-shipped .jfc files +JFR_LIBDIR = $(LIBDIR)/jfr +JFC_SRCDIR = $(CLOSED_SHARE_SRC)/classes/oracle/jrockit/jfr/settings -# Copy pre-shipped .jfs files -JFR_LIBDIR = $(LIBDIR)/jfr -JFR_SRCDIR = $(CLOSED_SHARE_SRC)/lib/jfr - -$(JFR_LIBDIR)/%.jfs: $(JFR_SRCDIR)/%.jfs +$(JFR_LIBDIR)/%.jfc: $(JFC_SRCDIR)/%.jfc $(install-file) -JFS_FILES := $(subst $(JFR_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFR_SRCDIR)/*.jfs)) +JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc)) -all build : $(JFS_FILES) +$(JFC_XSD_FILE) : $(JFC_XSD_SRC) + $(install-file) +all build : $(JFC_FILES) $(JFC_XSD_FILE) +
--- a/make/common/Release.gmk Tue Jan 22 15:15:17 2013 +0400 +++ b/make/common/Release.gmk Tue Jan 22 22:49:00 2013 -0800 @@ -1331,8 +1331,8 @@ @$(java-vm-cleanup) # Clean up names in the messages printed out -CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE@g" \ - -e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE@g" +CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \ + -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g" # Report on the jre image comparison compare-image-jre: $(TEMP_PREV_JRE_COMPARISON)
--- a/src/share/lib/security/java.security-linux Tue Jan 22 15:15:17 2013 +0400 +++ b/src/share/lib/security/java.security-linux Tue Jan 22 22:49:00 2013 -0800 @@ -123,7 +123,7 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. +package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr. # # List of comma-separated packages that start with or equal this string @@ -135,7 +135,7 @@ # by default, none of the class loaders supplied with the JDK call # checkPackageDefinition. # -package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. +package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr. # # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-macosx Tue Jan 22 15:15:17 2013 +0400 +++ b/src/share/lib/security/java.security-macosx Tue Jan 22 22:49:00 2013 -0800 @@ -124,7 +124,7 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,apple. +package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,apple.,oracle.jrockit.jfr. # # List of comma-separated packages that start with or equal this string @@ -136,7 +136,7 @@ # by default, none of the class loaders supplied with the JDK call # checkPackageDefinition. # -package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,apple. +package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,apple.,oracle.jrockit.jfr. # # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-solaris Tue Jan 22 15:15:17 2013 +0400 +++ b/src/share/lib/security/java.security-solaris Tue Jan 22 22:49:00 2013 -0800 @@ -125,7 +125,7 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. +package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr. # # List of comma-separated packages that start with or equal this string @@ -137,7 +137,7 @@ # by default, none of the class loaders supplied with the JDK call # checkPackageDefinition. # -package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. +package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr. # # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-windows Tue Jan 22 15:15:17 2013 +0400 +++ b/src/share/lib/security/java.security-windows Tue Jan 22 22:49:00 2013 -0800 @@ -124,7 +124,7 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. +package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr. # # List of comma-separated packages that start with or equal this string @@ -136,7 +136,7 @@ # by default, none of the class loaders supplied with the JDK call # checkPackageDefinition. # -package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. +package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr. # # Determines whether this properties file can be appended to