changeset 653:b7027b4b5c06

Update references to jaxp.properties from lib to conf
author chegar
date Fri, 17 Oct 2014 10:42:01 +0100
parents 02d8c3dba723
children aed12d73118a
files src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java src/java.xml/share/classes/javax/xml/XMLConstants.java src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java
diffstat 16 files changed, 43 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java	Fri Oct 17 10:42:01 2014 +0100
@@ -281,7 +281,7 @@
 
     /**
      * Read JAXP system property in this order: system property,
-     * $java.home/lib/jaxp.properties if the system property is not specified
+     * $java.home/conf/jaxp.properties if the system property is not specified
      *
      * @param propertyId the Id of the property
      * @return the value of the property
@@ -295,7 +295,7 @@
     }
 
     /**
-     * Read from $java.home/lib/jaxp.properties for the specified property
+     * Read from $java.home/conf/jaxp.properties for the specified property
      * The program
      *
      * @param propertyId the Id of the property
@@ -309,7 +309,7 @@
                 synchronized (cacheProps) {
                     if (firstTime) {
                         String configFile = getSystemProperty("java.home") + File.separator +
-                            "lib" + File.separator + "jaxp.properties";
+                            "conf" + File.separator + "jaxp.properties";
                         File f = new File(configFile);
                         if (getFileExists(f)) {
                             is = getFileInputStream(f);
@@ -335,12 +335,12 @@
     }
 
     /**
-     * Cache for properties in java.home/lib/jaxp.properties
+     * Cache for properties in java.home/conf/jaxp.properties
      */
     static final Properties cacheProps = new Properties();
 
     /**
-     * Flag indicating if the program has tried reading java.home/lib/jaxp.properties
+     * Flag indicating if the program has tried reading java.home/conf/jaxp.properties
      */
     static volatile boolean firstTime = true;
 
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java	Fri Oct 17 10:42:01 2014 +0100
@@ -41,7 +41,7 @@
  *      Any Exception thrown during the instantiation process is wrapped as a {@link DatatypeConfigurationException}.
  *    </li>
  *    <li>
- *      If the file ${JAVA_HOME}/lib/jaxp.properties exists, it is loaded in a {@link java.util.Properties} <code>Object</code>.
+ *      If the file ${JAVA_HOME}/conf/jaxp.properties exists, it is loaded in a {@link java.util.Properties} <code>Object</code>.
  *      The <code>Properties</code> <code>Object </code> is then queried for the property as documented in the prior step
  *      and processed as documented in the prior step.
  *    </li>
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java	Fri Oct 17 10:42:01 2014 +0100
@@ -275,7 +275,7 @@
 
     /**
      * Read JAXP system property in this order: system property,
-     * $java.home/lib/jaxp.properties if the system property is not specified
+     * $java.home/conf/jaxp.properties if the system property is not specified
      *
      * @param propertyId the Id of the property
      * @return the value of the property
@@ -289,7 +289,7 @@
     }
 
      /**
-     * Read from $java.home/lib/jaxp.properties for the specified property
+     * Read from $java.home/conf/jaxp.properties for the specified property
      * The program
      *
      * @param propertyId the Id of the property
@@ -303,7 +303,7 @@
                 synchronized (cacheProps) {
                     if (firstTime) {
                         String configFile = getSystemProperty("java.home") + File.separator +
-                            "lib" + File.separator + "jaxp.properties";
+                            "conf" + File.separator + "jaxp.properties";
                         File f = new File(configFile);
                         if (getFileExists(f)) {
                             is = getFileInputStream(f);
@@ -329,12 +329,12 @@
     }
 
    /**
-     * Cache for properties in java.home/lib/jaxp.properties
+     * Cache for properties in java.home/conf/jaxp.properties
      */
     static final Properties cacheProps = new Properties();
 
     /**
-     * Flag indicating if the program has tried reading java.home/lib/jaxp.properties
+     * Flag indicating if the program has tried reading java.home/conf/jaxp.properties
      */
     static volatile boolean firstTime = true;
 
--- a/src/java.xml/share/classes/javax/xml/XMLConstants.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/XMLConstants.java	Fri Oct 17 10:42:01 2014 +0100
@@ -247,7 +247,7 @@
          * </p>
          *
          * <p>
-         * <b>${JAVA_HOME}/lib/jaxp.properties:</b> This configuration file is in standard
+         * <b>${JAVA_HOME}/conf/jaxp.properties:</b> This configuration file is in standard
          * {@link java.util.Properties} format. If the file exists and the system property is specified,
          * its value will be used to override the default of the property.
          * </p>
@@ -314,7 +314,7 @@
          * </p>
          *
          * <p>
-         * <b>${JAVA_HOME}/lib/jaxp.properties:</b> This configuration file is in standard
+         * <b>${JAVA_HOME}/conf/jaxp.properties:</b> This configuration file is in standard
          * java.util.Properties format. If the file exists and the system property is specified,
          * its value will be used to override the default of the property.
          *
@@ -380,7 +380,7 @@
          * </p>
          *
          * <p>
