changeset 10830:760144f2f84b

Move java.policy and java.security to conf
author chegar
date Thu, 16 Oct 2014 13:55:06 +0100
parents 3150fbd1dbde
children bc0c42f5d7bb
files make/copy/Copy-java.base.gmk make/gendata/Gendata-java.base.gmk src/java.base/share/classes/java/security/Security.java src/java.base/share/classes/sun/security/provider/PolicyFile.java src/java.base/share/conf/security/java.security
diffstat 5 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.base.gmk	Wed Oct 15 16:49:43 2014 -0700
+++ b/make/copy/Copy-java.base.gmk	Thu Oct 16 13:55:06 2014 +0100
@@ -166,7 +166,7 @@
 ################################################################################
 
 POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.policy
-POLICY_DST := $(LIB_DST_DIR)/security/java.policy
+POLICY_DST := $(CONF_DST_DIR)/security/java.policy
 
 POLICY_SRC_LIST :=
 
--- a/make/gendata/Gendata-java.base.gmk	Wed Oct 15 16:49:43 2014 -0700
+++ b/make/gendata/Gendata-java.base.gmk	Thu Oct 16 13:55:06 2014 +0100
@@ -65,7 +65,7 @@
 ################################################################################
 
 GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
-GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/java.security
+GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security
 
 # RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile
 
--- a/src/java.base/share/classes/java/security/Security.java	Wed Oct 15 16:49:43 2014 -0700
+++ b/src/java.base/share/classes/java/security/Security.java	Thu Oct 16 13:55:06 2014 +0100
@@ -212,7 +212,7 @@
         // maybe check for a system property which will specify where to
         // look. Someday.
         String sep = File.separator;
-        return new File(System.getProperty("java.home") + sep + "lib" + sep +
+        return new File(System.getProperty("java.home") + sep + "conf" + sep +
                         "security" + sep + filename);
     }
 
--- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java	Wed Oct 15 16:49:43 2014 -0700
+++ b/src/java.base/share/classes/sun/security/provider/PolicyFile.java	Thu Oct 16 13:55:06 2014 +0100
@@ -77,7 +77,7 @@
  *   <i>auth.policy.url.1</i>, <i>auth.policy.url.2</i>, ...,
  *   <i>auth.policy.url.X</i>".  These properties are set
  *   in the Java security properties file, which is located in the file named
- *   &lt;JAVA_HOME&gt;/lib/security/java.security.
+ *   &lt;JAVA_HOME&gt;/conf/security/java.security.
  *   &lt;JAVA_HOME&gt; refers to the value of the java.home system property,
  *   and specifies the directory where the JRE is installed.
  *   Each property value specifies a <code>URL</code> pointing to a
@@ -318,7 +318,7 @@
      *   you don't find one. Each of these specify a policy file.
      *
      *   if none of these could be loaded, use a builtin static policy
-     *      equivalent to the default lib/security/java.policy file.
+     *      equivalent to the default conf/security/java.policy file.
      *
      *   if the system property "java.policy" or "java.auth.policy" is defined
      * (which is the
--- a/src/java.base/share/conf/security/java.security	Wed Oct 15 16:49:43 2014 -0700
+++ b/src/java.base/share/conf/security/java.security	Thu Oct 16 13:55:06 2014 +0100
@@ -162,7 +162,7 @@
 
 # The default is to have a single system-wide policy file,
 # and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
+policy.url.1=file:${java.home}/conf/security/java.policy
 policy.url.2=file:${user.home}/.java.policy
 
 # whether or not we expand properties in the policy file