From e45016df54ba886cf792f5c37ddc1eeae688927d Mon Sep 17 00:00:00 2001
From: jfrijters <jfrijters>
Date: Fri, 3 Jul 2009 06:09:49 +0000
Subject: [PATCH] Moved gnu.classpath.Configuration to
 java.lang.PropertyConstants.

---
 openjdk/allsources.lst                             |  2 +-
 .../lang/PropertyConstants.java.in}                | 14 +++++---------
 openjdk/java/lang/VMSystemProperties.java          |  5 ++---
 openjdk/openjdk.build                              |  2 +-
 openjdk/response.txt                               |  1 -
 5 files changed, 9 insertions(+), 15 deletions(-)
 rename openjdk/{Configuration.java.in => java/lang/PropertyConstants.java.in} (71%)

diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
index f3c8b595..ae6e8261 100644
--- a/openjdk/allsources.lst
+++ b/openjdk/allsources.lst
@@ -31,7 +31,6 @@
 ../classpath/java/util/concurrent/atomic/AtomicReferenceArray.java
 ../classpath/sun/misc/Ref.java
 AssemblyInfo.java
-Configuration.java
 ConnectorBootstrap.java
 com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
 com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -58,6 +57,7 @@ java/lang/Class.java
 java/lang/ClassLoader.java
 java/lang/LangHelper.java
 java/lang/ProcessImpl.java
+java/lang/PropertyConstants.java
 java/lang/Shutdown.java
 java/lang/StringHelper.java
 java/lang/System.java
diff --git a/openjdk/Configuration.java.in b/openjdk/java/lang/PropertyConstants.java.in
similarity index 71%
rename from openjdk/Configuration.java.in
rename to openjdk/java/lang/PropertyConstants.java.in
index fe8b6837..dce0e65b 100644
--- a/openjdk/Configuration.java.in
+++ b/openjdk/java/lang/PropertyConstants.java.in
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007 Jeroen Frijters
+  Copyright (C) 2007, 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,14 +21,10 @@
   jeroen@frijters.net
   
 */
-package gnu.classpath;
+package java.lang;
 
-/*
- * This is a temporary class while we're using the GNU Classpath AWT/Swing implementation.
- */
-public interface Configuration
+interface PropertyConstants
 {
-    String default_awt_peer_toolkit = "ikvm.awt.NetToolkit, @AWTASSEMBLY@";
-    
-    String default_graphics_enviroment = "ikvm.awt.NetGraphicsEnvironment, @AWTASSEMBLY@";
+    String awt_toolkit = "ikvm.awt.NetToolkit, @AWTASSEMBLY@";
+    String java_awt_graphicsenv = "ikvm.awt.NetGraphicsEnvironment, @AWTASSEMBLY@";
 }
diff --git a/openjdk/java/lang/VMSystemProperties.java b/openjdk/java/lang/VMSystemProperties.java
index 58ecf055..ea1e616a 100644
--- a/openjdk/java/lang/VMSystemProperties.java
+++ b/openjdk/java/lang/VMSystemProperties.java
@@ -23,7 +23,6 @@
 */
 package java.lang;
 
-import gnu.classpath.Configuration;
 import java.util.Properties;
 
 @ikvm.lang.Internal
@@ -377,7 +376,7 @@ public class VMSystemProperties
         {
             p.setProperty("user.dir", ".");
         }
-        p.setProperty("awt.toolkit", Configuration.default_awt_peer_toolkit);
+        p.setProperty("awt.toolkit", PropertyConstants.awt_toolkit);
     }
 
     public static void initOpenJDK(Properties p)
@@ -393,7 +392,7 @@ public class VMSystemProperties
 	p.setProperty("sun.os.patch.level", "");
 	p.setProperty("java.vm.info", "compiled mode");
 	p.setProperty("sun.nio.MaxDirectMemorySize", "-1");
-	p.setProperty("java.awt.graphicsenv", Configuration.default_graphics_enviroment );
+	p.setProperty("java.awt.graphicsenv", PropertyConstants.java_awt_graphicsenv);
 	// TODO
 	// sun.cpu.isalist:=pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86
 	// sun.desktop:=windows
diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build
index 4fe26550..e14bcacf 100644
--- a/openjdk/openjdk.build
+++ b/openjdk/openjdk.build
@@ -38,7 +38,7 @@
                 </replacetokens>
             </filterchain>
         </copy>
-        <copy file="Configuration.java.in" tofile="Configuration.java" outputencoding="ascii" overwrite="true">
+        <copy file="java/lang/PropertyConstants.java.in" tofile="java/lang/PropertyConstants.java" outputencoding="ascii" overwrite="true">
             <filterchain>
                 <replacetokens>
                     <token key="AWTASSEMBLY" value="${string::replace(assemblyname::get-full-name(assemblyname::get-assembly-name(path::combine(project::get-base-directory(), '../bin/IKVM.Runtime.dll'))), 'IKVM.Runtime', 'IKVM.AWT.WinForms')}" />
diff --git a/openjdk/response.txt b/openjdk/response.txt
index 4c8e3a3b..8b19caab 100644
--- a/openjdk/response.txt
+++ b/openjdk/response.txt
@@ -597,7 +597,6 @@ assembly.class
     -recurse:../../openjdk6-b16/build/linux-amd64/j2re-image/lib/resources.jar/javax/swing/*
     -recurse:resources.zip/com/sun/swing/internal/plaf/*
     -r:System.Drawing
-    Configuration.class
     icedtea/jce/gnu/java/security/action/*.class
     ikvm/awt/*.class
     java/awt/*.class