Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 5963:9eb82fb221f3 jdk7u14-b11
8005008: Add Java Flight Recorder Phase II
Reviewed-by: mchung
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author | sla |
---|---|
date | Tue, 15 Jan 2013 09:10:15 +0100 |
parents | 1e05556dce1c |
children | afe4d2b7b8cc 696e32c281d5 |
files | make/com/oracle/jfr/Makefile make/common/Release.gmk src/share/lib/security/java.security-linux src/share/lib/security/java.security-macosx src/share/lib/security/java.security-solaris src/share/lib/security/java.security-windows |
diffstat | 6 files changed, 23 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/make/com/oracle/jfr/Makefile Wed Jan 16 13:59:40 2013 -0800 +++ b/make/com/oracle/jfr/Makefile Tue Jan 15 09:10:15 2013 +0100 @@ -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 .jfs files +# Copy pre-shipped .jfc files JFR_LIBDIR = $(LIBDIR)/jfr -JFR_SRCDIR = $(CLOSED_SHARE_SRC)/lib/jfr +JFC_SRCDIR = $(CLOSED_SHARE_SRC)/classes/oracle/jrockit/jfr/settings -$(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 Wed Jan 16 13:59:40 2013 -0800 +++ b/make/common/Release.gmk Tue Jan 15 09:10:15 2013 +0100 @@ -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 Wed Jan 16 13:59:40 2013 -0800 +++ b/src/share/lib/security/java.security-linux Tue Jan 15 09:10:15 2013 +0100 @@ -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 Wed Jan 16 13:59:40 2013 -0800 +++ b/src/share/lib/security/java.security-macosx Tue Jan 15 09:10:15 2013 +0100 @@ -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 Wed Jan 16 13:59:40 2013 -0800 +++ b/src/share/lib/security/java.security-solaris Tue Jan 15 09:10:15 2013 +0100 @@ -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 Wed Jan 16 13:59:40 2013 -0800 +++ b/src/share/lib/security/java.security-windows Tue Jan 15 09:10:15 2013 +0100 @@ -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