2004-12-06 Jeroen Frijters <jeroen@frijters.net>

        * gnu/classpath/SystemProperties.java: New file.
        * vm/reference/gnu/classpath/VMSystemProperties.java: New file.
        * gnu/java/io/EncodingManager.java,
        gnu/java/net/protocol/file/Connection.java,
        java/io/File.java,
        java/lang/Throwable.java,
        java/security/Security.java,
        java/security/cert/X509CRLSelector.java,
        java/security/cert/X509CertSelector.java,
        java/util/Locale.java,
        vm/reference/java/lang/VMClassLoader.java:
        Modified to use SystemProperties.
        * java/lang/Class.java: Modified to use SecurityManager.current.
        * java/lang/ClassLoader.java
        (StaticData.systemClassLoader): New field.
        (StaticData.static): New static initializer to install default
        security manager.
        (ClassLoader()): Modified to use StaticData.systemClassLoader.
        ClassLoader(ClassLoader)): Modified to use SecurityManager.current.
        (findSystemClass): Modified to use StaticData.systemClassLoader.
        (getParent): Modified to use SecurityManager.current.
        (getSystemResource,getSystemResources): Modified to use
        StaticData.systemClassLoader.
        (getSystemClassLoader): Modified to use SecurityManager.current and
        StaticData.systemClassLoader.
        (getExtClassLoaderUrls,getSystemClassLoaderUrls): Modified to use
        SystemProperties.
        (defaultGetSystemClassLoader): Modified to use SecurityManager.current
        and SystemProperties.
        (getSystemProperty): Removed.
        * java/lang/Runtime.java
        (securityManager): Removed.
        (defaultProperties): Removed.
        (static): Removed.
        (Runtime): Modified to use SystemProperties.
        (exit,removeShutdownHook,halt,runFinalizersOnExit,exec,load,loadLib):
        Modified to use SecurityManager.current.
        (loadLibrary): Modified to use SecurityManager.current and changed
        call to System.mapLibraryName to VMRuntime.mapLibraryName.
        * java/lang/SecurityManager.java
        (current): New field.
        * java/lang/System.java
        (systemClassLoader): Removed.
        (properties): Removed.
        (in,out,err): Initialize in-line.
        (static): Removed.
        (initLoadLibrary): Removed.
        (initProperties): Removed.
        (initSystemClassLoader): Removed.
        (initSecurityManager): Removed.
        (setIn,setOut,setErr,setSecurityManager,getSecurityManager,getenv):
        Modified to use SecurityManager.current.
        (getProperties,setProperties,getProperty(String),
        getProperty(String,String),setProperty): Modified to use
        SecurityManager.current and SystemProperties.
        (mapLibraryName): Modified to call VMRuntime.mapLibraryName.
        * java/lang/Thread.java: Modified to use SecurityManager.current.
        * java/lang/ThreadGroup.java: Modified to use SecurityManager.current.
        * native/jni/java-lang/java_lang_VMSystem.c
        (Java_java_lang_VMSystem_isWordsBigEndian): Removed.
        * vm/reference/java/lang/VMRuntime.java
        (nativeGetLibname): Removed (renamed to mapLibraryName).
        (mapLibraryName): New method.
        (insertSystemProperties): Removed.
        * vm/reference/java/lang/VMSystem.java
        (isWordsBigEndian): Removed.

4 files changed, 97 insertions, 57 deletions

