From 7a856abc0a5ad68fab145f622e732c68114d1ab8 Mon Sep 17 00:00:00 2001
From: jfrijters <jfrijters>
Date: Fri, 3 Jul 2009 05:55:58 +0000
Subject: [PATCH] Moved VMSystemProperties from gnu.classpath to java.lang.

---
 classpath/ikvm/runtime/Startup.java                          | 2 +-
 openjdk/allsources.lst                                       | 2 +-
 openjdk/java/lang/LangHelper.java                            | 1 -
 openjdk/java/lang/System.java                                | 2 +-
 .../classpath => openjdk/java/lang}/VMSystemProperties.java  | 5 +++--
 openjdk/response.txt                                         | 1 -
 runtime/common.cs                                            | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)
 rename {classpath/gnu/classpath => openjdk/java/lang}/VMSystemProperties.java (99%)

diff --git a/classpath/ikvm/runtime/Startup.java b/classpath/ikvm/runtime/Startup.java
index 66dce9a7..54c866df 100644
--- a/classpath/ikvm/runtime/Startup.java
+++ b/classpath/ikvm/runtime/Startup.java
@@ -148,7 +148,7 @@ public final class Startup
 
     public static void setProperties(cli.System.Collections.Hashtable props)
     {
-        gnu.classpath.VMSystemProperties.props = props;
+        java.lang.VMSystemProperties.props = props;
     }
 
     public static void enterMainThread()
diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
index ec6fe9ab..f3c8b595 100644
--- a/openjdk/allsources.lst
+++ b/openjdk/allsources.lst
@@ -1,4 +1,3 @@
-../classpath/gnu/classpath/VMSystemProperties.java
 ../classpath/gnu/java/net/protocol/ikvmres/Handler.java
 ../classpath/ikvm/extensions/ExtensionMethods.java
 ../classpath/ikvm/internal/__unspecified.java
@@ -63,6 +62,7 @@ java/lang/Shutdown.java
 java/lang/StringHelper.java
 java/lang/System.java
 java/lang/Thread.java
+java/lang/VMSystemProperties.java
 java/lang/VMThread.java
 java/lang/ref/Reference.java
 java/lang/ref/SoftReference.java
diff --git a/openjdk/java/lang/LangHelper.java b/openjdk/java/lang/LangHelper.java
index 445a9fb5..d61cb4b7 100644
--- a/openjdk/java/lang/LangHelper.java
+++ b/openjdk/java/lang/LangHelper.java
@@ -24,7 +24,6 @@
 
 package java.lang;
 
-import gnu.classpath.VMSystemProperties;
 import ikvm.runtime.AssemblyClassLoader;
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/openjdk/java/lang/System.java b/openjdk/java/lang/System.java
index e7955639..9ca12ca0 100644
--- a/openjdk/java/lang/System.java
+++ b/openjdk/java/lang/System.java
@@ -69,7 +69,7 @@ final class Props
         String vfsroot = getVirtualFileSystemRoot();
         props.put("java.home", vfsroot.substring(0, vfsroot.length() - 1));
         props.put("sun.boot.library.path", vfsroot + "bin");
-        gnu.classpath.VMSystemProperties.initOpenJDK(props);
+        VMSystemProperties.initOpenJDK(props);
     }
     
     private static native String getVirtualFileSystemRoot();
diff --git a/classpath/gnu/classpath/VMSystemProperties.java b/openjdk/java/lang/VMSystemProperties.java
similarity index 99%
rename from classpath/gnu/classpath/VMSystemProperties.java
rename to openjdk/java/lang/VMSystemProperties.java
index e428a071..58ecf055 100644
--- a/classpath/gnu/classpath/VMSystemProperties.java
+++ b/openjdk/java/lang/VMSystemProperties.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2004-2008 Jeroen Frijters
+  Copyright (C) 2004-2009 Jeroen Frijters
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -21,8 +21,9 @@
   jeroen@frijters.net
   
 */
-package gnu.classpath;
+package java.lang;
 
+import gnu.classpath.Configuration;
 import java.util.Properties;
 
 @ikvm.lang.Internal
diff --git a/openjdk/response.txt b/openjdk/response.txt
index 3c887a95..4c8e3a3b 100644
--- a/openjdk/response.txt
+++ b/openjdk/response.txt
@@ -26,7 +26,6 @@ assembly.class
     sun/net/www/protocol/jar/*.class
     sun/nio/ch/*.class
     sun/reflect/*.class
-    ../classpath/gnu/classpath/*.class
     ../classpath/gnu/java/net/protocol/ikvmres/*.class
     ../classpath/ikvm/extensions/*.class
     ../classpath/ikvm/internal/*.class
diff --git a/runtime/common.cs b/runtime/common.cs
index acdf0b61..a7cc3a79 100644
--- a/runtime/common.cs
+++ b/runtime/common.cs
@@ -98,7 +98,7 @@ namespace IKVM.NativeCode.gnu.java.net.protocol.ikvmres
 	}
 }
 
-namespace IKVM.NativeCode.gnu.classpath
+namespace IKVM.NativeCode.java.lang
 {
 	static class VMSystemProperties
 	{