changeset 10827:3995fd63f47b

Move logging.properties to conf
author chegar
date Wed, 15 Oct 2014 16:27:29 +0100
parents d69a6c5e3ee4
children 24b6436df632
files make/copy/Copy-java.logging.gmk src/java.base/share/classes/sun/util/logging/PlatformLogger.java src/java.logging/share/classes/java/util/logging/LogManager.java
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.logging.gmk	Wed Oct 15 15:39:32 2014 +0100
+++ b/make/copy/Copy-java.logging.gmk	Wed Oct 15 16:27:29 2014 +0100
@@ -29,9 +29,9 @@
 
 LOGGING_LIB_SRC := $(JDK_TOPDIR)/src/java.logging/share/conf
 
-$(LIB_DST_DIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
+$(CONF_DST_DIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
 	$(call install-file)
 
-TARGETS := $(LIB_DST_DIR)/logging.properties
+TARGETS := $(CONF_DST_DIR)/logging.properties
 
 ################################################################################
--- a/src/java.base/share/classes/sun/util/logging/PlatformLogger.java	Wed Oct 15 15:39:32 2014 +0100
+++ b/src/java.base/share/classes/sun/util/logging/PlatformLogger.java	Wed Oct 15 16:27:29 2014 +0100
@@ -71,10 +71,10 @@
  *   java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
  *
  * Limitation:
- * <JAVA_HOME>/lib/logging.properties is the system-wide logging
+ * <JAVA_HOME>/conf/logging.properties is the system-wide logging
  * configuration defined in the specification and read in the
  * default case to configure any java.util.logging.Logger instances.
- * Platform loggers will not detect if <JAVA_HOME>/lib/logging.properties
+ * Platform loggers will not detect if <JAVA_HOME>/conf/logging.properties
  * is modified. In other words, unless the java.util.logging API
  * is used at runtime or the logging system properties is set,
  * the platform loggers will use the default setting described above.
--- a/src/java.logging/share/classes/java/util/logging/LogManager.java	Wed Oct 15 15:39:32 2014 +0100
+++ b/src/java.logging/share/classes/java/util/logging/LogManager.java	Wed Oct 15 16:27:29 2014 +0100
@@ -78,7 +78,7 @@
  * <p>
  * If neither of these properties is defined then the LogManager uses its
  * default configuration. The default configuration is typically loaded from the
- * properties file "{@code lib/logging.properties}" in the Java installation
+ * properties file "{@code conf/logging.properties}" in the Java installation
  * directory.
  * <p>
  * The properties for loggers and Handlers will have names starting
@@ -1210,7 +1210,7 @@
             if (fname == null) {
                 throw new Error("Can't find java.home ??");
             }
-            File f = new File(fname, "lib");
+            File f = new File(fname, "conf");
             f = new File(f, "logging.properties");
             fname = f.getCanonicalPath();
         }