-         * <b>${JAVA_HOME}/lib/jaxp.properties: </b> This configuration file is in standard
+         * <b>${JAVA_HOME}/conf/jaxp.properties: </b> This configuration file is in standard
          * java.util.Properties format. If the file exists and the system property is specified,
          * its value will be used to override the default of the property.
          *
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java	Fri Oct 17 10:42:01 2014 +0100
@@ -43,7 +43,7 @@
  *      Any Exception thrown during the instantiation process is wrapped as a {@link DatatypeConfigurationException}.
  *    </li>
  *    <li>
- *      If the file ${JAVA_HOME}/lib/jaxp.properties exists, it is loaded in a {@link java.util.Properties} <code>Object</code>.
+ *      If the file ${JAVA_HOME}/conf/jaxp.properties exists, it is loaded in a {@link java.util.Properties} <code>Object</code>.
  *      The <code>Properties</code> <code>Object </code> is then queried for the property as documented in the prior step
  *      and processed as documented in the prior step.
  *    </li>
--- a/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java	Fri Oct 17 10:42:01 2014 +0100
@@ -50,12 +50,12 @@
     private static boolean debug = false;
 
     /**
-     * Cache for properties in java.home/lib/jaxp.properties
+     * Cache for properties in java.home/conf/jaxp.properties
      */
     private final static Properties cacheProps = new Properties();
 
     /**
-     * Flag indicating if properties from java.home/lib/jaxp.properties
+     * Flag indicating if properties from java.home/conf/jaxp.properties
      * have been cached.
      */
     private static volatile boolean firstTime = true;
@@ -237,13 +237,13 @@
             if (debug) se.printStackTrace();
         }
 