diff --git a/vm/reference/gnu/classpath/VMSystemProperties.java b/vm/reference/gnu/classpath/VMSystemProperties.java
new file mode 100644
index 000000000..2f9e36f22
--- /dev/null
+++ b/vm/reference/gnu/classpath/VMSystemProperties.java
@@ -0,0 +1,93 @@
+/* VMSystemProperties.java -- Allow the VM to set System properties.
+   Copyright (C) 2004 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.classpath;
+
+class VMSystemProperties
+{
+    /**
+     * Get the system properties. This is done here, instead of in System,
+     * because of the bootstrap sequence. Note that the native code should
+     * not try to use the Java I/O classes yet, as they rely on the properties
+     * already existing. The only safe method to use to insert these default
+     * system properties is {@link Properties#setProperty(String, String)}.
+     *
+     * <p>These properties MUST include:
+     * <dl>
+     * <dt>java.version         <dd>Java version number
+     * <dt>java.vendor          <dd>Java vendor specific string
+     * <dt>java.vendor.url      <dd>Java vendor URL
+     * <dt>java.home            <dd>Java installation directory
+     * <dt>java.vm.specification.version <dd>VM Spec version
+     * <dt>java.vm.specification.vendor  <dd>VM Spec vendor
+     * <dt>java.vm.specification.name    <dd>VM Spec name
+     * <dt>java.vm.version      <dd>VM implementation version
+     * <dt>java.vm.vendor       <dd>VM implementation vendor
+     * <dt>java.vm.name         <dd>VM implementation name
+     * <dt>java.specification.version    <dd>Java Runtime Environment version
+     * <dt>java.specification.vendor     <dd>Java Runtime Environment vendor
+     * <dt>java.specification.name       <dd>Java Runtime Environment name
+     * <dt>java.class.version   <dd>Java class version number
+     * <dt>java.class.path      <dd>Java classpath
+     * <dt>java.library.path    <dd>Path for finding Java libraries
+     * <dt>java.io.tmpdir       <dd>Default temp file path
+     * <dt>java.compiler        <dd>Name of JIT to use
+     * <dt>java.ext.dirs        <dd>Java extension path
+     * <dt>os.name              <dd>Operating System Name
+     * <dt>os.arch              <dd>Operating System Architecture
+     * <dt>os.version           <dd>Operating System Version
+     * <dt>file.separator       <dd>File separator ("/" on Unix)
+     * <dt>path.separator       <dd>Path separator (":" on Unix)
+     * <dt>line.separator       <dd>Line separator ("\n" on Unix)
+     * <dt>user.name            <dd>User account name
+     * <dt>user.home            <dd>User home directory
+     * <dt>user.dir             <dd>User's current working directory
+     * <dt>gnu.cpu.endian       <dd>"big" or "little"
+     * </dl>
+     *
+     * @param p the Properties object to insert the system properties into
+     */
+    static native void preInit(Properties properties);
+
+    /**
+     * Here you get a chance to overwrite some of the properties set by
+     * the common SystemProperties code. For example, it might be
+     * a good idea to process the properties specified on the command
+     * line here.
+     */
+    static native void postInit(Properties properties);
+}
diff --git a/vm/reference/java/lang/VMClassLoader.java b/vm/reference/java/lang/VMClassLoader.java
index 4d3a08596..fd9a73576 100644
--- a/vm/reference/java/lang/VMClassLoader.java
+++ b/vm/reference/java/lang/VMClassLoader.java
@@ -51,6 +51,7 @@ import java.util.Vector;
 import java.lang.reflect.Constructor;
 import gnu.java.lang.SystemClassLoader;
 
+import gnu.classpath.SystemProperties;
 import gnu.java.util.EmptyEnumeration;
 
 /**
@@ -161,7 +162,7 @@ final class VMClassLoader
   static Enumeration getResources(String name)
   {
     StringTokenizer st = new StringTokenizer(
-      ClassLoader.getSystemProperty("java.boot.class.path", "."),
+      SystemProperties.getProperty("java.boot.class.path", "."),
       File.pathSeparator);
     Vector v = new Vector();
     while (st.hasMoreTokens())
diff --git a/vm/reference/java/lang/VMRuntime.java b/vm/reference/java/lang/VMRuntime.java
index 4891200de..84406be4b 100644
--- a/vm/reference/java/lang/VMRuntime.java
+++ b/vm/reference/java/lang/VMRuntime.java
@@ -156,15 +156,12 @@ final class VMRuntime
     static native int nativeLoad(String filename);
 
     /**
-     * Map a system-independent "short name" to the full file name, and append
-     * it to the path.
-     * XXX This method is being replaced by System.mapLibraryName.
+     * Map a system-independent "short name" to the full file name.
      *
-     * @param pathname the path
      * @param libname the short version of the library name
      * @return the full filename
      */
