This commit was manufactured by cvs2svn to create tagclasspath-import-0_18

'classpath-import-0_18'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/tags/classpath-import-0_18@104581 138bc75d-0d04-0410-961f-82ee72b054a4

15 files changed, 0 insertions, 1575 deletions

diff --git a/libjava/classpath/gnu/classpath/RawData.java b/libjava/classpath/gnu/classpath/RawData.java
deleted file mode 100644
index 3ce97482c02..00000000000
--- a/libjava/classpath/gnu/classpath/RawData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* RawData.java -- Pointer to VM specific data
-   Copyright (C) 1999, 2000, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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. */
-
-/* This file is originally part of libgcj. */
-
-package gnu.classpath;
-
-/** A type used to indicate special data used by native code that should not 
-    be marked by the garbage collector. */
-
-public abstract class RawData
-{
-}
diff --git a/libjava/classpath/gnu/classpath/RawData32.java b/libjava/classpath/gnu/classpath/RawData32.java
deleted file mode 100644
index c77163152f2..00000000000
--- a/libjava/classpath/gnu/classpath/RawData32.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* RawData32.java -- 32 bit Pointer
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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;
-
-/**
- * A type used to indicate special data used by native code that should not 
- * be marked by the garbage collector.
- */
-public final class RawData32 extends RawData
-{
-   final int data;
-   
-   public RawData32(int data)
-   {
-     this.data = data;
-   }
-}
diff --git a/libjava/classpath/gnu/classpath/RawData64.java b/libjava/classpath/gnu/classpath/RawData64.java
deleted file mode 100644
index e3b6a93e28e..00000000000
--- a/libjava/classpath/gnu/classpath/RawData64.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* RawData64.java -- 64 bit Pointer
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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;
-
-/**
- * A type used to indicate special data used by native code that should not 
- * be marked by the garbage collector.
- */
-public final class RawData64 extends RawData
-{
-   final long data;
-   
-   public RawData64(long data)
-   {
-     this.data = data;
-   }
-}
diff --git a/libjava/classpath/gnu/classpath/jdwp/id/JdwpIdFactory.java b/libjava/classpath/gnu/classpath/jdwp/id/JdwpIdFactory.java
deleted file mode 100644
index 06ec3c7681f..00000000000
--- a/libjava/classpath/gnu/classpath/jdwp/id/JdwpIdFactory.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* JdwpIdFactory.java -- factory for generating type and object IDs
-   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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
-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.jdwp.id;
-
-import java.util.HashMap;
-
-/**
- * This factory generates ids for objects and types that may
- * be sent to a debugger.
- *
- * @author Keith Seitz  (keiths@redhat.com)
- */
-public class JdwpIdFactory
-{
-  // ID of last object / referencetype
-  private static Object _idLock = new Object ();
-  private static Object _ridLock = new Object ();
-  private static long _lastId = 0;
-  private static long _lastRid = 0;
-
-  // A list of all ID types
-  private static HashMap _idList = new HashMap ();
-
-  // Initialize the id list with known types
-  static
-  {
-    // ObjectId and ArrayId are special cases. See newId.
-    _idList.put (ClassLoaderId.typeClass, ClassLoaderId.class);
-    _idList.put (ClassObjectId.typeClass, ClassObjectId.class);
-    //_idList.put (FieldId.typeClass, FieldId.class);
-    //_idList.put (FrameId.typeClass, FrameId.class);
-    //_idList.put (MethodId.typeClass, MethodId.class);
-    _idList.put (StringId.typeClass, StringId.class);
-    _idList.put (ThreadId.typeClass, ThreadId.class);
-    _idList.put (ThreadGroupId.typeClass, ThreadGroupId.class);
-  }
-
-  /**
-   * Returns a new id for the given object
-   *
-   * @param object  the object for which an id is desired
-   * @returns a suitable object id
-   */
-  public static JdwpId newId (Object object)
-  {
-    JdwpId id = null;
-    
-    // Special case: arrays
-    if (object.getClass ().isArray ())
-	id = new ArrayId ();
-    else
-      {
-	// Loop through all classes until we hit baseclass
-	Class myClass;
-	for (myClass = object.getClass (); myClass != null;
-	     myClass = myClass.getSuperclass ())
-	  {
-	    Class clz = (Class) _idList.get (myClass);
-	    if (clz != null)
-	      {
-		try
-		  {
-		    id = (JdwpId) clz.newInstance ();
-		    synchronized (_idLock)
-		      {
-			id.setId (++_lastId);
-		      }
-		    return id;
-		  }
-		catch (InstantiationException ie)
-		  {
-		    // This really should not happen
-		    throw new RuntimeException ("cannot create new ID", ie);
-		  }
-		catch (IllegalAccessException iae)
-		  {
-		    // This really should not happen
-		    throw new RuntimeException ("illegal access of ID", iae);
-		  }
-	      }
-	  }
-
-	/* getSuperclass returned null and no matching ID type found.
-	   So it must derive from Object. */
-	id = new ObjectId ();
-      }
-
-    synchronized (_idLock)
-      {
-	id.setId (++_lastId);
-      }
-
-    return id;
-  }
-
-  /**
-   * Returns a new reference type id for the given class
-   *
-   * @param clazz  the <code>Class</code> for which an id is desired
-   * @returns a suitable reference type id or <code>null</code>
-   */
-  public static ReferenceTypeId newReferenceTypeId (Class clazz)
-  {
-    ReferenceTypeId id = null;
-    try
-      {
-	if (clazz.isArray ())
-	  id = new ArrayReferenceTypeId ();
-	else if (clazz.isInterface ())
-	  id = new InterfaceReferenceTypeId ();
-	else
-	  id = new ClassReferenceTypeId ();
-	synchronized (_ridLock)
-	  {
-	    id.setId (++_lastRid);
-	  }
-	return id;
-      }
-    catch (InstantiationException ie)
-      {
-	return null;
-      }
-    catch (IllegalAccessException iae)
-      {
-	return null;
-      }
-  }
-}
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkBorders.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkBorders.java
deleted file mode 100644
index ebba6a49b2a..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkBorders.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GtkBorders.java
-   Copyright (c) 1999 by Free Software Foundation, Inc.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.javax.swing.plaf.gtk;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-
-/**
- * Optional class, can be used to define nifty borders.
- * 
- * @author Brian Jones
- * @see javax.swing.LookAndFeel
- */
-public class GtkBorders
-{
-    public static class ButtonBorder extends AbstractBorder 
-	implements UIResource
-    {
-	private Border raised;  // use by default
-	private Border lowered;  // use this one when pressed
-
-	// creat the border
-        public ButtonBorder() 
-	{
-	    raised = BorderFactory.createRaisedBevelBorder();
-	    lowered = BorderFactory.createLoweredBevelBorder();
-	}
-
-	// define the insets (in terms of one of the others)
-	public Insets getBorderInsets(Component c)
-	{
-	    return raised.getBorderInsets(c);
-	}
-	
-	public void paintBorder(Component c, Graphics g, int x, int y, 
-				int width, int height)
-	{
-	    AbstractButton b = (AbstractButton)c;
-	    ButtonModel model = b.getModel();
-	    
-	    if (model.isPressed() && model.isArmed()) 
-		lowered.paintBorder(c, g, x, y, width, height);
-	    else
-		raised.paintBorder(c, g, x, y, width, height);
-	}
-    }
-}
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkCheckBoxUI.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkCheckBoxUI.java
deleted file mode 100644
index 0395af61bfb..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkCheckBoxUI.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* GtkCheckBoxUI.java
-   Copyright (c) 1999 by Free Software Foundation, Inc.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.javax.swing.plaf.gtk;
-
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-
-/**
- *
- * @author Brian Jones
- * @see javax.swing.LookAndFeel
- */
-public class GtkCheckBoxUI extends GtkRadioButtonUI
-{
-    public GtkCheckBoxUI() 
-    {
-	super();
-    }
-
-    public static ComponentUI createUI(JComponent c)
-    {
-	return new GtkCheckBoxUI();
-    }
-
-    public String getPropertyPrefix()
-    {
-	// FIXME
-	System.err.println(super.getPropertyPrefix());
-	return super.getPropertyPrefix();
-    }
-}
-
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkIconFactory.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkIconFactory.java
deleted file mode 100644
index 28fd36e897c..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkIconFactory.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GtkIconFactory.java
-   Copyright (c) 1999 by Free Software Foundation, Inc.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.javax.swing.plaf.gtk;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.io.Serializable;
-
-/**
- *
- * @author Brian Jones
- * @see javax.swing.LookAndFeel
- */
-public class GtkIconFactory implements Serializable
-{
-    private static Icon radioButtonIcon;
-    private static Icon checkBoxIcon;
-
-    public static Icon getRadioButtonIcon() 
-    {
-	if (radioButtonIcon == null)
-	    radioButtonIcon = new RadioButtonIcon();
-	return radioButtonIcon;
-    }
-    
-    private static class RadioButtonIcon 
-	implements Icon, UIResource, Serializable
-    {
-	private static final int size = 15;
-	
-	public int getIconWidth() { return size; }
-	public int getIconHeight() { return size; }
-
-	public void paintIcon(Component c, Graphics g, int x, int y) 
-	{
-	    System.out.println("radiobuttonicon: paintIcon()");
-	    // get the button and model containing the state we are 
-	    // supposed to show
-	    AbstractButton b = (AbstractButton)c;
-	    ButtonModel model = b.getModel();
-
-	    // If the button is being pressed (& armed), change the 
-	    // background color 
-	    // Note: could also do something different if the button is 
-	    // disabled
-	    
-	    if (model.isPressed() && model.isArmed())
-		{
-		    System.out.println("radiobuttonicon: pressed & armed");
-		    g.setColor(UIManager.getColor("RadioButton.pressed"));
-		    g.fillOval(x,y,size-1, size-1);
-		}
-	    // draw an outer circle
-	    g.setColor(UIManager.getColor("RadioButton.foreground"));
-	    g.drawOval(x,y,size-1, size-1);
-	    
-	    // fill a small circle inside if the button is selected
-	    if (model.isSelected()) {
-		g.fillOval(x+4, y+4, size-8, size-8);
-		System.out.println("radiobuttonicon: is selected");
-	    }
-	}
-    }
-}
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkLookAndFeel.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkLookAndFeel.java
deleted file mode 100644
index ed99e6d216b..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkLookAndFeel.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* GtkLookAndFeel.java
-   Copyright (c) 1999 by Free Software Foundation, Inc.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.javax.swing.plaf.gtk;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-
-/**
- *
- * @author Brian Jones
- * @see javax.swing.LookAndFeel
- */
-public class GtkLookAndFeel extends BasicLookAndFeel
-{
-    private UIDefaults uiDefaults;
-
-    /**
-     */
-    public GtkLookAndFeel()
-    {
-	super();
-    }
-
-    /**
-     * A short string to identify this look and feel, for example in a 
-     * drop down list to choose between several look and feels.
-     */
-    public String getName() { return "GIMP Toolkit"; }
-
-    /**
-     * A much longer description of the look and feel.
-     */
-    public String getDescription() 
-    { 
-	return new String("The GIMP Toolkit Look and Feel for Java, " + 
-			  "written by Brian Jones (cbj@gnu.org), " + 
-			  "(c) 1999 by Free Software Foundation, Inc.  " +
-			  "http://www.classpath.org");
-    }
-
-    /**
-     * Return a unique string identifying this look and feel as different
-     * from and not a subclass of any other look and feel.  Usually, a 
-     * subclass will return the same <code>String</code> here as the
-     * original look and feel if only a few changes are being made rather 
-     * than something completely new and different.
-     */
-    public String getID()
-    {
-	return "Gtk";
-    }
-
-    public boolean isNativeLookAndFeel()
-    {
-	return false;
-    }
-
-    public boolean isSupportedLookAndFeel()
-    {
-	return true;
-    }
-
-    protected void initClassDefaults(UIDefaults table)
-    {
-	super.initClassDefaults(table);
-
-	String gtkPkgName = "gnu.javax.swing.plaf.gtk.";
-
-	
-	Object[] defaults = { 
-	    "SliderUI", gtkPkgName + "GtkSliderUI"
-	};
-	/*
-	    "CheckBoxUI", gtkPkgName + "GtkCheckBoxUI",
-	    "ButtonUI", gtkPkgName + "GtkButtonUI"
-		"ColorChooserUI", "MetalColorChooserUI",
-		"MenuBarUI", "MetalMenuBarUI",
-		"MenuUI", "MetalMenuUI", 
-		"MenuItemUI", "MetalMenuItemUI", 
-		"CheckBoxMenuItemUI", "MetalCheckBoxMenuItemUI", 
-		"RadioButtonMenuItemUI", "MetalRadioButtonMenuItemUI", 
-		"RadioButtonUI", "MetalRadioButtonUI", 
-		"ToggleButtonUI", "MetalToggleButtonUI",
-		"PopupMenuUI", "MetalPopupMenuUI",
-		"ProgressBarUI", "MetalProgressBarUI",
-		"ScrollBarUI", "MetalScrollBarUI",
-		"ScrollPaneUI", "MetalScrollPaneUI",
-		"SplitPaneUI", "MetalSplitPaneUI",
-		"SeparatorUI", "MetalSeparatorUI",
-		"ToolBarSeparatorUI", "MetalToolBarSeparatorUI",
-		"PopupMenuSeparatorUI", "MetalPopupMenuSeparatorUI", 
-		"TabbedPaneUI", "MetalTabbedPaneUI",
-		"TextAreaUI", "MetalTextAreaUI",
-		"TextFieldUI", "MetalTextFieldUI",
-		"PasswordFieldUI", "MetalPasswordFieldUI",
-		"TextPaneUI", "MetalTextPaneUI",
-		"EditorPaneUI", "MetalEditorPaneUI",
-		"TreeUI", "MetalTreeUI",
-		"LabelUI", "MetalLabelUI",
-		"ListUI", "MetalListUI",
-		"ToolBarUI", "MetalToolBarUI",
-		"ToolTipUI", "MetalToolTipUI",
-		"ComboBoxUI", "MetalComboBoxUI",
-		"TableUI", "MetalTableUI",
-		"TableHeaderUI", "MetalTableHeaderUI",
-		"InternalFrameUI", "GtkInternalFrameUI",
-		"StandardDialogUI", "GtkStandardDialogUI",
-		"DesktopPaneUI", "GtkDesktopPaneUI",
-		"DesktopIconUI", "GtkDesktopIconUI",
-		"DirectoryPaneUI", "GtkDirectoryPaneUI",
-		"FileChooserUI", "GtkFileChooserUI",
-		"OptionPaneUI", "GtkOptionPaneUI" }
-	*/
-	table.putDefaults(defaults);
-
-    }
-
-    protected void initSystemColorDefaults(UIDefaults table)
-    {
-	String[] colors = {
-	    "desktop", "#000000",
-	    "activeCaption", "#163555",
-	    "activeCaptionText", "#FFFFFF",
-	    "activeCaptionBorder", "#000000",
-	    "inactiveCaption", "#375676",
-	    "inactiveCaptionText", "#999999",
-	    "inactiveCaptionBorder", "#000000",
-	    "window", "#FFFFFF",
-	    "windowBorder", "#969696",
-	    "windowText", "#000000",
-	    "menu", "#d6d6d6",
-	    "menuText", "#000000",
-	    "text", "#FFFFFF",
-	    "textText", "#000000",
-	    "textHighlight", "#00009c",
-	    "textHighlightText", "#FFFFFF",
-	    "textInactiveText", "#999999",
-	    "control", "#d6d6d6",
-	    "controlText", "#000000",
-	    "controlHighlight", "#eaeaea",
-	    "controlLtHighlight", "#eaeaea",
-	    "controlShadow", "#c3c3c3",
-	    "controlDkShadow", "#888888",
-	    "scrollbar", "#c3c3c3",
-	    "info", "#d6d6d6",
-	    "infoText", "#000000"
-	};
-
-	loadSystemColors(table, colors, false);
-    }
-
-    protected void initComponentDefaults(UIDefaults table)
-    {
-	super.initComponentDefaults(table);
-
-	// define common resources
-	// fonts
-	FontUIResource sansSerifPlain10 = 
-	    new FontUIResource("SansSerif", Font.PLAIN, 10);
-	FontUIResource serifPlain10 = 
-	    new FontUIResource("Serif", Font.PLAIN, 10);
-	// insets
-	// borders
-	// colors
-	ColorUIResource controlDkShadow = new ColorUIResource(table.getColor("controlDkShadow"));
-	ColorUIResource controlShadow = new ColorUIResource(table.getColor("controlShadow"));
-	ColorUIResource control = new ColorUIResource(table.getColor("control"));
-	ColorUIResource scrollbar = new ColorUIResource(table.getColor("scrollbar"));
-	ColorUIResource controlHighlight = new ColorUIResource(table.getColor("controlHighlight"));
-	if (scrollbar == null)
-	    System.out.println("scrollbar is null");
-
-  	ColorUIResource white = new ColorUIResource(Color.white);
-  	ColorUIResource black = new ColorUIResource(Color.black);
-	ColorUIResource blue = new ColorUIResource(Color.blue);
-
-	// icons
-	Object errorIcon = LookAndFeel.makeIcon(getClass(), "icons/error.gif");
-	// any other resources like dimensions and integer values
-
-	// define defaults
-	Object[] defaults = 
-	{ 
-	    "Button.font", sansSerifPlain10,
-	    "CheckBox.font", sansSerifPlain10,
-  	    "RadioButton.pressed", black,
-	    "Slider.focus", blue,
-  	    "Slider.foreground", control,
-  	    "Slider.highlight", controlHighlight,
-  	    "Slider.shadow", controlShadow,
-	    "Slider.background", controlDkShadow
-	   
-//  	    "Slider.background", "#888888",
-//  	    "Slider.focus", "#c3c3c3",
-//  	    "Slider.foreground", "#d6d6d6",
-//  	    "Slider.highlight", "#ffffff",
-//  	    "Slider.shadow", "#000000"
-
-
-	};
-
-	table.putDefaults(defaults);
-    }
-}
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkRadioButtonUI.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkRadioButtonUI.java
deleted file mode 100644
index 19d53387910..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkRadioButtonUI.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* GtkRadioButtonUI.java
-   Copyright (c) 1999 by Free Software Foundation, Inc.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.javax.swing.plaf.gtk;
-
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-
-/**
- *
- * @author Brian Jones
- * @see javax.swing.LookAndFeel
- */
-public class GtkRadioButtonUI extends BasicRadioButtonUI
-{
-    public GtkRadioButtonUI() 
-    {
-	super();
-    }
-
-    public static ComponentUI createUI(JComponent c)
-    {
-	return new GtkRadioButtonUI();
-    }
-
-    public String getPropertyPrefix()
-    {
-	// FIXME
-	System.err.println(super.getPropertyPrefix());
-	return super.getPropertyPrefix();
-    }
-}
-
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkSliderUI.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkSliderUI.java
deleted file mode 100644
index c576b3d4b50..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/GtkSliderUI.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* GtkSliderUI.java
-   Copyright (c) 1999 by Free Software Foundation, Inc.
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.javax.swing.plaf.gtk;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-
-/**
- * Gtk-like slider
- *
- * @author Brian Jones
- * @see javax.swing.LookAndFeel
- */
-public class GtkSliderUI extends BasicSliderUI
-{
-    private static Color thumbFgColor;
-    private static Color thumbBgColor;
-    private static Color thumbHighlight;
-    private static Color thumbFocus;
-
-    private static Color bgColor;
-    private static Color fgColor;
-    private static Color focusColor;
-    private static Color highlight;
-    private static Color shadow;
-
-    private static final Dimension PREF_HORIZ = new Dimension(250, 15);
-    private static final Dimension PREF_VERT = new Dimension(15, 250);
-    private static final Dimension MIN_HORIZ = new Dimension(25, 15);
-    private static final Dimension MIN_VERT = new Dimension(15, 25);
-
-    public GtkSliderUI() 
-    {
-	super(null);
-	bgColor = UIManager.getColor("Slider.background");
-	fgColor = UIManager.getColor("Slider.foreground");
-	focusColor = UIManager.getColor("Slider.focus");
-	highlight = UIManager.getColor("Slider.highlight");
-	shadow = UIManager.getColor("Slider.shadow");
-
-	System.out.println("bgColor: " + bgColor);
-	System.out.println("fgColor: " + fgColor);
-	System.out.println("focusColor: " + focusColor);
-	System.out.println("highlight: " + highlight);
-	System.out.println("shadow: " + shadow);
-    }
-
-    public static ComponentUI createUI(JComponent c)
-    {
-	return new GtkSliderUI();
-    }
-
-    // methods not overridden here, using Basic defaults
-    // installUI()
-    // uninstall()
-
-    public Dimension getPreferredHorizontalSize()
-    {
-	/*
-	Dimension thumbSize = getThumbSize();
-	Dimenstion labelSize = getLabelSize();
-	// getTickLength()
-	int width = thumbSize.width + 
-	getWidthOfWidestLabel
-	*/
-	return PREF_HORIZ;
-    }
-
-    public Dimension getPreferredVerticalSize()
-    {
-	return PREF_VERT;
-    }
-
-    public Dimension getMinimumHorizontalSize()
-    {
-	return MIN_HORIZ;
-    }
-
-    public Dimension getMinimumVerticalSize()
-    {
-	return MIN_VERT;
-    }
-
-    /** 
-     * Returns thumb size based on slider orientation
-     */
-    protected Dimension getThumbSize()
-    {
-	Dimension size = new Dimension();
-
-	if (slider.getOrientation() == JSlider.VERTICAL) {
-	    size.width = 15;
-	    size.height = 33;
-	}
-	else {
-	    size.width = 33;
-	    size.height = 15;
-	}
-	return size;
-    }
-
-    /**
-     * Reserved width or height for ticks, as appropriate to the slider
-     * orientation.
-     */
-    protected int getTickLength()
-    {
-	return 10;
-    }
-
-    public void paintFocus(Graphics g)
-    {
-	super.paintFocus(g);
-	System.err.println("focus " + focusRect);
-    }
-
-    /**
-     * Must account for Unicode when drawing text.
-     */
-    public void paintLabels(Graphics g)
-    {
-	super.paintLabels(g);
-	System.err.println("label " + labelRect);
-    }
-
-    /**
-     * A drawRect() generated slider has ghosting when moving left on 
-     * a horizontal slider and the bottom is not painted when moving 
-     * right.
-     */
-    public void paintThumb(Graphics g)
-    {
-	int x = thumbRect.x;
-	int y = thumbRect.y;
-	int h = thumbRect.height;
-	int w = thumbRect.width;
-
-//  	    "Slider.background", "#888888",
-//  	    "Slider.focus", "#c3c3c3",
-//  	    "Slider.foreground", "#d6d6d6",
-//  	    "Slider.highlight", "#ffffff",
-//  	    "Slider.shadow", "#000000"
-
-	g.setColor(fgColor);
-	g.fillRect(x,y,w,h);
-	g.setColor(bgColor);
-	
-	if (slider.getOrientation() == JSlider.HORIZONTAL) {
-	    g.drawRect(x, y, w, h);
-	    g.setColor(highlight);
-	    g.drawLine(x+1, y+h-1, x+w, y+h-1);
-	    g.setColor(focusColor);
-	    g.drawLine(x+2, y+h-2, x+w, y+h-2);
-	    g.setColor(Color.black);
-	    g.drawLine(x+1, y+h-2, x+1, y+h-2);
-	    g.drawRect(x+1, y+1, w-1, 12);	    
-	}	
-	else 
-	    g.drawRect(x, y, w, h);
-
-	System.err.println("thumb " + thumbRect);
-    }
-
-    // public void paintTicks(Graphics g)
-    
-    public void paintTrack(Graphics g)
-    {
-//  	super.paintTrack(g);
-	int x = trackRect.x;
-	int y = trackRect.y;
-	int h = trackRect.height;
-	int w = trackRect.width;
-
-	System.err.println("track " + trackRect);
-
-	g.setColor(Color.black);
-	g.fillRect(x,y,w,h);
-
-//  	if (slider.getOrientation() == JSlider.HORIZONTAL)
-//  	    g.drawLine(x, y+h-1, x+w-1, y+h-1);
-//  	else
-//  	    g.drawLine(x+w-1, y, x+w-1, y+h-1);
-
-//  	System.err.println("track " + trackRect);
-//  	System.err.println("content " + contentRect);
-    }
-
-    // the four methods below allow you to control tick painting without 
-    // worrying about what paintTicks does, look for in other UI delegates
-    // protected void paintMajorTickForHorizSlider(Graphics g, Rectangle tickBounds, int x)
-    // protected void paintMajorTickForVertSlider(Graphics g, Rectangle tickBounds, int y)
-    // protected void paintMinorTickForHorizSlider(Graphics g, Rectangle tickBounds, int x)
-    // protected void paintMinorTickForVertSlider(Graphics g, Rectangle tickBounds, int y)
-}
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/README b/libjava/classpath/gnu/javax/swing/plaf/gtk/README
deleted file mode 100644
index 2b3f001ddc2..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/README
+++ /dev/null
@@ -1,37 +0,0 @@
-This is a start at a GTK look and feel for Java.
-It is usable already, but it mainly just defaults back to Basic Look and
-Feel for everything.
-
-Sliders are currently broken.  I haven't figured out why yet.
-
-A bunch of system colors defined in GtkLookandFeel though I have a feeling 
-I'll be defining more ColorUIResources shortly.
-
-Based on Gnome File Manager colors... or my Window Manager setup
-
-desktop			#000000	(gtk)
-activeCaption		#163555	(window manager)	
-activeCaptionText	#FFFFFF	(window manager)
-activeCaptionBorder	#000000 (unsure of this)
-inactiveCaption		#375676 (window manager)
-inactiveCaptionText	#999999 (window manager)
-inactiveCaptionBorder	#000000 (unsure of this)
-window			#FFFFFF (gtk)
-windowBorder		#969696 (gtk)
-windowText		#000000 (gtk)
-menu			#d6d6d6 (gtk)
-menuText		#000000 (gtk)
-text			#FFFFFF (gtk)
-textText		#000000 (gtk)
-textHighlight		#00009c (gtk)
-textHighlightText	#FFFFFF (gtk)
-textInactiveText	#999999 (unsure of this)
-control			#d6d6d6 (gtk)
-controlText		#000000 (gtk)
-controlHighlight	#eaeaea (gtk)
-controlLtHighlight	#eaeaea (unsure of this)
-controlShadow		#c3c3c3 (gtk)
-controlDkShadow		#888888 (unsure of this)
-scrollbar		#c3c3c3 (gtk)
-info			#d6d6d6 (gtk)
-infoText		#000000 (gtk)
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gtk/SliderTest.java b/libjava/classpath/gnu/javax/swing/plaf/gtk/SliderTest.java
deleted file mode 100644
index a838444924d..00000000000
--- a/libjava/classpath/gnu/javax/swing/plaf/gtk/SliderTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.awt.event.*;
-import gnu.javax.swing.plaf.gtk.*;
-
-public class SliderTest extends JFrame
-{
-    public SliderTest() 
-    { 
-	super("JSlider Test");
-	Container c = getContentPane();
-	c.setLayout(new BorderLayout());
-	this.addWindowListener(new WindowAdapter() {
-	    public void windowClosing(WindowEvent e) { System.exit(0); } 
-	});
-
-	JSlider s = new JSlider();
-	s.createStandardLabels(10);
-	s.setMinorTickSpacing(10);
-	s.setMajorTickSpacing(20);
-	s.setPaintTicks(true);
-	s.setPaintTrack(true);
-	s.setPaintLabels(true);
-	s.setRequestFocusEnabled(true);
-
-	// turning off double buffering in repaint manager 
-	// in order to use debug graphics
-	RepaintManager repaintManager = RepaintManager.currentManager(s);
-	repaintManager.setDoubleBufferingEnabled(false); 
-
-	s.setDebugGraphicsOptions(DebugGraphics.BUFFERED_OPTION | DebugGraphics.FLASH_OPTION);
-	DebugGraphics.setFlashColor(Color.red);  // color of flash
-	DebugGraphics.setFlashTime(4);  // time delay of drawing operation flashing
-	DebugGraphics.setFlashCount(3); // number of time to draw
-
-	this.setSize(250, 100);
-	c.add(new JLabel("Default Slider"), "North");
-	c.add(s, "Center");
-
-	try {
-	    UIManager.setLookAndFeel("gnu.javax.swing.plaf.gtk.GtkLookAndFeel");
-	    SwingUtilities.updateComponentTreeUI(this);
-	} catch (Exception e) {
-	    e.printStackTrace();
-	    System.exit(0);
-	}
-
-	center();
-    }
-
-    public void actionPerformed(ActionEvent e) { 
-	System.exit(0);
-    }
-    
-    public void center()
-    {
-	// Centering the frame 
-	Toolkit t = this.getToolkit();
-	Dimension framesize = this.getSize();
-	Dimension screensize = t.getScreenSize();
-	
-	// Calculate point for frame (main)
-	Point pframe = new Point();
-	pframe.x = (screensize.width - framesize.width) / 2;
-	pframe.y = (screensize.height - framesize.height) / 2;
-	
-	// Set the location of each to be centered
-	this.setLocation(pframe);
-    }
-
-    public static void main(String [] argv)
-    {
-	SliderTest t = new SliderTest();
-	t.show();
-    }
-
-}
-
-
-
-
diff --git a/libjava/classpath/resource/japhar-0.09.patch.1 b/libjava/classpath/resource/japhar-0.09.patch.1
deleted file mode 100644
index 9b2c180a916..00000000000
--- a/libjava/classpath/resource/japhar-0.09.patch.1
+++ /dev/null
@@ -1,305 +0,0 @@
-diff -uNr japhar-0.09.orig/include/runtime.h japhar-0.09/include/runtime.h
---- japhar-0.09.orig/include/runtime.h	Sat Sep 16 00:49:58 2000
-+++ japhar-0.09/include/runtime.h	Wed Dec  6 00:09:15 2000
-@@ -425,7 +425,9 @@
- HVM_ExceptionCleanup(HungryEnv *henv, japhar_object* exception);
- 
- PR_EXTERN( void )
--HVM_ExceptionPrintBacktrace(HungryEnv *henv, japhar_object* throwable_ref);
-+HVM_ExceptionPrintStackTrace(HungryEnv *henv,
-+                             japhar_object* throwable_ref,
-+                             japhar_object* stream);
- 
- PR_EXTERN( void )
- HVM_ExceptionFillInBacktraceFromStack(HungryEnv *henv,
-diff -uNr japhar-0.09.orig/lib/libnative/java.lang/throwable.c japhar-0.09/lib/libnative/java.lang/throwable.c
---- japhar-0.09.orig/lib/libnative/java.lang/throwable.c	Sun Oct 31 19:43:00 1999
-+++ japhar-0.09/lib/libnative/java.lang/throwable.c	Wed Dec  6 00:08:50 2000
-@@ -35,7 +35,7 @@
- 					  jobject printwriter_stream)
- {
-   HungryEnv *henv = HVM_ThreadGetEnv();
--  HVM_ExceptionPrintBacktrace(henv, throwable);
-+  HVM_ExceptionPrintStackTrace(henv, throwable, printwriter_stream);
- }
- 
- JNIEXPORT jobject JNICALL
-diff -uNr japhar-0.09.orig/lib/libruntime/exceptions.c japhar-0.09/lib/libruntime/exceptions.c
---- japhar-0.09.orig/lib/libruntime/exceptions.c	Thu Jan  6 20:33:47 2000
-+++ japhar-0.09/lib/libruntime/exceptions.c	Wed Dec  6 09:16:37 2000
-@@ -46,7 +46,7 @@
-   int i = 0;
-   PR_ASSERT(NULL != henv);
-   PR_ASSERT(NULL != method);
--  
-+
-   if (method->line_numbers)
-     {
-       for (i = 0; i < method->num_line_number_blocks; i++)
-@@ -61,10 +61,12 @@
- }
- 
- PR_IMPLEMENT(void)
--HVM_ExceptionPrintBacktrace(HungryEnv *henv, japhar_object* throwable_ref)
-+HVM_ExceptionPrintStackTrace(HungryEnv *henv,
-+                             japhar_object* throwable_ref,
-+                             japhar_object* stream_ref)
- {
--  ClazzFile *throwable_class;
--  MethodStruct *getMessage;
-+  ClazzFile *throwable_class, *stream_class;
-+  MethodStruct *getMessage, *println = NULL;
-   japhar_object* msg = NULL;
-   ClazzFile *exception_cf = throwable_ref->clazz;
-   char *exceptionname = getClassName(env, exception_cf);
-@@ -72,63 +74,83 @@
-   ExceptionInfo *exc_info = HVM_ObjectGetNativeState(throwable_ref);
-   BackTraceLevel *level;
-   InterpValue msg_value;
-+  char *msg_to_print;
-+  japhar_object *msg_obj;
- 
--  throwable_class = HVM_ClassFind(henv, java_lang_Throwable);
--
--  getMessage = HVM_MethodFind(henv, throwable_class,
--                              "getMessage",
--                              "()Ljava/lang/String;");
--
--  /*
--   * Cache exception and make sure the runtime don't think the call to
--   * getMessage failed
--   */
--  exception_cache = henv->_exception;
--  henv->_exception = NULL;
--
--  msg_value = HVM_MethodCallA(henv, getMessage, throwable_ref, NULL);
--  msg = msg_value.l;
--
--  /* Don't know what to do if the call fails.  Die a horrible death? */
--  PR_ASSERT(NULL == henv->_exception);
--  henv->_exception = exception_cache;
--
--  if (msg)
-+  if (stream_ref != NULL)
-     {
--      const char *msg_bytes = HVM_StringToCString(henv, msg);
-+      ClazzFile *stream_clazz = HVM_ClassFind(henv, "java/io/PrintWriter");
-+      PRBool pwriter = HVM_ObjectIsInstanceOf(henv, stream_ref, stream_clazz);
-+      if (pwriter)
-+        stream_class = HVM_ClassFind(henv, "java/io/PrintWriter");
-+      else
-+        stream_class = HVM_ClassFind(henv, "java/io/PrintStream");
- 
--      fprintf (stderr, "%s (%s)\n", exceptionname, msg_bytes);
-+      if (stream_class == NULL)
-+        {
-+          if (pwriter)
-+            abort_with_message("ExceptionPrintStackTrace could not "
-+                               "find java/io/PrintWriter");
-+          else
-+            abort_with_message("ExceptionPrintStackTrace could not "
-+                               "find java/io/PrintStream");
-+        }
-+
-+      println = HVM_MethodFind(henv, stream_class, "println",
-+                               "(Ljava/lang/String;)V");
-+      if (println == NULL)
-+        abort_with_message("ExceptionPrintStacktrace could not "
-+                           "find method println");
-     }
--  else
--    fprintf (stderr, "%s\n", exceptionname);
- 
-   level = exc_info->head;
-   while (level)
-     {
-       int line_number = method_pc_to_line_number(henv, level->method,
-                                                  level->pc);
--      
-+
-+      PR_ASSERT(NULL != level->method);
-       if (level->method->access_flags & ACC_NATIVE)
--        fprintf (stderr, "        in %s.%s(%s%snative method)\n",
--                 level->classname,
--                 level->method->name,
--                 level->filename ? level->filename : "",
--                 level->filename ? ", " : "");
-+        {
-+          msg_to_print = PR_smprintf("        in %s.%s(%s%snative method)",
-+                                     level->classname,
-+                                     level->method->name,
-+                                     level->filename ? level->filename : "",
-+                                     level->filename ? ", " : "");
-+        }
-       else if (line_number == -1)
--        fprintf (stderr, "        in %s.%s(%s%spc = %d)\n",
--                 level->classname,
--                 level->method->name,
--                 level->filename ? level->filename : "",
--                 level->filename ? ", " : "",
--                 level->pc);
-+        {
-+          msg_to_print = PR_smprintf("        in %s.%s(%s%spc = %d)",
-+                                     level->classname,
-+                                     level->method->name,
-+                                     level->filename ? level->filename : "",
-+                                     level->filename ? ", " : "",
-+                                     level->pc);
-+        }
-       else
--        fprintf (stderr, "        at %s.%s(%s%s%d, pc = %d)\n",
--                 level->classname,
--                 level->method->name,
--                 level->filename ? level->filename : "",
--                 level->filename ? ":" : "line ",
--                 line_number,
--                 level->pc);
-+        {
-+          msg_to_print = PR_smprintf("        at %s.%s(%s%s%d, pc = %d)",
-+                                     level->classname,
-+                                     level->method->name,
-+                                     level->filename ? level->filename : "",
-+                                     level->filename ? ":" : "line ",
-+                                     line_number,
-+                                     level->pc);
-+        }
-+
-+      msg_obj = HVM_StringFromCString(henv, msg_to_print);
-+      if (msg_obj == NULL)
-+        abort_with_message("ExceptionPrintStackTrace unable to "
-+                           "allocate message");
-+
-+      if (println != NULL)
-+        {
-+          HVM_MethodCall(henv, println, stream_ref, msg_obj);
-+        }
-+      else
-+        fprintf (stderr, "%s\n", msg_to_print);
-+
-+      PR_smprintf_free(msg_to_print);
- 
-       level = level->next;
-     }
-@@ -141,7 +163,7 @@
-   /* XXX remove the gc root */
-   henv->_exception = NULL;
- 
--  HVM_ExceptionPrintBacktrace(henv, throwable_ref);
-+  HVM_ExceptionPrintStackTrace(henv, throwable_ref, (japhar_object*)NULL);
- }
- 
- PR_IMPLEMENT(void)
-@@ -173,14 +195,14 @@
- {
-   ExceptionInfo *exc_info = HVM_ObjectGetNativeState(throwable_ref);
-   BackTraceLevel *new_level = (BackTraceLevel*)PR_MALLOC(sizeof(BackTraceLevel));
--  
-+
-   new_level->classname = PL_strdup(getClassName(henv, throw_frame->method->clazz));
-   new_level->filename = throw_frame->method->clazz->source_filename;
-   new_level->method = throw_frame->method;
-   new_level->pc = throw_frame->pc;
-   new_level->next = NULL;
-   new_level->prev = NULL;
--  
-+
-   /* link the new level into the list of levels */
-   if (exc_info->tail)
-     {
-@@ -284,7 +306,7 @@
- 
-   throw_frame = f;
- 
--  PR_LOG(exceptionLm, PR_LOG_DEBUG, 
-+  PR_LOG(exceptionLm, PR_LOG_DEBUG,
-          ("Exception %s thrown from %s.%s - at pc %d\n",
-           getClassName(ENV(throw_frame), throwable_cf),
-           getClassName(ENV(throw_frame), throw_frame->method->clazz),
-@@ -303,7 +325,7 @@
-           /* if we hit a native frame, we just return.
-              the interpreter loop will return to it's caller
-              if the exception hasn't been handled here. */
--          
-+
-           return;
-         }
-       else
-@@ -328,7 +350,7 @@
-               catch_class = ExceptionBlock_getHandlerClazz(henv,
-                                                            throw_frame->method->clazz,
-                                                            exc_block);
--              
-+
-               if (!HVM_ObjectIsInstanceOf(henv, throwable_ref, catch_class))
-                 continue;
- 
-@@ -337,7 +359,7 @@
-                  the exception was thrown from. */
- 
-               throw_frame->pc = exc_block->handler_pc;
--              
-+
-               henv->op_stack->stack_top = throw_frame->opstack_top;
- 
-               op_stack_push_object(henv->op_stack, throwable_ref);
-@@ -345,17 +367,17 @@
-               /* XXX remove the gc root */
-               henv->_exception = NULL;
- 
--              PR_LOG(exceptionLm, PR_LOG_DEBUG, 
-+              PR_LOG(exceptionLm, PR_LOG_DEBUG,
-                      ("Exception %s caught by %s.%s - at pc %d\n",
-                       getClassName(henv, catch_class),
-                       getClassName(henv, throw_frame->method->clazz),
-                       throw_frame->method->name,
-                       throw_frame->pc));
--              
-+
-               return;
-             }
- 
--          /* if we didn't find a match, pop the stack 
-+          /* if we didn't find a match, pop the stack
-              frame and do it again. */
-           new_throw_frame = throw_frame->parent;
-           pop_frame(henv);
-@@ -381,7 +403,7 @@
-   char *msg = NULL;
- 
-   exception_cls = HVM_ClassFind(henv, exception_name);
--  
-+
-   if (!exception_cls)
-     abort_with_message("Unable to raise exception.");
- 
-@@ -417,16 +439,13 @@
-       constructor = HVM_MethodFind(henv, cf,
-                                    "<init>", "(Ljava/lang/String;)V");
- 
--      HVM_MethodCall(henv, constructor, 
--                     new_exception, string);
-+      HVM_MethodCall(henv, constructor, new_exception, string);
-     }
-   else
-     {
-       constructor = HVM_MethodFind(henv, cf, "<init>", "()V");
- 
--      HVM_MethodCallA(henv, constructor,
--                      new_exception, NULL);
--
-+      HVM_MethodCallA(henv, constructor, new_exception, NULL);
-     }
- 
-   return new_exception;
-diff -uNr japhar-0.09.orig/lib/libruntime/init.c japhar-0.09/lib/libruntime/init.c
---- japhar-0.09.orig/lib/libruntime/init.c	Sat Sep 16 00:51:08 2000
-+++ japhar-0.09/lib/libruntime/init.c	Wed Dec  6 09:25:34 2000
-@@ -454,7 +454,7 @@
- 
-   if (new_env->_exception)
-     {
--      HVM_ExceptionPrintBacktrace(new_env, new_env->_exception);
-+      HVM_ExceptionPrintStackTrace(new_env, new_env->_exception, (japhar_object*)NULL);
-       return PR_FALSE;
-     }
- 
diff --git a/libjava/classpath/resource/orp-1.0.8.patch b/libjava/classpath/resource/orp-1.0.8.patch
deleted file mode 100644
index 3ff9c986eb5..00000000000
--- a/libjava/classpath/resource/orp-1.0.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr orp.orig/base_natives/gnu_classpath/gnu_specific.cpp orp/base_natives/gnu_classpath/gnu_specific.cpp
---- orp.orig/base_natives/gnu_classpath/gnu_specific.cpp	Fri Nov 16 04:14:38 2001
-+++ orp/base_natives/gnu_classpath/gnu_specific.cpp	Tue Nov 27 23:19:42 2001
-@@ -298,7 +298,6 @@
- //libpath.length != 0; but it's ok in reality without libpath, for
- //system can lookup needed libs in default pathes.
- 
--	"java/lang/Runtime.loadLibrary(Ljava/lang/String;)V",
- #endif
- 
- //GNU Classpath has intern, we keep it here for efficiency
-@@ -310,6 +309,7 @@
- 
- #endif //NON_ORP_NATIVE_LIBS
- 
-+	"java/lang/Runtime.loadLibrary(Ljava/lang/String;)V",
- }; //methods_with_native_impl
- 
- static int num_methods_with_native_impl = sizeof(methods_with_native_impl) / sizeof(methods_with_native_impl[0]);
diff --git a/libjava/classpath/resource/orp-1.0.9.patch b/libjava/classpath/resource/orp-1.0.9.patch
deleted file mode 100644
index 1b84d8ac611..00000000000
--- a/libjava/classpath/resource/orp-1.0.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -u orp-1.0.9.orig/arch/ia32/base/root_set_enum_ia32.cpp orp-1.0.9/arch/ia32/base/root_set_enum_ia32.cpp
---- orp-1.0.9.orig/arch/ia32/base/root_set_enum_ia32.cpp	Thu Jan 17 06:49:40 2002
-+++ orp-1.0.9/arch/ia32/base/root_set_enum_ia32.cpp	Thu Feb  7 15:13:02 2002
-@@ -35,9 +35,6 @@
- #include "../x86/x86.h"
- 
- #ifdef ORP_POSIX
--#ifdef __linux__
--#include <asm/spinlock.h>
--#endif
- #include "platform2.h"
- #endif
- 
-diff -r -u orp-1.0.9.orig/base_natives/common_olv2/mon_enter_exit.cpp orp-1.0.9/base_natives/common_olv2/mon_enter_exit.cpp
---- orp-1.0.9.orig/base_natives/common_olv2/mon_enter_exit.cpp	Thu Jan 17 06:49:40 2002
-+++ orp-1.0.9/base_natives/common_olv2/mon_enter_exit.cpp	Thu Feb  7 15:13:57 2002
-@@ -294,7 +294,7 @@
- #else
- 		"nop;nop;nop"
- #endif
--		::: "memory"
-+		: : : "memory"
- 	);
- 
- #else