-        // try to read from $java.home/lib/jaxp.properties
+        // try to read from $java.home/conf/jaxp.properties
         try {
             if (firstTime) {
                 synchronized (cacheProps) {
                     if (firstTime) {
                         String configFile = ss.getSystemProperty("java.home") + File.separator +
-                            "lib" + File.separator + "jaxp.properties";
+                            "conf" + File.separator + "jaxp.properties";
                         File f = new File(configFile);
                         firstTime = false;
                         if (ss.doesFileExist(f)) {
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java	Fri Oct 17 10:42:01 2014 +0100
@@ -66,7 +66,7 @@
      * property.
      * </li>
      * <li>
-     * Use the properties file "lib/jaxp.properties" in the JRE directory.
+     * Use the properties file "conf/jaxp.properties" in the JRE directory.
      * This configuration file is in standard <code>java.util.Properties
      * </code> format and contains the fully qualified name of the
      * implementation class with the key being the system property defined
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java	Fri Oct 17 10:42:01 2014 +0100
@@ -50,12 +50,12 @@
     private static boolean debug = false;
 
     /**
-     * Cache for properties in java.home/lib/jaxp.properties
+     * Cache for properties in java.home/conf/jaxp.properties
      */
     private static final Properties cacheProps = new Properties();
 
     /**
-     * Flag indicating if properties from java.home/lib/jaxp.properties
+     * Flag indicating if properties from java.home/conf/jaxp.properties
      * have been cached.
      */
     static volatile boolean firstTime = true;
@@ -236,13 +236,13 @@
             if (debug) se.printStackTrace();
         }
 
-        // try to read from $java.home/lib/jaxp.properties
+        // try to read from $java.home/conf/jaxp.properties
         try {
             if (firstTime) {
                 synchronized (cacheProps) {
                     if (firstTime) {
                         String configFile = ss.getSystemProperty("java.home") + File.separator +
-                            "lib" + File.separator + "jaxp.properties";
+                            "conf" + File.separator + "jaxp.properties";
                         File f = new File(configFile);
                         firstTime = false;
                         if (ss.doesFileExist(f)) {
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java	Fri Oct 17 10:42:01 2014 +0100
@@ -70,7 +70,7 @@
      * property.
      * </li>
      * <li>
-     * Use the properties file "lib/jaxp.properties" in the JRE directory.
+     * Use the properties file "conf/jaxp.properties" in the JRE directory.
      * This configuration file is in standard <code>java.util.Properties
      * </code> format and contains the fully qualified name of the
      * implementation class with the key being the system property defined
--- a/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java	Fri Oct 17 10:42:01 2014 +0100
@@ -51,12 +51,12 @@
     private static boolean debug = false;
 
     /**
-     * Cache for properties in java.home/lib/jaxp.properties
+     * Cache for properties in java.home/conf/jaxp.properties
      */
     final private static Properties cacheProps = new Properties();
 
     /**
-     * Flag indicating if properties from java.home/lib/jaxp.properties
+     * Flag indicating if properties from java.home/conf/jaxp.properties
      * have been cached.
      */
     private static volatile boolean firstTime = true;
@@ -271,7 +271,7 @@
         }
 
         // Try read $java.home/lib/stax.properties followed by
-        // $java.home/lib/jaxp.properties if former not present
+        // $java.home/conf/jaxp.properties if former not present
         String configFile = null;
         try {
             if (firstTime) {
@@ -287,7 +287,7 @@
                         }
                         else {
                             configFile = ss.getSystemProperty("java.home") + File.separator +
-                                "lib" + File.separator + "jaxp.properties";
+                                "conf" + File.separator + "jaxp.properties";
                             f = new File(configFile);
                             if (ss.doesFileExist(f)) {
                                 dPrint("Read properties file "+f);
--- a/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java	Fri Oct 17 10:42:01 2014 +0100
@@ -53,12 +53,12 @@
     private static boolean debug = false;
 
     /**
-     * Cache for properties in java.home/lib/jaxp.properties
+     * Cache for properties in java.home/conf/jaxp.properties
      */
     private final static Properties cacheProps = new Properties();
 
     /**
-     * Flag indicating if properties from java.home/lib/jaxp.properties
+     * Flag indicating if properties from java.home/conf/jaxp.properties
      * have been cached.
      */
     static volatile boolean firstTime = true;
@@ -268,13 +268,13 @@
             if (debug) se.printStackTrace();
         }
 
-        // try to read from $java.home/lib/jaxp.properties
+        // try to read from $java.home/conf/jaxp.properties
         try {
             if (firstTime) {
                 synchronized (cacheProps) {
                     if (firstTime) {
                         String configFile = ss.getSystemProperty("java.home") + File.separator +
-                            "lib" + File.separator + "jaxp.properties";
+                            "conf" + File.separator + "jaxp.properties";
                         File f = new File(configFile);
                         firstTime = false;
                         if (ss.doesFileExist(f)) {
@@ -287,7 +287,7 @@
             final String factoryClassName = cacheProps.getProperty(factoryId);
 
             if (factoryClassName != null) {
-                dPrint("found in $java.home/jaxp.properties, value=" + factoryClassName);
+                dPrint("found in $java.home/conf/jaxp.properties, value=" + factoryClassName);
                 return newInstance(type, factoryClassName, null, true, true);
             }
         }
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java	Fri Oct 17 10:42:01 2014 +0100
@@ -62,7 +62,7 @@
      * property.
      * </li>
      * <li>
-     * Use the properties file "lib/jaxp.properties" in the JRE directory.
+     * Use the properties file "conf/jaxp.properties" in the JRE directory.
      * This configuration file is in standard <code>java.util.Properties
      * </code> format and contains the fully qualified name of the
      * implementation class with the key being the system property defined
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java	Fri Oct 17 10:42:01 2014 +0100
@@ -141,7 +141,7 @@
      *     and returns it if it is successfully created.
      *   </li>
      *   <li>
-     *     <code>$java.home/lib/jaxp.properties</code> is read and
+     *     <code>$java.home/conf/jaxp.properties</code> is read and
      *     the value associated with the key being the system property above
      *     is looked for. If present, the value is processed just like above.
      *   </li>
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java	Fri Oct 17 10:42:01 2014 +0100
@@ -181,10 +181,10 @@
 
         String javah = ss.getSystemProperty( "java.home" );
         String configFile = javah + File.separator +
-        "lib" + File.separator + "jaxp.properties";
+        "conf" + File.separator + "jaxp.properties";
 
 
-        // try to read from $java.home/lib/jaxp.properties
+        // try to read from $java.home/conf/jaxp.properties
         try {
             if(firstTime){
                 synchronized(cacheProps){
@@ -199,7 +199,7 @@
                 }
             }
             final String factoryClassName = cacheProps.getProperty(propertyName);
-            debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
+            debugPrintln("found " + factoryClassName + " in $java.home/conf/jaxp.properties");
 
             if (factoryClassName != null) {
                 sf = createInstance(factoryClassName, true);
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java	Fri Oct 17 10:42:01 2014 +0100
@@ -117,7 +117,7 @@
     *     and returns it if it is successfully created.
     *   </li>
     *   <li>
-    *     ${java.home}/lib/jaxp.properties is read and the value associated with the key being the system property above is looked for.
+    *     ${java.home}/conf/jaxp.properties is read and the value associated with the key being the system property above is looked for.
     *     If present, the value is processed just like above.
     *   </li>
     *   <li>
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java	Mon Oct 13 14:01:44 2014 +0200
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java	Fri Oct 17 10:42:01 2014 +0100
@@ -176,9 +176,9 @@
 
         String javah = ss.getSystemProperty( "java.home" );
         String configFile = javah + File.separator +
-        "lib" + File.separator + "jaxp.properties";
+        "conf" + File.separator + "jaxp.properties";
 
-        // try to read from $java.home/lib/jaxp.properties
+        // try to read from $java.home/conf/jaxp.properties
         try {
             if(firstTime){
                 synchronized(cacheProps){
@@ -193,7 +193,7 @@
                 }
             }
             final String factoryClassName = cacheProps.getProperty(propertyName);
-            debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
+            debugPrintln("found " + factoryClassName + " in $java.home/conf/jaxp.properties");
 
             if (factoryClassName != null) {
                 xpathFactory = createInstance(factoryClassName, true);