svn commit: r670295 - in /xml/commons/trunk/java/external/src/org/xml/sax/helpers: NewInstance.java ParserFactory.java SecuritySupport.java SecuritySupport12.java XMLReaderFactory.java

[mr...@apache.org]

Author: mrglavas
Date: Sat Jun 21 18:46:43 2008
New Revision: 670295

URL: http://svn.apache.org/viewvc?rev=670295&view=rev
Log:
Rename: SecuritySupport12 -> SecuritySupport.

Added:
    xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport.java
      - copied, changed from r670294, xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport12.java
Removed:
    xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport12.java
Modified:
    xml/commons/trunk/java/external/src/org/xml/sax/helpers/NewInstance.java
    xml/commons/trunk/java/external/src/org/xml/sax/helpers/ParserFactory.java
    xml/commons/trunk/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java

Modified: xml/commons/trunk/java/external/src/org/xml/sax/helpers/NewInstance.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/org/xml/sax/helpers/NewInstance.java?rev=670295&r1=670294&r2=670295&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/org/xml/sax/helpers/NewInstance.java (original)
+++ xml/commons/trunk/java/external/src/org/xml/sax/helpers/NewInstance.java Sat Jun 21 18:46:43 2008
@@ -92,7 +92,7 @@
     {
         // Figure out which ClassLoader to use for loading the provider
         // class.  If there is a Context ClassLoader then use it.
-        ClassLoader cl = SecuritySupport12.getContextClassLoader();
+        ClassLoader cl = SecuritySupport.getContextClassLoader();
         if (cl == null) {
             // Assert: we are on JDK 1.1 or we have no Context ClassLoader
             // so use the current ClassLoader

Modified: xml/commons/trunk/java/external/src/org/xml/sax/helpers/ParserFactory.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/org/xml/sax/helpers/ParserFactory.java?rev=670295&r1=670294&r2=670295&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/org/xml/sax/helpers/ParserFactory.java (original)
+++ xml/commons/trunk/java/external/src/org/xml/sax/helpers/ParserFactory.java Sat Jun 21 18:46:43 2008
@@ -78,7 +78,7 @@
     NullPointerException,
     ClassCastException
     {
-        String className = SecuritySupport12.getSystemProperty("org.xml.sax.parser");
+        String className = SecuritySupport.getSystemProperty("org.xml.sax.parser");
         if (className == null) {
             throw new NullPointerException("No value for sax.parser property");
         } else {

Copied: xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport.java (from r670294, xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport12.java)
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport.java?p2=xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport.java&p1=xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport12.java&r1=670294&r2=670295&rev=670295&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport12.java (original)
+++ xml/commons/trunk/java/external/src/org/xml/sax/helpers/SecuritySupport.java Sat Jun 21 18:46:43 2008
@@ -33,9 +33,9 @@
  *
  * Security related methods that only work on J2SE 1.2 and newer.
  */
-final class SecuritySupport12 {
+final class SecuritySupport {
     
-    private SecuritySupport12() {}
+    private SecuritySupport() {}
 
     static ClassLoader getContextClassLoader() {
 	return (ClassLoader)

Modified: xml/commons/trunk/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java?rev=670295&r1=670294&r2=670295&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java (original)
+++ xml/commons/trunk/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java Sat Jun 21 18:46:43 2008
@@ -114,7 +114,7 @@
         ClassLoader	loader = NewInstance.getClassLoader ();
         
         // 1. try the JVM-instance-wide system property
-        try { className = SecuritySupport12.getSystemProperty (property); }
+        try { className = SecuritySupport.getSystemProperty (property); }
         catch (Exception e) { /* normally fails for applets */ }
         
         // 2. if that fails, try META-INF/services/
@@ -125,20 +125,20 @@
             className = null;
             
             // First try the Context ClassLoader
-            ClassLoader cl = SecuritySupport12.getContextClassLoader();
+            ClassLoader cl = SecuritySupport.getContextClassLoader();
             if (cl != null) {
-                is = SecuritySupport12.getResourceAsStream(cl, service);
+                is = SecuritySupport.getResourceAsStream(cl, service);
                 
                 // If no provider found then try the current ClassLoader
                 if (is == null) {
                     cl = XMLReaderFactory.class.getClassLoader();
-                    is = SecuritySupport12.getResourceAsStream(cl, service);
+                    is = SecuritySupport.getResourceAsStream(cl, service);
                 }
             } else {
                 // No Context ClassLoader or JDK 1.1 so try the current
                 // ClassLoader
                 cl = XMLReaderFactory.class.getClassLoader();
-                is = SecuritySupport12.getResourceAsStream(cl, service);
+                is = SecuritySupport.getResourceAsStream(cl, service);
             }
             
             if (is != null) {