-    static native String nativeGetLibname(String pathname, String libname);
+    static native String mapLibraryName(String libname);
 
     /**
      * Execute a process. The command line has already been tokenized, and
@@ -183,48 +180,4 @@ final class VMRuntime
 	throws IOException {
       return VMProcess.exec(cmd, env, dir);
     }
-
-    /**
-     * Get the system properties. This is done here, instead of in System,
-     * because of the bootstrap sequence. Note that the native code should
-     * not try to use the Java I/O classes yet, as they rely on the properties
-     * already existing. The only safe method to use to insert these default
-     * system properties is {@link Properties#setProperty(String, String)}.
-     *
-     * <p>These properties MUST include:
-     * <dl>
-     * <dt>java.version         <dd>Java version number
-     * <dt>java.vendor          <dd>Java vendor specific string
-     * <dt>java.vendor.url      <dd>Java vendor URL
-     * <dt>java.home            <dd>Java installation directory
-     * <dt>java.vm.specification.version <dd>VM Spec version
-     * <dt>java.vm.specification.vendor  <dd>VM Spec vendor
-     * <dt>java.vm.specification.name    <dd>VM Spec name
-     * <dt>java.vm.version      <dd>VM implementation version
-     * <dt>java.vm.vendor       <dd>VM implementation vendor
-     * <dt>java.vm.name         <dd>VM implementation name
-     * <dt>java.specification.version    <dd>Java Runtime Environment version
-     * <dt>java.specification.vendor     <dd>Java Runtime Environment vendor
-     * <dt>java.specification.name       <dd>Java Runtime Environment name
-     * <dt>java.class.version   <dd>Java class version number
-     * <dt>java.class.path      <dd>Java classpath
-     * <dt>java.library.path    <dd>Path for finding Java libraries
-     * <dt>java.io.tmpdir       <dd>Default temp file path
-     * <dt>java.compiler        <dd>Name of JIT to use
-     * <dt>java.ext.dirs        <dd>Java extension path
-     * <dt>os.name              <dd>Operating System Name
-     * <dt>os.arch              <dd>Operating System Architecture
-     * <dt>os.version           <dd>Operating System Version
-     * <dt>file.separator       <dd>File separator ("/" on Unix)
-     * <dt>file.encoding        <dd>Standard encoding for text (Default 8859_1)
-     * <dt>path.separator       <dd>Path separator (":" on Unix)
-     * <dt>line.separator       <dd>Line separator ("\n" on Unix)
-     * <dt>user.name            <dd>User account name
-     * <dt>user.home            <dd>User home directory
-     * <dt>user.dir             <dd>User's current working directory
-     * </dl>
-     *
-     * @param p the Properties object to insert the system properties into
-     */
-    static native void insertSystemProperties(Properties p);
 } // class VMRuntime
diff --git a/vm/reference/java/lang/VMSystem.java b/vm/reference/java/lang/VMSystem.java
index 28e4d4ea5..51d6c370d 100644
--- a/vm/reference/java/lang/VMSystem.java
+++ b/vm/reference/java/lang/VMSystem.java
@@ -88,13 +88,6 @@ final class VMSystem
   static native int identityHashCode(Object o);
 
   /**
-   * Detect big-endian systems.
-   *
-   * @return true if the system is big-endian.
-   */
-  static native boolean isWordsBigEndian();
-
-  /**
    * Convert a library name to its platform-specific variant.
    *
    * @param libname the library name, as used in <code>loadLibrary</code>