From 31d9700c9bc4a8698d3522a86295bbf9221a4490 Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Mon, 25 May 2009 21:36:29 -0600
Subject: [PATCH] move SystemClassLoader and Runtime.dumpHeap to avian package

---
 classpath/{java/lang => avian}/SystemClassLoader.java | 2 +-
 classpath/java/lang/Runtime.java                      | 2 --
 src/builtin.cpp                                       | 8 ++++----
 src/types.def                                         | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename classpath/{java/lang => avian}/SystemClassLoader.java (97%)

diff --git a/classpath/java/lang/SystemClassLoader.java b/classpath/avian/SystemClassLoader.java
similarity index 97%
rename from classpath/java/lang/SystemClassLoader.java
rename to classpath/avian/SystemClassLoader.java
index 723651ca10..e85d240a85 100644
--- a/classpath/java/lang/SystemClassLoader.java
+++ b/classpath/avian/SystemClassLoader.java
@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-package java.lang;
+package avian;
 
 import java.net.URL;
 import java.net.MalformedURLException;
diff --git a/classpath/java/lang/Runtime.java b/classpath/java/lang/Runtime.java
index 63a029301a..51f15006c7 100644
--- a/classpath/java/lang/Runtime.java
+++ b/classpath/java/lang/Runtime.java
@@ -75,8 +75,6 @@ public class Runtime {
 
   public native long totalMemory();
 
-  public static native void dumpHeap(String outputFile);
-
   private static class MyProcess extends Process {
     private long pid;
     private final int in;
diff --git a/src/builtin.cpp b/src/builtin.cpp
index f9bf0a8dd1..25a428b0a4 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -167,7 +167,7 @@ Avian_java_lang_ClassLoader_defineClass
 }
 
 extern "C" JNIEXPORT int64_t JNICALL
-Avian_java_lang_SystemClassLoader_findLoadedClass
+Avian_avian_SystemClassLoader_findLoadedClass
 (Thread* t, object, uintptr_t* arguments)
 {
   object name = reinterpret_cast<object>(arguments[1]);
@@ -176,7 +176,7 @@ Avian_java_lang_SystemClassLoader_findLoadedClass
 }
 
 extern "C" JNIEXPORT int64_t JNICALL
-Avian_java_lang_SystemClassLoader_findClass
+Avian_avian_SystemClassLoader_findClass
 (Thread* t, object, uintptr_t* arguments)
 {
   object name = reinterpret_cast<object>(arguments[1]);
@@ -185,7 +185,7 @@ Avian_java_lang_SystemClassLoader_findClass
 }
 
 extern "C" JNIEXPORT int64_t JNICALL
-Avian_java_lang_SystemClassLoader_resourceExists
+Avian_avian_SystemClassLoader_resourceExists
 (Thread* t, object, uintptr_t* arguments)
 {
   object name = reinterpret_cast<object>(arguments[1]);
@@ -639,7 +639,7 @@ Avian_java_lang_Runtime_gc
 #ifdef AVIAN_HEAPDUMP
 
 extern "C" JNIEXPORT void JNICALL
-Avian_java_lang_Runtime_dumpHeap
+Avian_avian_Machine_dumpHeap
 (Thread* t, object, uintptr_t* arguments)
 {
   object outputFile = reinterpret_cast<object>(*arguments);
diff --git a/src/types.def b/src/types.def
index c3d711c18a..98ad156f23 100644
--- a/src/types.def
+++ b/src/types.def
@@ -8,7 +8,7 @@
 
 (type classLoader java/lang/ClassLoader)
 
-(type systemClassLoader java/lang/SystemClassLoader)
+(type systemClassLoader avian/SystemClassLoader)
 
 (type accessibleObject java/lang/reflect/AccessibleObject)