Makefile.def: Remove libjava.

2016-09-30  Andrew Haley  <aph@redhat.com>

	* Makefile.def: Remove libjava.
	* Makefile.tpl: Likewise.
	* Makefile.in: Regenerate.
	* configure.ac: Likewise.
	* configure: Likewise.
	* gcc/java: Remove.
	* libjava: Likewise.

From-SVN: r240662

58 files changed, 0 insertions, 7658 deletions

diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java
deleted file mode 100644
index 4448dd5..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* DomHTMLAnchorElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLAnchorElement;
-
-/**
- * An HTML 'A' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLAnchorElement
-  extends DomHTMLElement
-  implements HTMLAnchorElement
-{
-
-  protected DomHTMLAnchorElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public String getCharset()
-  {
-    return getHTMLAttribute("charset");
-  }
-
-  public void setCharset(String charset)
-  {
-    setHTMLAttribute("charset", charset);
-  }
-
-  public String getCoords()
-  {
-    return getHTMLAttribute("coords");
-  }
-
-  public void setCoords(String coords)
-  {
-    setHTMLAttribute("coords", coords);
-  }
-
-  public String getHref()
-  {
-    return getHTMLAttribute("href");
-  }
-
-  public void setHref(String href)
-  {
-    setHTMLAttribute("href", href);
-  }
-
-  public String getHreflang()
-  {
-    return getHTMLAttribute("hreflang");
-  }
-
-  public void setHreflang(String hreflang)
-  {
-    setHTMLAttribute("hreflang", hreflang);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getRel()
-  {
-    return getHTMLAttribute("rel");
-  }
-
-  public void setRel(String rel)
-  {
-    setHTMLAttribute("rel", rel);
-  }
-
-  public String getRev()
-  {
-    return getHTMLAttribute("rev");
-  }
-
-  public void setRev(String rev)
-  {
-    setHTMLAttribute("rev", rev);
-  }
-
-  public String getShape()
-  {
-    return getHTMLAttribute("shape");
-  }
-
-  public void setShape(String shape)
-  {
-    setHTMLAttribute("shape", shape);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public String getTarget()
-  {
-    return getHTMLAttribute("target");
-  }
-
-  public void setTarget(String target)
-  {
-    setHTMLAttribute("target", target);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-  public void blur()
-  {
-    dispatchUIEvent("blur");
-  }
-
-  public void focus()
-  {
-    dispatchUIEvent("focus");
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java
deleted file mode 100644
index 429fb00..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* DomHTMLAppletElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLAppletElement;
-
-/**
- * An HTML 'APPLET' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLAppletElement
-  extends DomHTMLElement
-  implements HTMLAppletElement
-{
-
-  protected DomHTMLAppletElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getCls()
-  {
-    return getHTMLAttribute("class");
-  }
-
-  public void setCls(String cls)
-  {
-    setHTMLAttribute("class", cls);
-  }
-
-  public String getSrc()
-  {
-    return getHTMLAttribute("src");
-  }
-
-  public void setSrc(String src)
-  {
-    setHTMLAttribute("src", src);
-  }
-
-  public String getAlt()
-  {
-    return getHTMLAttribute("alt");
-  }
-
-  public void setAlt(String alt)
-  {
-    setHTMLAttribute("alt", alt);
-  }
-
-  public String getArchive()
-  {
-    return getHTMLAttribute("archive");
-  }
-
-  public void setArchive(String archive)
-  {
-    setHTMLAttribute("archive", archive);
-  }
-
-  public String getCode()
-  {
-    return getHTMLAttribute("code");
-  }
-
-  public void setCode(String code)
-  {
-    setHTMLAttribute("code", code);
-  }
-
-  public String getCodeBase()
-  {
-    return getHTMLAttribute("codebase");
-  }
-
-  public void setCodeBase(String codeBase)
-  {
-    setHTMLAttribute("codebase", codeBase);
-  }
-
-  public String getHeight()
-  {
-    return getHTMLAttribute("height");
-  }
-
-  public void setHeight(String height)
-  {
-    setHTMLAttribute("height", height);
-  }
-
-  public int getHspace()
-  {
-    return getIntHTMLAttribute("hspace");
-  }
-
-  public void setHspace(int hspace)
-  {
-    setIntHTMLAttribute("hspace", hspace);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getObject()
-  {
-    return getHTMLAttribute("object");
-  }
-
-  public void setObject(String object)
-  {
-    setHTMLAttribute("object", object);
-  }
-
-  public int getVspace()
-  {
-    return getIntHTMLAttribute("vspace");
-  }
-
-  public void setVspace(int vspace)
-  {
-    setIntHTMLAttribute("vspace", vspace);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java
deleted file mode 100644
index 728b3fd..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* DomHTMLAreaElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLAreaElement;
-
-/**
- * An HTML 'AREA' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLAreaElement
-  extends DomHTMLElement
-  implements HTMLAreaElement
-{
-
-  protected DomHTMLAreaElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public String getAlt()
-  {
-    return getHTMLAttribute("alt");
-  }
-
-  public void setAlt(String alt)
-  {
-    setHTMLAttribute("alt", alt);
-  }
-
-  public String getCoords()
-  {
-    return getHTMLAttribute("coords");
-  }
-
-  public void setCoords(String coords)
-  {
-    setHTMLAttribute("coords", coords);
-  }
-
-  public String getHref()
-  {
-    return getHTMLAttribute("href");
-  }
-
-  public void setHref(String href)
-  {
-    setHTMLAttribute("href", href);
-  }
-
-  public boolean getNoHref()
-  {
-    return getBooleanHTMLAttribute("nohref");
-  }
-
-  public void setNoHref(boolean nohref)
-  {
-    setBooleanHTMLAttribute("nohref", nohref);
-  }
-
-  public String getShape()
-  {
-    return getHTMLAttribute("shape");
-  }
-
-  public void setShape(String shape)
-  {
-    setHTMLAttribute("shape", shape);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public String getTarget()
-  {
-    return getHTMLAttribute("target");
-  }
-
-  public void setTarget(String target)
-  {
-    setHTMLAttribute("target", target);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java
deleted file mode 100644
index 5ad49c5..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLBRElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLBRElement;
-
-/**
- * An HTML 'BR' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLBRElement
-  extends DomHTMLElement
-  implements HTMLBRElement
-{
-
-  protected DomHTMLBRElement(DomHTMLDocument owner, String namespaceURI,
-                             String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getClear()
-  {
-    return getHTMLAttribute("clear");
-  }
-
-  public void setClear(String clear)
-  {
-    setHTMLAttribute("clear", clear);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java
deleted file mode 100644
index 99a0993..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLBaseElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLBaseElement;
-
-/**
- * An HTML 'BASE' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLBaseElement
-  extends DomHTMLElement
-  implements HTMLBaseElement
-{
-
-  protected DomHTMLBaseElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getHref()
-  {
-    return getHTMLAttribute("href");
-  }
-
-  public void setHref(String href)
-  {
-    setHTMLAttribute("href", href);
-  }
-
-  public String getTarget()
-  {
-    return getHTMLAttribute("target");
-  }
-
-  public void setTarget(String target)
-  {
-    setHTMLAttribute("target", target);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java
deleted file mode 100644
index 73ec96d..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* DomHTMLBaseFontElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLBaseFontElement;
-
-/**
- * An HTML 'BASEFONT' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLBaseFontElement
-  extends DomHTMLElement
-  implements HTMLBaseFontElement
-{
-
-  protected DomHTMLBaseFontElement(DomHTMLDocument owner, String namespaceURI,
-                                   String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getColor()
-  {
-    return getHTMLAttribute("color");
-  }
-
-  public void setColor(String color)
-  {
-    setHTMLAttribute("color", color);
-  }
-
-  public String getFace()
-  {
-    return getHTMLAttribute("face");
-  }
-
-  public void setFace(String face)
-  {
-    setHTMLAttribute("face", face);
-  }
-
-  public int getSize()
-  {
-    return getIntHTMLAttribute("size");
-  }
-
-  public void setSize(int size)
-  {
-    setIntHTMLAttribute("size", size);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java
deleted file mode 100644
index d452862..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* DomHTMLBodyElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLBodyElement;
-
-/**
- * An HTML 'BODY' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLBodyElement
-  extends DomHTMLElement
-  implements HTMLBodyElement
-{
-
-  protected DomHTMLBodyElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getALink()
-  {
-    return getHTMLAttribute("alink");
-  }
-
-  public void setALink(String alink)
-  {
-    setHTMLAttribute("alink", alink);
-  }
-
-  public String getBackground()
-  {
-    return getHTMLAttribute("background");
-  }
-
-  public void setBackground(String background)
-  {
-    setHTMLAttribute("background", background);
-  }
-
-  public String getBgColor()
-  {
-    return getHTMLAttribute("bgcolor");
-  }
-
-  public void setBgColor(String bgcolor)
-  {
-    setHTMLAttribute("bgcolor", bgcolor);
-  }
-
-  public String getLink()
-  {
-    return getHTMLAttribute("link");
-  }
-
-  public void setLink(String link)
-  {
-    setHTMLAttribute("link", link);
-  }
-
-  public String getText()
-  {
-    return getHTMLAttribute("text");
-  }
-
-  public void setText(String text)
-  {
-    setHTMLAttribute("text", text);
-  }
-
-  public String getVLink()
-  {
-    return getHTMLAttribute("vlink");
-  }
-
-  public void setVLink(String vlink)
-  {
-    setHTMLAttribute("vlink", vlink);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java
deleted file mode 100644
index 696169a..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* DomHTMLButtonElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLButtonElement;
-import org.w3c.dom.html2.HTMLFormElement;
-
-/**
- * An HTML 'BUTTON' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLButtonElement
-  extends DomHTMLElement
-  implements HTMLButtonElement
-{
-
-  protected DomHTMLButtonElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public String getValue()
-  {
-    return getHTMLAttribute("value");
-  }
-
-  public void setValue(String value)
-  {
-    setHTMLAttribute("value", value);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java
deleted file mode 100644
index 8300287..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/* DomHTMLCollection.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDOMException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLOptionsCollection;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-/**
- * An HTML element collection.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-class DomHTMLCollection
-  implements HTMLCollection, HTMLOptionsCollection, NodeList, NodeFilter
-{
-
-  final DomHTMLDocument doc;
-  final Node root;
-  List nodeNames;
-  List attributeNames;
-  List results;
-
-  DomHTMLCollection(DomHTMLDocument doc, Node root)
-  {
-    this.doc = doc;
-    this.root = root;
-  }
-
-  // -- Node name and attribute filtering --
-
-  void addNodeName(String name)
-  {
-    if (nodeNames == null)
-      {
-        nodeNames = new LinkedList();
-      }
-    nodeNames.add(name);
-  }
-
-  void addAttributeName(String name)
-  {
-    if (attributeNames == null)
-      {
-        attributeNames = new LinkedList();
-      }
-    attributeNames.add(name);
-  }
-
-  public short acceptNode(Node n)
-  {
-    if (n.getNodeType() != Node.ELEMENT_NODE)
-      {
-        return NodeFilter.FILTER_SKIP;
-      }
-    String localName = n.getLocalName();
-    if (localName == null)
-      {
-        localName = n.getNodeName();
-      }
-    if (nodeNames != null && !acceptName(localName))
-      {
-        return NodeFilter.FILTER_SKIP;
-      }
-    if (attributeNames != null && !acceptAttributes(n.getAttributes()))
-      {
-        return NodeFilter.FILTER_SKIP;
-      }
-    return NodeFilter.FILTER_ACCEPT;
-  }
-
-  private boolean acceptName(String name)
-  {
-    for (Iterator i = nodeNames.iterator(); i.hasNext(); )
-      {
-        String nodeName = (String) i.next();
-        if (nodeName.equalsIgnoreCase(name))
-          {
-            return true;
-          }
-      }
-    return false;
-  }
-
-  private boolean acceptAttributes(NamedNodeMap attrs)
-  {
-    for (Iterator i = attributeNames.iterator(); i.hasNext(); )
-      {
-        String attributeName = (String) i.next();
-        Node attr = getNamedItem(attrs, attributeName);
-        if (attr != null)
-          {
-            // Check that attribute has a non-null value
-            String nodeValue = attr.getNodeValue();
-            if (nodeValue != null && nodeValue.length() > 0)
-              {
-                return true;
-              }
-          }
-      }
-    return false;
-  }
-
-  /**
-   * Case-insensitive version of getNamedItem.
-   */
-  private Node getNamedItem(NamedNodeMap attrs, String name)
-  {
-    int len = attrs.getLength();
-    for (int i = 0; i < len; i++)
-      {
-        Node attr = attrs.item(i);
-        String attrName = attr.getLocalName();
-        if (attrName == null)
-          {
-            attrName = attr.getNodeName();
-          }
-        if (name.equalsIgnoreCase(attrName))
-          {
-            return attr;
-          }
-      }
-    return null;
-  }
-
-  // -- Perform query --
-
-  void evaluate()
-  {
-    NodeIterator i = doc.createNodeIterator(root, NodeFilter.SHOW_ELEMENT,
-                                            this, true);
-    results = new ArrayList();
-    for (Node node = i.nextNode(); node != null; node = i.nextNode())
-      {
-        results.add(node);
-      }
-  }
-
-  // -- HTMLCollection/NodeList interface --
-
-  public int getLength()
-  {
-    return results.size();
-  }
-
-  public void setLength(int length)
-  {
-    throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
-  }
-
-  public Node item(int index)
-  {
-    return (Node) results.get(index);
-  }
-
-  public Node namedItem(String name)
-  {
-    boolean xhtml = false; // FIXME detect XHTML document
-    for (Iterator i = results.iterator(); i.hasNext(); )
-      {
-        Node node = (Node) i.next();
-        NamedNodeMap attrs = node.getAttributes();
-        Node attr = getNamedItem(attrs, "id");
-        if (name.equals(attr.getTextContent()))
-          {
-            return node;
-          }
-        if (!xhtml)
-          {
-            attr = getNamedItem(attrs, "name");
-            if (name.equals(attr.getTextContent()))
-              {
-                return node;
-              }
-          }
-      }
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java
deleted file mode 100644
index 9acce85..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLDListElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLDListElement;
-
-/**
- * An HTML 'DL' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLDListElement
-  extends DomHTMLElement
-  implements HTMLDListElement
-{
-
-  protected DomHTMLDListElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getCompact()
-  {
-    return getBooleanHTMLAttribute("compact");
-  }
-
-  public void setCompact(boolean compact)
-  {
-    setBooleanHTMLAttribute("compact", compact);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java
deleted file mode 100644
index e0f94a1..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLDirectoryElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLDirectoryElement;
-
-/**
- * An HTML 'DIR' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLDirectoryElement
-  extends DomHTMLElement
-  implements HTMLDirectoryElement
-{
-
-  protected DomHTMLDirectoryElement(DomHTMLDocument owner, String namespaceURI,
-                                    String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getCompact()
-  {
-    return getBooleanHTMLAttribute("compact");
-  }
-
-  public void setCompact(boolean compact)
-  {
-    setBooleanHTMLAttribute("compact", compact);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java
deleted file mode 100644
index 66b3ac7..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLDivElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLDivElement;
-
-/**
- * An HTML 'DIV' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLDivElement
-  extends DomHTMLElement
-  implements HTMLDivElement
-{
-
-  protected DomHTMLDivElement(DomHTMLDocument owner, String namespaceURI,
-                              String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java
deleted file mode 100644
index 1afed7b..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/* DomHTMLDocument.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDocument;
-import gnu.xml.dom.DomDOMException;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLDocument;
-import org.w3c.dom.html2.HTMLElement;
-
-/**
- * An HTML document.
- * This is the factory object used to create HTML elements.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLDocument
-  extends DomDocument
-  implements HTMLDocument
-{
-
-  private static final Class[] ELEMENT_PT = new Class[] {
-    DomHTMLDocument.class,
-    String.class,
-    String.class
-  };
-
-  private static Map ELEMENT_CLASSES;
-  static
-  {
-    Map map = new HashMap();
-    map.put("a", DomHTMLAnchorElement.class);
-    map.put("applet", DomHTMLAppletElement.class);
-    map.put("area", DomHTMLAreaElement.class);
-    map.put("base", DomHTMLBaseElement.class);
-    map.put("basefont", DomHTMLBaseFontElement.class);
-    map.put("body", DomHTMLBodyElement.class);
-    map.put("br", DomHTMLBRElement.class);
-    map.put("button", DomHTMLButtonElement.class);
-    map.put("dir", DomHTMLDirectoryElement.class);
-    map.put("div", DomHTMLDivElement.class);
-    map.put("dlist", DomHTMLDListElement.class);
-    map.put("embed", DomHTMLEmbedElement.class);
-    map.put("fieldset", DomHTMLFieldSetElement.class);
-    map.put("font", DomHTMLFontElement.class);
-    map.put("form", DomHTMLFormElement.class);
-    map.put("frame", DomHTMLFrameElement.class);
-    map.put("frameset", DomHTMLFrameSetElement.class);
-    map.put("head", DomHTMLHeadElement.class);
-    map.put("h1", DomHTMLHeadingElement.class);
-    map.put("h2", DomHTMLHeadingElement.class);
-    map.put("h3", DomHTMLHeadingElement.class);
-    map.put("h4", DomHTMLHeadingElement.class);
-    map.put("h5", DomHTMLHeadingElement.class);
-    map.put("h6", DomHTMLHeadingElement.class);
-    map.put("html", DomHTMLHtmlElement.class);
-    map.put("iframe", DomHTMLIFrameElement.class);
-    map.put("img", DomHTMLImageElement.class);
-    map.put("input", DomHTMLInputElement.class);
-    map.put("isindex", DomHTMLIsIndexElement.class);
-    map.put("label", DomHTMLLabelElement.class);
-    map.put("legend", DomHTMLLegendElement.class);
-    map.put("li", DomHTMLLIElement.class);
-    map.put("link", DomHTMLLinkElement.class);
-    map.put("map", DomHTMLMapElement.class);
-    map.put("menu", DomHTMLMenuElement.class);
-    map.put("meta", DomHTMLMetaElement.class);
-    map.put("ins", DomHTMLModElement.class);
-    map.put("del", DomHTMLModElement.class);
-    map.put("object", DomHTMLObjectElement.class);
-    map.put("ol", DomHTMLOListElement.class);
-    map.put("optgroup", DomHTMLOptGroupElement.class);
-    map.put("option", DomHTMLOptionElement.class);
-    map.put("p", DomHTMLParagraphElement.class);
-    map.put("param", DomHTMLParamElement.class);
-    map.put("pre", DomHTMLPreElement.class);
-    map.put("q", DomHTMLQuoteElement.class);
-    map.put("blockquote", DomHTMLQuoteElement.class);
-    map.put("script", DomHTMLScriptElement.class);
-    map.put("select", DomHTMLSelectElement.class);
-    map.put("style", DomHTMLStyleElement.class);
-    map.put("caption", DomHTMLTableCaptionElement.class);
-    map.put("th", DomHTMLTableCellElement.class);
-    map.put("td", DomHTMLTableCellElement.class);
-    map.put("col", DomHTMLTableColElement.class);
-    map.put("colgroup", DomHTMLTableColElement.class);
-    map.put("table", DomHTMLTableElement.class);
-    map.put("tr", DomHTMLTableRowElement.class);
-    map.put("thead", DomHTMLTableSectionElement.class);
-    map.put("tfoot", DomHTMLTableSectionElement.class);
-    map.put("tbody", DomHTMLTableSectionElement.class);
-    map.put("textarea", DomHTMLTextAreaElement.class);
-    map.put("title", DomHTMLTitleElement.class);
-    map.put("ul", DomHTMLUListElement.class);
-    ELEMENT_CLASSES = Collections.unmodifiableMap(map);
-  }
-
-  private static Set HTML_NS_URIS;
-  static
-  {
-    Set set = new HashSet();
-    set.add("http://www.w3.org/TR/html4/strict");
-    set.add("http://www.w3.org/TR/html4/loose");
-    set.add("http://www.w3.org/TR/html4/frameset");
-    set.add("http://www.w3.org/1999/xhtml");
-    set.add("http://www.w3.org/TR/xhtml1/strict");
-    set.add("http://www.w3.org/TR/xhtml1/loose");
-    set.add("http://www.w3.org/TR/xhtml1/frameset");
-    HTML_NS_URIS = Collections.unmodifiableSet(set);
-  }
-
-  /**
-   * Convenience constructor.
-   */
-  public DomHTMLDocument()
-  {
-    this(new DomHTMLImpl());
-  }
-
-  /**
-   * Constructor.
-   * This is called by the DOMImplementation.
-   */
-  public DomHTMLDocument(DomHTMLImpl impl)
-  {
-    super(impl);
-  }
-
-  private Node getChildNodeByName(Node parent, String name)
-  {
-    for (Node ctx = parent.getFirstChild(); ctx != null;
-         ctx = ctx.getNextSibling())
-      {
-        if (name.equalsIgnoreCase(ctx.getNodeName()))
-          {
-            return ctx;
-          }
-      }
-    return null;
-  }
-
-  public String getTitle()
-  {
-    Node html = getDocumentElement();
-    if (html != null)
-      {
-        Node head = getChildNodeByName(html, "head");
-        if (head != null)
-          {
-            Node title = getChildNodeByName(head, "title");
-            if (title != null)
-              {
-                return title.getTextContent();
-              }
-          }
-      }
-    return null;
-  }
-
-  public void setTitle(String title)
-  {
-    Node html = getDocumentElement();
-    if (html == null)
-      {
-        html = createElement("html");
-        appendChild(html);
-      }
-    Node head = getChildNodeByName(html, "head");
-    if (head == null)
-      {
-        head = createElement("head");
-        Node first = html.getFirstChild();
-        if (first != null)
-          {
-            html.insertBefore(first, head);
-          }
-        else
-          {
-            html.appendChild(head);
-          }
-      }
-    Node titleNode = getChildNodeByName(head, "title");
-    if (titleNode == null)
-      {
-        titleNode = createElement("title");
-        Node first = head.getFirstChild();
-        if (first != null)
-          {
-            head.insertBefore(first, titleNode);
-          }
-        else
-          {
-            head.appendChild(titleNode);
-          }
-      }
-    titleNode.setTextContent(title);
-  }
-
-  public String getReferrer()
-  {
-    // TODO getReferrer
-    return null;
-  }
-
-  public String getDomain()
-  {
-    try
-      {
-        URL url = new URL(getDocumentURI());
-        return url.getHost();
-      }
-    catch (MalformedURLException e)
-      {
-        return null;
-      }
-  }
-
-  public String getURL()
-  {
-    return getDocumentURI();
-  }
-
-  public HTMLElement getBody()
-  {
-    Node html = getDocumentElement();
-    if (html != null)
-      {
-        Node body = getChildNodeByName(html, "body");
-        if (body == null)
-          {
-            body = getChildNodeByName(html, "frameset");
-          }
-        return (HTMLElement) body;
-      }
-    return null;
-  }
-
-  public void setBody(HTMLElement body)
-  {
-    Node html = getDocumentElement();
-    if (html == null)
-      {
-        html = createElement("html");
-        appendChild(html);
-      }
-    Node ref = getBody();
-    if (ref == null)
-      {
-        html.appendChild(body);
-      }
-    else
-      {
-        html.replaceChild(body, ref);
-      }
-  }
-
-  public HTMLCollection getImages()
-  {
-    DomHTMLCollection ret = new DomHTMLCollection(this, this);
-    ret.addNodeName("img");
-    ret.evaluate();
-    return ret;
-  }
-
-  public HTMLCollection getApplets()
-  {
-    DomHTMLCollection ret = new DomHTMLCollection(this, this);
-    ret.addNodeName("embed");
-    ret.addNodeName("object");
-    ret.addNodeName("applet");
-    ret.evaluate();
-    return ret;
-  }
-
-  public HTMLCollection getLinks()
-  {
-    DomHTMLCollection ret = new DomHTMLCollection(this, this);
-    ret.addNodeName("area");
-    ret.addNodeName("a");
-    ret.evaluate();
-    return ret;
-  }
-
-  public HTMLCollection getForms()
-  {
-    DomHTMLCollection ret = new DomHTMLCollection(this, this);
-    ret.addNodeName("form");
-    ret.evaluate();
-    return ret;
-  }
-
-  public HTMLCollection getAnchors()
-  {
-    DomHTMLCollection ret = new DomHTMLCollection(this, this);
-    ret.addNodeName("a");
-    ret.addAttributeName("name");
-    ret.evaluate();
-    return ret;
-  }
-
-  public String getCookie()
-  {
-    // TODO getCookie
-    return null;
-  }
-
-  public void setCookie(String cookie)
-  {
-    // TODO setCookie
-  }
-
-  public void open()
-  {
-    // TODO open
-  }
-
-  public void close()
-  {
-    // TODO close
-  }
-
-  public void write(String text)
-  {
-    // TODO write
-  }
-
-  public void writeln(String text)
-  {
-    // TODO write
-  }
-
-  public NodeList getElementsByName(String name)
-  {
-    DomHTMLCollection ret = new DomHTMLCollection(this, this);
-    ret.addNodeName(name);
-    ret.evaluate();
-    return ret;
-    // TODO xhtml: return only form controls (?)
-  }
-
-  public Element createElement(String tagName)
-  {
-    return createElementNS(null, tagName);
-  }
-
-  public Element createElementNS(String uri, String qName)
-  {
-    /* If a non-HTML element, use the default implementation. */
-    if (uri != null && !HTML_NS_URIS.contains(uri))
-      {
-        return super.createElementNS(uri, qName);
-      }
-    String localName = qName.toLowerCase();
-    int ci = qName.indexOf(':');
-    if (ci != -1)
-      {
-        localName = qName.substring(ci + 1);
-      }
-    Class t = (Class) ELEMENT_CLASSES.get(localName);
-    /* If a non-HTML element, use the default implementation. */
-    if (t == null)
-      {
-        return super.createElementNS(uri, qName);
-      }
-    try
-      {
-        Constructor c = t.getDeclaredConstructor(ELEMENT_PT);
-        Object[] args = new Object[] { this, uri, qName };
-        return (Element) c.newInstance(args);
-      }
-    catch (Exception e)
-      {
-        DOMException e2 = new DomDOMException(DOMException.TYPE_MISMATCH_ERR);
-        e2.initCause(e);
-        throw e2;
-      }
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java
deleted file mode 100644
index deeefec..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/* DomHTMLElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDOMException;
-import gnu.xml.dom.DomElement;
-import gnu.xml.dom.DomEvent;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.events.UIEvent;
-import org.w3c.dom.html2.HTMLElement;
-
-/**
- * Abstract implementation of an HTML element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public abstract class DomHTMLElement
-  extends DomElement
-  implements HTMLElement
-{
-
-  protected DomHTMLElement(DomHTMLDocument owner, String namespaceURI,
-                           String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  /**
-   * Returns the value of the specified attribute.
-   * The attribute name is case insensitive.
-   */
-  protected String getHTMLAttribute(String name)
-  {
-    if (hasAttributes())
-      {
-        NamedNodeMap attrs = getAttributes();
-        int len = attrs.getLength();
-        for (int i = 0; i < len; i++)
-          {
-            Node attr = attrs.item(i);
-            String attrName = attr.getLocalName();
-            if (attrName == null)
-              {
-                attrName = attr.getNodeName();
-              }
-            if (attrName.equalsIgnoreCase(name))
-              {
-                return attr.getNodeValue();
-              }
-          }
-      }
-    return "";
-  }
-
-  protected int getIntHTMLAttribute(String name)
-  {
-    String value = getHTMLAttribute(name);
-    if (value == null)
-      {
-        return -1;
-      }
-    try
-      {
-        return Integer.parseInt(value);
-      }
-    catch (NumberFormatException e)
-      {
-        return -1;
-      }
-  }
-
-  protected boolean getBooleanHTMLAttribute(String name)
-  {
-    String value = getHTMLAttribute(name);
-    return value != null;
-  }
-
-  /**
-   * Sets the value of the specified attribute.
-   * The attribute name is case insensitive.
-   */
-  protected void setHTMLAttribute(String name, String value)
-  {
-    Node attr;
-    NamedNodeMap attrs = getAttributes();
-    int len = attrs.getLength();
-    for (int i = 0; i < len; i++)
-      {
-        attr = attrs.item(i);
-        String attrName = attr.getLocalName();
-        if (attrName == null)
-          {
-            attrName = attr.getNodeName();
-          }
-        if (attrName.equalsIgnoreCase(name))
-          {
-            if (value != null)
-              {
-                attr.setNodeValue(value);
-              }
-            else
-              {
-                attrs.removeNamedItem(attr.getNodeName());
-              }
-            return;
-          }
-      }
-    if (value != null)
-      {
-        // Create a new attribute
-        DomHTMLDocument doc = (DomHTMLDocument) getOwnerDocument();
-        // XXX namespace URI for attribute?
-        attr = doc.createAttribute(name);
-        attr.setNodeValue(value);
-      }
-  }
-
-  protected void setIntHTMLAttribute(String name, int value)
-  {
-    setHTMLAttribute(name, Integer.toString(value));
-  }
-
-  protected void setBooleanHTMLAttribute(String name, boolean value)
-  {
-    setHTMLAttribute(name, value ? name : null);
-  }
-
-  /**
-   * Returns the first parent element with the specified name.
-   */
-  protected Node getParentElement(String name)
-  {
-    for (Node parent = getParentNode(); parent != null;
-         parent = parent.getParentNode())
-      {
-        String parentName = parent.getLocalName();
-        if (parentName == null)
-          {
-              parentName = parent.getNodeName();
-          }
-        if (name.equalsIgnoreCase(parentName))
-          {
-            return parent;
-          }
-      }
-    return null;
-  }
-
-  /**
-   * Returns the first child element with the specified name.
-   */
-  protected Node getChildElement(String name)
-  {
-    for (Node child = getFirstChild(); child != null;
-         child = child.getNextSibling())
-      {
-        String childName = child.getLocalName();
-        if (childName == null)
-          {
-            childName = child.getLocalName();
-          }
-        if (name.equalsIgnoreCase(childName))
-          {
-            return child;
-          }
-      }
-    return null;
-  }
-
-  /**
-   * Returns the index of this element among elements of the same name,
-   * relative to its parent.
-   */
-  protected int getIndex()
-  {
-    int index = 0;
-    Node parent = getParentNode();
-    if (parent != null)
-      {
-        for (Node ctx = parent.getFirstChild(); ctx != null;
-             ctx = ctx.getNextSibling())
-          {
-            if (ctx == this)
-              {
-                return index;
-              }
-            index++;
-          }
-      }
-    throw new DomDOMException(DOMException.NOT_FOUND_ERR);
-  }
-
-  protected void dispatchUIEvent(String name)
-  {
-    UIEvent event = new DomEvent.DomUIEvent(name);
-    dispatchEvent(event);
-  }
-
-  public String getId()
-  {
-    return getHTMLAttribute("id");
-  }
-
-  public void setId(String id)
-  {
-    setHTMLAttribute("id", id);
-  }
-
-  public String getTitle()
-  {
-    return getHTMLAttribute("title");
-  }
-
-  public void setTitle(String title)
-  {
-    setHTMLAttribute("title", title);
-  }
-
-  public String getLang()
-  {
-    return getHTMLAttribute("lang");
-  }
-
-  public void setLang(String lang)
-  {
-    setHTMLAttribute("lang", lang);
-  }
-
-  public String getDir()
-  {
-    return getHTMLAttribute("dir");
-  }
-
-  public void setDir(String dir)
-  {
-    setHTMLAttribute("dir", dir);
-  }
-
-  public String getClassName()
-  {
-    return getHTMLAttribute("class");
-  }
-
-  public void setClassName(String className)
-  {
-    setHTMLAttribute("class", className);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java
deleted file mode 100644
index 2211315..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* DomHTMLEmbedElement.java --
-   Copyright (C) 2006 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.xml.dom.html2;
-
-public class DomHTMLEmbedElement
-    extends DomHTMLAppletElement
-{
-  protected DomHTMLEmbedElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getJavaObject()
-  {
-    return getHTMLAttribute("java_object");
-  }
-
-  public void setJavaObject(String object)
-  {
-    setHTMLAttribute("java_object", object);
-  }
-
-  public String getJavaCodeBase()
-  {
-    return getHTMLAttribute("java_codebase");
-  }
-
-  public void setJavaCodeBase(String codeBase)
-  {
-    setHTMLAttribute("java_codebase", codeBase);
-  }
-
-  public String getJavaArchive()
-  {
-    return getHTMLAttribute("java_archive");
-  }
-
-  public void setJavaArchive(String archive)
-  {
-    setHTMLAttribute("java_archive", archive);
-  }
-
-  public void setJavaCode(String code)
-  {
-    setHTMLAttribute("java_code", code);
-  }
-
-  public String getJavaCode()
-  {
-    return getHTMLAttribute("java_code");
-  }
-
-  public void setJavaType(String type)
-  {
-    setHTMLAttribute("java_type", type);
-  }
-
-  public String getJavaType()
-  {
-    return getHTMLAttribute("java_type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public String getPluginsPage()
-  {
-    return getHTMLAttribute("pluginspage");
-  }
-
-  public void setPluginsPage(String pluginspage)
-  {
-    setHTMLAttribute("pluginspage", pluginspage);
-  }
-
-  public String getMayscript()
-  {
-    return getHTMLAttribute("mayscript");
-  }
-
-  public void setMayscript(String mayscript)
-  {
-    setHTMLAttribute("mayscript", mayscript);
-  }
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java
deleted file mode 100644
index 252cd3d..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* DomHTMLFieldSetElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFieldSetElement;
-import org.w3c.dom.html2.HTMLFormElement;
-
-/**
- * An HTML 'FIELDSET' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLFieldSetElement
-  extends DomHTMLElement
-  implements HTMLFieldSetElement
-{
-
-  protected DomHTMLFieldSetElement(DomHTMLDocument owner, String namespaceURI,
-                                   String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java
deleted file mode 100644
index 5bfbb6f..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* DomHTMLFontElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFontElement;
-
-/**
- * An HTML 'FONT' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLFontElement
-  extends DomHTMLElement
-  implements HTMLFontElement
-{
-
-  protected DomHTMLFontElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getColor()
-  {
-    return getHTMLAttribute("color");
-  }
-
-  public void setColor(String color)
-  {
-    setHTMLAttribute("color", color);
-  }
-
-  public String getFace()
-  {
-    return getHTMLAttribute("face");
-  }
-
-  public void setFace(String face)
-  {
-    setHTMLAttribute("face", face);
-  }
-
-  public String getSize()
-  {
-    return getHTMLAttribute("size");
-  }
-
-  public void setSize(String size)
-  {
-    setHTMLAttribute("size", size);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java
deleted file mode 100644
index 9fe2ae8..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* DomHTMLFormElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLFormElement;
-
-/**
- * An HTML 'FORM' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLFormElement
-  extends DomHTMLElement
-  implements HTMLFormElement
-{
-
-  protected DomHTMLFormElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLCollection getElements()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("input");
-    ret.addNodeName("button");
-    ret.addNodeName("select");
-    ret.addNodeName("textarea");
-    ret.addNodeName("isindex");
-    ret.addNodeName("label");
-    ret.addNodeName("option");
-    ret.evaluate();
-    return ret;
-  }
-
-  public int getLength()
-  {
-    return getElements().getLength();
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getAcceptCharset()
-  {
-    return getHTMLAttribute("accept-charset");
-  }
-
-  public void setAcceptCharset(String acceptCharset)
-  {
-    setHTMLAttribute("accept-charset", acceptCharset);
-  }
-
-  public String getAction()
-  {
-    return getHTMLAttribute("action");
-  }
-
-  public void setAction(String action)
-  {
-    setHTMLAttribute("action", action);
-  }
-
-  public String getEnctype()
-  {
-    return getHTMLAttribute("enctype");
-  }
-
-  public void setEnctype(String enctype)
-  {
-    setHTMLAttribute("enctype", enctype);
-  }
-
-  public String getMethod()
-  {
-    return getHTMLAttribute("method");
-  }
-
-  public void setMethod(String method)
-  {
-    setHTMLAttribute("method", method);
-  }
-
-  public String getTarget()
-  {
-    return getHTMLAttribute("target");
-  }
-
-  public void setTarget(String target)
-  {
-    setHTMLAttribute("target", target);
-  }
-
-  public void submit()
-  {
-    dispatchUIEvent("submit");
-  }
-
-  public void reset()
-  {
-    dispatchUIEvent("reset");
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java
deleted file mode 100644
index 2465c4b..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* DomHTMLFrameElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.html2.HTMLFrameElement;
-
-/**
- * An HTML 'FRAME' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLFrameElement
-  extends DomHTMLElement
-  implements HTMLFrameElement
-{
-
-  protected DomHTMLFrameElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getFrameBorder()
-  {
-    return getHTMLAttribute("frameborder");
-  }
-
-  public void setFrameBorder(String frameBorder)
-  {
-    setHTMLAttribute("frameborder", frameBorder);
-  }
-
-  public String getLongDesc()
-  {
-    return getHTMLAttribute("longdesc");
-  }
-
-  public void setLongDesc(String longDesc)
-  {
-    setHTMLAttribute("longdesc", longDesc);
-  }
-
-  public String getMarginHeight()
-  {
-    return getHTMLAttribute("marginheight");
-  }
-
-  public void setMarginHeight(String marginHeight)
-  {
-    setHTMLAttribute("marginheight", marginHeight);
-  }
-
-  public String getMarginWidth()
-  {
-    return getHTMLAttribute("marginwidth");
-  }
-
-  public void setMarginWidth(String marginWidth)
-  {
-    setHTMLAttribute("marginwidth", marginWidth);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public boolean getNoResize()
-  {
-    return getBooleanHTMLAttribute("noresize");
-  }
-
-  public void setNoResize(boolean noResize)
-  {
-    setBooleanHTMLAttribute("noresize", noResize);
-  }
-
-  public String getScrolling()
-  {
-    return getHTMLAttribute("scrolling");
-  }
-
-  public void setScrolling(String scrolling)
-  {
-    setHTMLAttribute("scrolling", scrolling);
-  }
-
-  public String getSrc()
-  {
-    return getHTMLAttribute("src");
-  }
-
-  public void setSrc(String src)
-  {
-    setHTMLAttribute("src", src);
-  }
-
-  public Document getContentDocument()
-  {
-    // TODO getContentDocument
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java
deleted file mode 100644
index dae9430..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLFrameSetElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFrameSetElement;
-
-/**
- * An HTML 'FRAMESET' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLFrameSetElement
-  extends DomHTMLElement
-  implements HTMLFrameSetElement
-{
-
-  protected DomHTMLFrameSetElement(DomHTMLDocument owner, String namespaceURI,
-                                   String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getCols()
-  {
-    return getHTMLAttribute("cols");
-  }
-
-  public void setCols(String cols)
-  {
-    setHTMLAttribute("cols", cols);
-  }
-
-  public String getRows()
-  {
-    return getHTMLAttribute("rows");
-  }
-
-  public void setRows(String rows)
-  {
-    setHTMLAttribute("rows", rows);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java
deleted file mode 100644
index e27ef55..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* DomHTMLHRElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLHRElement;
-
-/**
- * An HTML 'HR' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLHRElement
-  extends DomHTMLElement
-  implements HTMLHRElement
-{
-
-  protected DomHTMLHRElement(DomHTMLDocument owner, String namespaceURI,
-                             String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public boolean getNoShade()
-  {
-    return getBooleanHTMLAttribute("noshade");
-  }
-
-  public void setNoShade(boolean noShade)
-  {
-    setBooleanHTMLAttribute("noshade", noShade);
-  }
-
-  public String getSize()
-  {
-    return getHTMLAttribute("size");
-  }
-
-  public void setSize(String size)
-  {
-    setHTMLAttribute("size", size);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java
deleted file mode 100644
index 4a8ef995..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLHeadElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLHeadElement;
-
-/**
- * An HTML 'HEAD' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLHeadElement
-  extends DomHTMLElement
-  implements HTMLHeadElement
-{
-
-  protected DomHTMLHeadElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getProfile()
-  {
-    return getHTMLAttribute("profile");
-  }
-
-  public void setProfile(String profile)
-  {
-    setHTMLAttribute("profile", profile);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java
deleted file mode 100644
index 6e78e90..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLHeadingElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLHeadingElement;
-
-/**
- * An HTML 'H1', 'H2', 'H3', 'H4', 'H5', or 'H6' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLHeadingElement
-  extends DomHTMLElement
-  implements HTMLHeadingElement
-{
-
-  protected DomHTMLHeadingElement(DomHTMLDocument owner, String namespaceURI,
-                                  String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java
deleted file mode 100644
index 73f7243..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLHtmlElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLHtmlElement;
-
-/**
- * An HTML 'HTML' top-level element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLHtmlElement
-  extends DomHTMLElement
-  implements HTMLHtmlElement
-{
-
-  protected DomHTMLHtmlElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getVersion()
-  {
-    return getHTMLAttribute("version");
-  }
-
-  public void setVersion(String version)
-  {
-    setHTMLAttribute("version", version);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java
deleted file mode 100644
index 1a58fb7..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* DomHTMLIFrameElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.html2.HTMLIFrameElement;
-
-/**
- * An HTML 'IFRAME' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLIFrameElement
-  extends DomHTMLElement
-  implements HTMLIFrameElement
-{
-
-  protected DomHTMLIFrameElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getFrameBorder()
-  {
-    return getHTMLAttribute("frameborder");
-  }
-
-  public void setFrameBorder(String frameBorder)
-  {
-    setHTMLAttribute("frameborder", frameBorder);
-  }
-
-  public String getHeight()
-  {
-    return getHTMLAttribute("height");
-  }
-
-  public void setHeight(String height)
-  {
-    setHTMLAttribute("height", height);
-  }
-
-  public String getLongDesc()
-  {
-    return getHTMLAttribute("longdesc");
-  }
-
-  public void setLongDesc(String longDesc)
-  {
-    setHTMLAttribute("longdesc", longDesc);
-  }
-
-  public String getMarginHeight()
-  {
-    return getHTMLAttribute("marginheight");
-  }
-
-  public void setMarginHeight(String marginHeight)
-  {
-    setHTMLAttribute("marginheight", marginHeight);
-  }
-
-  public String getMarginWidth()
-  {
-    return getHTMLAttribute("marginwidth");
-  }
-
-  public void setMarginWidth(String marginWidth)
-  {
-    setHTMLAttribute("marginwidth", marginWidth);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getScrolling()
-  {
-    return getHTMLAttribute("scrolling");
-  }
-
-  public void setScrolling(String scrolling)
-  {
-    setHTMLAttribute("scrolling", scrolling);
-  }
-
-  public String getSrc()
-  {
-    return getHTMLAttribute("src");
-  }
-
-  public void setSrc(String src)
-  {
-    setHTMLAttribute("src", src);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-
-  public Document getContentDocument()
-  {
-    // TODO getContentDocument
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java
deleted file mode 100644
index c5d294c..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* DomHTMLImageElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLImageElement;
-
-/**
- * An HTML 'IMG' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLImageElement
-  extends DomHTMLElement
-  implements HTMLImageElement
-{
-
-  protected DomHTMLImageElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getAlt()
-  {
-    return getHTMLAttribute("alt");
-  }
-
-  public void setAlt(String alt)
-  {
-    setHTMLAttribute("alt", alt);
-  }
-
-  public String getBorder()
-  {
-    return getHTMLAttribute("border");
-  }
-
-  public void setBorder(String border)
-  {
-    setHTMLAttribute("border", border);
-  }
-
-  public int getHeight()
-  {
-    return getIntHTMLAttribute("height");
-  }
-
-  public void setHeight(int height)
-  {
-    setIntHTMLAttribute("height", height);
-  }
-
-  public int getHspace()
-  {
-    return getIntHTMLAttribute("hspace");
-  }
-
-  public void setHspace(int hspace)
-  {
-    setIntHTMLAttribute("hspace", hspace);
-  }
-
-  public boolean getIsMap()
-  {
-    return getBooleanHTMLAttribute("ismap");
-  }
-
-  public void setIsMap(boolean isMap)
-  {
-    setBooleanHTMLAttribute("ismap", isMap);
-  }
-
-  public String getLongDesc()
-  {
-    return getHTMLAttribute("longdesc");
-  }
-
-  public void setLongDesc(String longDesc)
-  {
-    setHTMLAttribute("longdesc", longDesc);
-  }
-
-  public String getSrc()
-  {
-    return getHTMLAttribute("src");
-  }
-
-  public void setSrc(String src)
-  {
-    setHTMLAttribute("src", src);
-  }
-
-  public String getUseMap()
-  {
-    return getHTMLAttribute("usemap");
-  }
-
-  public void setUseMap(String useMap)
-  {
-    setHTMLAttribute("usemap", useMap);
-  }
-
-  public int getVspace()
-  {
-    return getIntHTMLAttribute("vspace");
-  }
-
-  public void setVspace(int vspace)
-  {
-    setIntHTMLAttribute("vspace", vspace);
-  }
-
-  public int getWidth()
-  {
-    return getIntHTMLAttribute("width");
-  }
-
-  public void setWidth(int width)
-  {
-    setIntHTMLAttribute("width", width);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java
deleted file mode 100644
index a5faee5..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* DomHTMLImpl.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomImpl;
-import org.w3c.dom.Document;
-
-/**
- * Specialised DOMImplementation for creating HTML documents.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLImpl
-  extends DomImpl
-{
-
-  protected Document createDocument()
-  {
-    return new DomHTMLDocument(this);
-  }
-
-  public Object getFeature(String feature, String version)
-  {
-    if (hasFeature(feature, version))
-      {
-        return this;
-      }
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java
deleted file mode 100644
index 2120188..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/* DomHTMLInputElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLInputElement;
-
-/**
- * An HTML 'INPUT' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLInputElement
-  extends DomHTMLElement
-  implements HTMLInputElement
-{
-
-  protected String value;
-  protected Boolean checked;
-
-  protected DomHTMLInputElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getDefaultValue()
-  {
-    return getHTMLAttribute("value");
-  }
-
-  public void setDefaultValue(String defaultValue)
-  {
-    setHTMLAttribute("value", defaultValue);
-  }
-
-  public boolean getDefaultChecked()
-  {
-    return getBooleanHTMLAttribute("checked");
-  }
-
-  public void setDefaultChecked(boolean defaultChecked)
-  {
-    setBooleanHTMLAttribute("checked", defaultChecked);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getAccept()
-  {
-    return getHTMLAttribute("accept");
-  }
-
-  public void setAccept(String accept)
-  {
-    setHTMLAttribute("accept", accept);
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getAlt()
-  {
-    return getHTMLAttribute("alt");
-  }
-
-  public void setAlt(String alt)
-  {
-    setHTMLAttribute("alt", alt);
-  }
-
-  public boolean getChecked()
-  {
-    if (checked == null)
-      {
-        checked = Boolean.valueOf(getDefaultChecked());
-      }
-    return checked.booleanValue();
-  }
-
-  public void setChecked(boolean checked)
-  {
-    this.checked = Boolean.valueOf(checked);
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public int getMaxLength()
-  {
-    return getIntHTMLAttribute("maxLength");
-  }
-
-  public void setMaxLength(int maxLength)
-  {
-    setIntHTMLAttribute("maxLength", maxLength);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public boolean getReadOnly()
-  {
-    return getBooleanHTMLAttribute("readonly");
-  }
-
-  public void setReadOnly(boolean readOnly)
-  {
-    setBooleanHTMLAttribute("readonly", readOnly);
-  }
-
-  public int getSize()
-  {
-    return getIntHTMLAttribute("size");
-  }
-
-  public void setSize(int size)
-  {
-    setIntHTMLAttribute("size", size);
-  }
-
-  public String getSrc()
-  {
-    return getHTMLAttribute("src");
-  }
-
-  public void setSrc(String src)
-  {
-    setHTMLAttribute("src", src);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-  public String getUseMap()
-  {
-    return getHTMLAttribute("usemap");
-  }
-
-  public void setUseMap(String useMap)
-  {
-    setHTMLAttribute("usemap", useMap);
-  }
-
-  public String getValue()
-  {
-    if (value == null)
-      {
-        value = getDefaultValue();
-      }
-    return value;
-  }
-
-  public void setValue(String value)
-  {
-    this.value = value;
-  }
-
-  public void blur()
-  {
-    dispatchUIEvent("blur");
-  }
-
-  public void focus()
-  {
-    dispatchUIEvent("focus");
-  }
-
-  public void select()
-  {
-    dispatchUIEvent("select");
-  }
-
-  public void click()
-  {
-    dispatchUIEvent("click");
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java
deleted file mode 100644
index 8578cb6..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* DomHTMLIsIndexElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLIsIndexElement;
-
-/**
- * An HTML 'ISINDEX' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLIsIndexElement
-  extends DomHTMLElement
-  implements HTMLIsIndexElement
-{
-
-  protected DomHTMLIsIndexElement(DomHTMLDocument owner, String namespaceURI,
-                                  String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getPrompt()
-  {
-    return getHTMLAttribute("prompt");
-  }
-
-  public void setPrompt(String prompt)
-  {
-    setHTMLAttribute("prompt", prompt);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java
deleted file mode 100644
index cab1412..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLLIElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLLIElement;
-
-/**
- * An HTML 'LI' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLLIElement
-  extends DomHTMLElement
-  implements HTMLLIElement
-{
-
-  protected DomHTMLLIElement(DomHTMLDocument owner, String namespaceURI,
-                             String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-  public int getValue()
-  {
-    return getIntHTMLAttribute("value");
-  }
-
-  public void setValue(int value)
-  {
-    setIntHTMLAttribute("value", value);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java
deleted file mode 100644
index 96cfbaa..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* DomHTMLLabelElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLLabelElement;
-
-/**
- * An HTML 'LABEL' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLLabelElement
-  extends DomHTMLElement
-  implements HTMLLabelElement
-{
-
-  protected DomHTMLLabelElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public String getHtmlFor()
-  {
-    return getHTMLAttribute("for");
-  }
-
-  public void setHtmlFor(String htmlFor)
-  {
-    setHTMLAttribute("for", htmlFor);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java
deleted file mode 100644
index 045861c..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* DomHTMLLegendElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLLegendElement;
-
-/**
- * An HTML 'LEGEND' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLLegendElement
-  extends DomHTMLElement
-  implements HTMLLegendElement
-{
-
-  protected DomHTMLLegendElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java
deleted file mode 100644
index 292ec93..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/* DomHTMLLinkElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLLinkElement;
-
-/**
- * An HTML 'LINK' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLLinkElement
-  extends DomHTMLElement
-  implements HTMLLinkElement
-{
-
-  protected DomHTMLLinkElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public String getCharset()
-  {
-    return getHTMLAttribute("charset");
-  }
-
-  public void setCharset(String charset)
-  {
-    setHTMLAttribute("charset", charset);
-  }
-
-  public String getHref()
-  {
-    return getHTMLAttribute("href");
-  }
-
-  public void setHref(String href)
-  {
-    setHTMLAttribute("href", href);
-  }
-
-  public String getHreflang()
-  {
-    return getHTMLAttribute("hreflang");
-  }
-
-  public void setHreflang(String hreflang)
-  {
-    setHTMLAttribute("hreflang", hreflang);
-  }
-
-  public String getMedia()
-  {
-    return getHTMLAttribute("media");
-  }
-
-  public void setMedia(String media)
-  {
-    setHTMLAttribute("media", media);
-  }
-
-  public String getRel()
-  {
-    return getHTMLAttribute("rel");
-  }
-
-  public void setRel(String rel)
-  {
-    setHTMLAttribute("rel", rel);
-  }
-
-  public String getRev()
-  {
-    return getHTMLAttribute("rev");
-  }
-
-  public void setRev(String rev)
-  {
-    setHTMLAttribute("rev", rev);
-  }
-
-  public String getTarget()
-  {
-    return getHTMLAttribute("target");
-  }
-
-  public void setTarget(String target)
-  {
-    setHTMLAttribute("target", target);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java
deleted file mode 100644
index 4497b00..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLMapElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLMapElement;
-
-/**
- * An HTML 'MAP' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLMapElement
-  extends DomHTMLElement
-  implements HTMLMapElement
-{
-
-  protected DomHTMLMapElement(DomHTMLDocument owner, String namespaceURI,
-                              String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLCollection getAreas()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("area");
-    ret.evaluate();
-    return ret;
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java
deleted file mode 100644
index 2a6ff08..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLMenuElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLMenuElement;
-
-/**
- * An HTML 'MENU' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLMenuElement
-  extends DomHTMLElement
-  implements HTMLMenuElement
-{
-
-  protected DomHTMLMenuElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getCompact()
-  {
-    return getBooleanHTMLAttribute("compact");
-  }
-
-  public void setCompact(boolean compact)
-  {
-    setBooleanHTMLAttribute("compact", compact);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java
deleted file mode 100644
index e555a42..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* DomHTMLMetaElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLMetaElement;
-
-/**
- * An HTML 'META' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLMetaElement
-  extends DomHTMLElement
-  implements HTMLMetaElement
-{
-
-  protected DomHTMLMetaElement(DomHTMLDocument owner, String namespaceURI,
-                               String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getContent()
-  {
-    return getHTMLAttribute("content");
-  }
-
-  public void setContent(String content)
-  {
-    setHTMLAttribute("content", content);
-  }
-
-  public String getHttpEquiv()
-  {
-    return getHTMLAttribute("http-equiv");
-  }
-
-  public void setHttpEquiv(String httpEquiv)
-  {
-    setHTMLAttribute("http-equiv", httpEquiv);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getScheme()
-  {
-    return getHTMLAttribute("scheme");
-  }
-
-  public void setScheme(String scheme)
-  {
-    setHTMLAttribute("scheme", scheme);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java
deleted file mode 100644
index 8c158f4..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLModElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLModElement;
-
-/**
- * An HTML 'INS' or 'DEL' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLModElement
-  extends DomHTMLElement
-  implements HTMLModElement
-{
-
-  protected DomHTMLModElement(DomHTMLDocument owner, String namespaceURI,
-                              String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getCite()
-  {
-    return getHTMLAttribute("cite");
-  }
-
-  public void setCite(String cite)
-  {
-    setHTMLAttribute("cite", cite);
-  }
-
-  public String getDateTime()
-  {
-    return getHTMLAttribute("datetime");
-  }
-
-  public void setDateTime(String dateTime)
-  {
-    setHTMLAttribute("datetime", dateTime);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java
deleted file mode 100644
index 54f7fd4..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* DomHTMLOListElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLOListElement;
-
-/**
- * An HTML 'OL' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLOListElement
-  extends DomHTMLElement
-  implements HTMLOListElement
-{
-
-  protected DomHTMLOListElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getCompact()
-  {
-    return getBooleanHTMLAttribute("compact");
-  }
-
-  public void setCompact(boolean compact)
-  {
-    setBooleanHTMLAttribute("compact", compact);
-  }
-
-  public int getStart()
-  {
-    return getIntHTMLAttribute("start");
-  }
-
-  public void setStart(int start)
-  {
-    setIntHTMLAttribute("start", start);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java
deleted file mode 100644
index 2ce5f45..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/* DomHTMLObjectElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLObjectElement;
-
-/**
- * An HTML 'OBJECT' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLObjectElement
-  extends DomHTMLElement
-  implements HTMLObjectElement
-{
-
-  protected DomHTMLObjectElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getCode()
-  {
-    return getHTMLAttribute("code");
-  }
-
-  public void setCode(String code)
-  {
-    setHTMLAttribute("code", code);
-  }
-
-  public String getJavaCode()
-  {
-    return getHTMLAttribute("java_code");
-  }
-
-  public void setJavaCode(String code)
-  {
-    setHTMLAttribute("java_code", code);
-  }
-
-  public String getObject()
-  {
-    return getHTMLAttribute("object");
-  }
-
-  public void setObject(String obj)
-  {
-    setHTMLAttribute("object", obj);
-  }
-
-  public String getJavaObject()
-  {
-    return getHTMLAttribute("java_object");
-  }
-
-  public void setJavaObject(String obj)
-  {
-    setHTMLAttribute("java_object", obj);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getArchive()
-  {
-    return getHTMLAttribute("archive");
-  }
-
-  public void setArchive(String archive)
-  {
-    setHTMLAttribute("archive", archive);
-  }
-
-  public String getJavaArchive()
-  {
-    return getHTMLAttribute("java_archive");
-  }
-
-  public void setJavaArchive(String archive)
-  {
-    setHTMLAttribute("java_archive", archive);
-  }
-
-  public String getBorder()
-  {
-    return getHTMLAttribute("border");
-  }
-
-  public void setBorder(String border)
-  {
-    setHTMLAttribute("border", border);
-  }
-
-  public String getCodeBase()
-  {
-    return getHTMLAttribute("codebase");
-  }
-
-  public void setCodeBase(String codeBase)
-  {
-    setHTMLAttribute("codebase", codeBase);
-  }
-
-  public String getJavaCodeBase()
-  {
-    return getHTMLAttribute("java_codebase");
-  }
-
-  public void setJavaCodeBase(String codeBase)
-  {
-    setHTMLAttribute("java_codebase", codeBase);
-  }
-
-  public String getCodeType()
-  {
-    return getHTMLAttribute("codetype");
-  }
-
-  public void setCodeType(String codeType)
-  {
-    setHTMLAttribute("codetype", codeType);
-  }
-
-  public String getData()
-  {
-    return getHTMLAttribute("data");
-  }
-
-  public void setData(String data)
-  {
-    setHTMLAttribute("data", data);
-  }
-
-  public boolean getDeclare()
-  {
-    return getBooleanHTMLAttribute("declare");
-  }
-
-  public void setDeclare(boolean declare)
-  {
-    setBooleanHTMLAttribute("declare", declare);
-  }
-
-  public String getHeight()
-  {
-    return getHTMLAttribute("height");
-  }
-
-  public void setHeight(String height)
-  {
-    setHTMLAttribute("height", height);
-  }
-
-  public int getHspace()
-  {
-    return getIntHTMLAttribute("hspace");
-  }
-
-  public void setHspace(int hspace)
-  {
-    setIntHTMLAttribute("hspace", hspace);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getStandby()
-  {
-    return getHTMLAttribute("standby");
-  }
-
-  public void setStandby(String standby)
-  {
-    setHTMLAttribute("standby", standby);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-  public String getJavaType()
-  {
-    return getHTMLAttribute("java_type");
-  }
-
-  public void setJavaType(String type)
-  {
-    setHTMLAttribute("java_type", type);
-  }
-
-  public String getUseMap()
-  {
-    return getHTMLAttribute("usemap");
-  }
-
-  public void setUseMap(String useMap)
-  {
-    setHTMLAttribute("usemap", useMap);
-  }
-
-  public int getVspace()
-  {
-    return getIntHTMLAttribute("vspace");
-  }
-
-  public void setVspace(int vspace)
-  {
-    setIntHTMLAttribute("vspace", vspace);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-
-  public Document getContentDocument()
-  {
-    // TODO getContentDocument
-    return null;
-  }
-
-  public void setMayscript(String may)
-  {
-    setHTMLAttribute("mayscript", may);
-  }
-
-  public String getMayscript()
-  {
-    return getHTMLAttribute("mayscript");
-  }
-
-  public void setScriptable(String scr)
-  {
-    setHTMLAttribute("scriptable", scr);
-  }
-
-  public String getScriptable()
-  {
-    return getHTMLAttribute("scriptable");
-  }
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java
deleted file mode 100644
index acb9484..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLOptGroupElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLOptGroupElement;
-
-/**
- * An HTML 'OPTGROUP' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLOptGroupElement
-  extends DomHTMLElement
-  implements HTMLOptGroupElement
-{
-
-  protected DomHTMLOptGroupElement(DomHTMLDocument owner, String namespaceURI,
-                             String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public String getLabel()
-  {
-    return getHTMLAttribute("label");
-  }
-
-  public void setLabel(String label)
-  {
-    setHTMLAttribute("label", label);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java
deleted file mode 100644
index f775c13..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* DomHTMLOptionElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLOptionElement;
-
-/**
- * An HTML 'OPTION' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLOptionElement
-  extends DomHTMLElement
-  implements HTMLOptionElement
-{
-
-  protected Boolean selected;
-
-  protected DomHTMLOptionElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public boolean getDefaultSelected()
-  {
-    return getBooleanHTMLAttribute("selected");
-  }
-
-  public void setDefaultSelected(boolean defaultSelected)
-  {
-    setBooleanHTMLAttribute("selected", defaultSelected);
-  }
-
-  public String getText()
-  {
-    return getTextContent();
-  }
-
-  public int getIndex()
-  {
-    return super.getIndex();
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public String getLabel()
-  {
-    return getHTMLAttribute("label");
-  }
-
-  public void setLabel(String label)
-  {
-    setHTMLAttribute("label", label);
-  }
-
-  public boolean getSelected()
-  {
-    if (selected == null)
-      {
-        selected = Boolean.valueOf(getDefaultSelected());
-      }
-    return selected.booleanValue();
-  }
-
-  public void setSelected(boolean selected)
-  {
-    this.selected = Boolean.valueOf(selected);
-  }
-
-  public String getValue()
-  {
-    return getHTMLAttribute("value");
-  }
-
-  public void setValue(String value)
-  {
-    setHTMLAttribute("value", value);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java
deleted file mode 100644
index 4c867fd..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLParagraphElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLParagraphElement;
-
-/**
- * An HTML 'P' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLParagraphElement
-  extends DomHTMLElement
-  implements HTMLParagraphElement
-{
-
-  protected DomHTMLParagraphElement(DomHTMLDocument owner, String namespaceURI,
-                                    String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java
deleted file mode 100644
index cdd74ad..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* DomHTMLParamElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLParamElement;
-
-/**
- * An HTML 'PARAM' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLParamElement
-  extends DomHTMLElement
-  implements HTMLParamElement
-{
-
-  protected DomHTMLParamElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-  public String getValue()
-  {
-    return getHTMLAttribute("value");
-  }
-
-  public void setValue(String value)
-  {
-    setHTMLAttribute("value", value);
-  }
-
-  public String getValueType()
-  {
-    return getHTMLAttribute("valuetype");
-  }
-
-  public void setValueType(String valueType)
-  {
-    setHTMLAttribute("valuetype", valueType);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java
deleted file mode 100644
index 88656d2..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/* DomHTMLParser.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import javax.swing.text.AttributeSet;
-import javax.swing.text.html.HTML;
-import javax.swing.text.html.parser.DTD;
-import javax.swing.text.html.parser.TagElement;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.html2.HTMLDocument;
-
-/**
- * This parser reads HTML from the given stream and stores into
- * {@link HTMLDocument}. The HTML tag becomes the {@link Node}.
- * The tag attributes become the node attributes. The text inside
- * HTML tag is inserted as one or several text nodes. The nested
- * HTML tags are inserted as child nodes.
- *
- * If the strict tree structure, closing the tag means closing all
- * nested tags. To work around this, this parser closes the nested
- * tags and immediately reopens them after the closed tag.
- * In this way, <code>&lt;b&gt;&lt;i&gt;c&lt;/b&gt;d</code>
- * is parsed as <code>&lt;b&gt;&lt;i&gt;c&lt;/i&gt;&lt;/b&gt;&lt;i&gt;d</code> .
- *
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
- */
-public class DomHTMLParser
-  extends gnu.javax.swing.text.html.parser.support.Parser
-{
-  /**
-   * The target where HTML document will be inserted.
-   */
-  protected DomHTMLDocument document;
-
-  /**
-   * The subsequently created new nodes will be inserted as the
-   * childs of this cursor.
-   */
-  protected Node cursor;
-
-  /**
-   * Create parser using the given DTD.
-   *
-   * @param dtd the DTD (for example,
-   * {@link gnu.javax.swing.text.html.parser.HTML_401F}).
-   */
-  public DomHTMLParser(DTD dtd)
-  {
-    super(dtd);
-  }
-
-  /**
-   * Parse SGML insertion ( &lt;! ... &gt; ).
-   * Currently just treats it as comment.
-   */
-  public boolean parseMarkupDeclarations(StringBuffer strBuff)
-                                  throws java.io.IOException
-  {
-    Node c = document.createComment(strBuff.toString());
-    cursor.appendChild(c);
-    return false;
-  }
-
-  /**
-   * Read the document, present in the given stream, and
-   * return the corresponding {@link HTMLDocument}.
-   *
-   * @param input a stream to read from.
-   * @return a document, reflecting the structure of the provided HTML
-   * text.
-   *
-   * @throws IOException if the reader throws one.
-   */
-  public HTMLDocument parseDocument(Reader input)
-                    throws IOException
-  {
-    try
-      {
-        document = new DomHTMLDocument();
-        document.setCheckWellformedness(false);
-        document.setCheckingCharacters(false);
-
-        cursor = document;
-
-        parse(input);
-
-        DomHTMLDocument h = document;
-        document = null;
-        return h;
-      }
-    catch (Exception ex)
-      {
-        ex.printStackTrace();
-        throw new IOException("Exception: " + ex.getMessage());
-      }
-  }
-
-  /**
-   * Create a new node.
-   * @param name the name of node, case insensitive.
-   * @return the created node.
-   */
-  protected Node createNode(String name)
-  {
-    Node new_node = document.createElement(name.toLowerCase());
-    AttributeSet hatts = getAttributes();
-    NamedNodeMap natts = new_node.getAttributes();
-
-    Enumeration enumeration = hatts.getAttributeNames();
-    Object key;
-    Node attribute;
-
-    while (hatts != null)
-      {
-        while (enumeration.hasMoreElements())
-          {
-            key = enumeration.nextElement();
-            attribute = document.createAttribute(key.toString());
-            attribute.setNodeValue(hatts.getAttribute(key).toString());
-            natts.setNamedItem(attribute);
-          }
-
-        // The default values are stored in a parent node.
-        hatts = hatts.getResolveParent();
-      }
-
-    return new_node;
-  }
-
-  /**
-   * Handle comment by inserting the comment node.
-   * @param text the comment text.
-   */
-  protected void handleComment(char[] text)
-  {
-    Node c = document.createComment(new String(text));
-    cursor.appendChild(c);
-  }
-
-  /**
-   * Handle the tag with no content.
-   * @param tag the tag to handle.
-   */
-  protected void handleEmptyTag(TagElement tag)
-  {
-    String name = tag.getHTMLTag().toString();
-
-    if (name.equalsIgnoreCase("#pcdata"))
-      return;
-
-    Node c = createNode(name);
-    cursor.appendChild(c);
-  }
-
-  /**
-   * Close the given tag. Close and reopen all nested tags.
-   * @param tag the tag to close.
-   */
-  protected void handleEndTag(TagElement tag)
-  {
-    String name = tag.getHTMLTag().toString();
-    String nname = cursor.getNodeName();
-
-    // Closing the current tag.
-    if (nname != null && nname.equalsIgnoreCase(name))
-      {
-        cursor = cursor.getParentNode();
-      }
-    else
-      {
-        Node nCursor = cursor.getParentNode();
-
-        // Remember the opened nodes.
-        LinkedList open = new LinkedList();
-        Node close = cursor;
-        while (close != null && !close.getNodeName().equalsIgnoreCase(name))
-          {
-            if (close != document)
-              open.addFirst(close);
-            close = close.getParentNode();
-          }
-        if (close == null)
-          cursor = document;
-        else
-          cursor = close.getParentNode();
-
-        // Insert the copies of the opened nodes.
-        Iterator iter = open.iterator();
-        while (iter.hasNext())
-          {
-            Node item = (Node) iter.next();
-            cursor.appendChild(item);
-            cursor = item;
-          }
-      }
-  }
-
-  /**
-   * Handle the start tag by inserting the HTML element.
-   * @param tag the tag to handle.
-   */
-  protected void handleStartTag(TagElement tag)
-  {
-    HTML.Tag h = tag.getHTMLTag();
-    Node c = createNode(h.toString());
-    cursor.appendChild(c);
-    cursor = c;
-  }
-
-  /**
-   * Handle text by inserting the text node.
-   * @param text the text to insert.
-   */
-  protected void handleText(char[] text)
-  {
-    Node c = document.createTextNode(text, 0, text.length);
-    cursor.appendChild(c);
-  }
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java
deleted file mode 100644
index 9a51aae..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLPreElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLPreElement;
-
-/**
- * An HTML 'PRE' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLPreElement
-  extends DomHTMLElement
-  implements HTMLPreElement
-{
-
-  protected DomHTMLPreElement(DomHTMLDocument owner, String namespaceURI,
-                             String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public int getWidth()
-  {
-    return getIntHTMLAttribute("width");
-  }
-
-  public void setWidth(int width)
-  {
-    setIntHTMLAttribute("width", width);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java
deleted file mode 100644
index 811aed5..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLQuoteElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLQuoteElement;
-
-/**
- * An HTML 'Q' or 'BLOCKQUOTE' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLQuoteElement
-  extends DomHTMLElement
-  implements HTMLQuoteElement
-{
-
-  protected DomHTMLQuoteElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getCite()
-  {
-    return getHTMLAttribute("cite");
-  }
-
-  public void setCite(String cite)
-  {
-    setHTMLAttribute("cite", cite);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java
deleted file mode 100644
index 1bd7b34..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* DomHTMLScriptElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLScriptElement;
-
-/**
- * An HTML 'SCRIPT' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLScriptElement
-  extends DomHTMLElement
-  implements HTMLScriptElement
-{
-
-  protected DomHTMLScriptElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getText()
-  {
-    return getTextContent();
-  }
-
-  public void setText(String text)
-  {
-    setTextContent(text);
-  }
-
-  public String getHtmlFor()
-  {
-    return getHTMLAttribute("for");
-  }
-
-  public void setHtmlFor(String htmlFor)
-  {
-    setHTMLAttribute("for", htmlFor);
-  }
-
-  public String getEvent()
-  {
-    return getHTMLAttribute("event");
-  }
-
-  public void setEvent(String event)
-  {
-    setHTMLAttribute("event", event);
-  }
-
-  public String getCharset()
-  {
-    return getHTMLAttribute("charset");
-  }
-
-  public void setCharset(String charset)
-  {
-    setHTMLAttribute("charset", charset);
-  }
-
-  public boolean getDefer()
-  {
-    return getBooleanHTMLAttribute("defer");
-  }
-
-  public void setDefer(boolean defer)
-  {
-    setBooleanHTMLAttribute("defer", defer);
-  }
-
-  public String getSrc()
-  {
-    return getHTMLAttribute("src");
-  }
-
-  public void setSrc(String src)
-  {
-    setHTMLAttribute("src", src);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java
deleted file mode 100644
index fc1debb..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* DomHTMLSelectElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDOMException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.html2.HTMLElement;
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLOptionElement;
-import org.w3c.dom.html2.HTMLOptionsCollection;
-import org.w3c.dom.html2.HTMLSelectElement;
-
-/**
- * An HTML 'SELECT' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLSelectElement
-  extends DomHTMLElement
-  implements HTMLSelectElement
-{
-
-  protected DomHTMLSelectElement(DomHTMLDocument owner, String namespaceURI,
-                                 String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public int getSelectedIndex()
-  {
-    HTMLOptionsCollection options = getOptions();
-    int len = options.getLength();
-    for (int i = 0; i < len; i++)
-      {
-        HTMLOptionElement option = (HTMLOptionElement) options.item(i);
-        if (option.getSelected())
-          {
-            return i;
-          }
-      }
-    return -1;
-  }
-
-  public void setSelectedIndex(int selectedIndex)
-  {
-    HTMLOptionsCollection options = getOptions();
-    int len = options.getLength();
-    if (selectedIndex < 0 || selectedIndex >= len)
-      {
-        throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
-      }
-    for (int i = 0; i < len; i++)
-      {
-        HTMLOptionElement option = (HTMLOptionElement) options.item(i);
-        option.setSelected(i == selectedIndex);
-      }
-  }
-
-  public String getValue()
-  {
-    return getHTMLAttribute("value");
-  }
-
-  public void setValue(String value)
-  {
-    setHTMLAttribute("value", value);
-  }
-
-  public int getLength()
-  {
-    return getIntHTMLAttribute("length");
-  }
-
-  public void setLength(int length)
-  {
-    setIntHTMLAttribute("length", length);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public HTMLOptionsCollection getOptions()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("option");
-    ret.evaluate();
-    return ret;
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public boolean getMultiple()
-  {
-    return getBooleanHTMLAttribute("multiple");
-  }
-
-  public void setMultiple(boolean multiple)
-  {
-    setBooleanHTMLAttribute("multiple", multiple);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public int getSize()
-  {
-    return getIntHTMLAttribute("size");
-  }
-
-  public void setSize(int size)
-  {
-    setIntHTMLAttribute("size", size);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public void add(HTMLElement element, HTMLElement before)
-  {
-    insertBefore(before, element);
-  }
-
-  public void remove(int index)
-  {
-    HTMLOptionsCollection options = getOptions();
-    int len = options.getLength();
-    if (index < 0 || index >= len)
-      {
-        throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
-      }
-    HTMLOptionElement option = (HTMLOptionElement) options.item(index);
-    option.getParentNode().removeChild(option);
-  }
-
-  public void blur()
-  {
-    dispatchUIEvent("blur");
-  }
-
-  public void focus()
-  {
-    dispatchUIEvent("focus");
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java
deleted file mode 100644
index 78cef3b..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* DomHTMLStyleElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLStyleElement;
-
-/**
- * An HTML 'STYLE' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLStyleElement
-  extends DomHTMLElement
-  implements HTMLStyleElement
-{
-
-  protected DomHTMLStyleElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public String getMedia()
-  {
-    return getHTMLAttribute("media");
-  }
-
-  public void setMedia(String media)
-  {
-    setHTMLAttribute("media", media);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java
deleted file mode 100644
index 2133b14..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* DomHTMLTableCaptionElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLTableCaptionElement;
-
-/**
- * An HTML 'CAPTION' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTableCaptionElement
-  extends DomHTMLElement
-  implements HTMLTableCaptionElement
-{
-
-  protected DomHTMLTableCaptionElement(DomHTMLDocument owner,
-                                       String namespaceURI,
-                                       String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java
deleted file mode 100644
index 350f0bf..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/* DomHTMLTableCellElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLTableCellElement;
-
-/**
- * An HTML 'TH' or 'TD' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTableCellElement
-  extends DomHTMLElement
-  implements HTMLTableCellElement
-{
-
-  protected DomHTMLTableCellElement(DomHTMLDocument owner,
-                                    String namespaceURI,
-                                    String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public int getCellIndex()
-  {
-    return getIndex();
-  }
-
-  public String getAbbr()
-  {
-    return getHTMLAttribute("abbr");
-  }
-
-  public void setAbbr(String abbr)
-  {
-    setHTMLAttribute("abbr", abbr);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getAxis()
-  {
-    return getHTMLAttribute("axis");
-  }
-
-  public void setAxis(String axis)
-  {
-    setHTMLAttribute("axis", axis);
-  }
-
-  public String getBgColor()
-  {
-    return getHTMLAttribute("bgcolor");
-  }
-
-  public void setBgColor(String bgColor)
-  {
-    setHTMLAttribute("bgcolor", bgColor);
-  }
-
-  public String getCh()
-  {
-    return getHTMLAttribute("char");
-  }
-
-  public void setCh(String ch)
-  {
-    setHTMLAttribute("char", ch);
-  }
-
-  public String getChOff()
-  {
-    return getHTMLAttribute("charoff");
-  }
-
-  public void setChOff(String chOff)
-  {
-    setHTMLAttribute("charoff", chOff);
-  }
-
-  public int getColSpan()
-  {
-    return getIntHTMLAttribute("colspan");
-  }
-
-  public void setColSpan(int colSpan)
-  {
-    setIntHTMLAttribute("colspan", colSpan);
-  }
-
-  public String getHeaders()
-  {
-    return getHTMLAttribute("headers");
-  }
-
-  public void setHeaders(String headers)
-  {
-    setHTMLAttribute("headers", headers);
-  }
-
-  public String getHeight()
-  {
-    return getHTMLAttribute("height");
-  }
-
-  public void setHeight(String height)
-  {
-    setHTMLAttribute("height", height);
-  }
-
-  public boolean getNoWrap()
-  {
-    return getBooleanHTMLAttribute("nowrap");
-  }
-
-  public void setNoWrap(boolean noWrap)
-  {
-    setBooleanHTMLAttribute("nowrap", noWrap);
-  }
-
-  public int getRowSpan()
-  {
-    return getIntHTMLAttribute("rowspan");
-  }
-
-  public void setRowSpan(int rowSpan)
-  {
-    setIntHTMLAttribute("rowspan", rowSpan);
-  }
-
-  public String getScope()
-  {
-    return getHTMLAttribute("scope");
-  }
-
-  public void setScope(String scope)
-  {
-    setHTMLAttribute("scope", scope);
-  }
-
-  public String getVAlign()
-  {
-    return getHTMLAttribute("valign");
-  }
-
-  public void setVAlign(String vAlign)
-  {
-    setHTMLAttribute("valign", vAlign);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java
deleted file mode 100644
index c7cef31..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* DomHTMLTableColElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLTableColElement;
-
-/**
- * An HTML 'COL' or 'COLGROUP' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTableColElement
-  extends DomHTMLElement
-  implements HTMLTableColElement
-{
-
-  protected DomHTMLTableColElement(DomHTMLDocument owner,
-                                   String namespaceURI,
-                                   String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getCh()
-  {
-    return getHTMLAttribute("char");
-  }
-
-  public void setCh(String ch)
-  {
-    setHTMLAttribute("char", ch);
-  }
-
-  public String getChOff()
-  {
-    return getHTMLAttribute("charoff");
-  }
-
-  public void setChOff(String chOff)
-  {
-    setHTMLAttribute("charoff", chOff);
-  }
-
-  public int getSpan()
-  {
-    return getIntHTMLAttribute("span");
-  }
-
-  public void setSpan(int span)
-  {
-    setIntHTMLAttribute("span", span);
-  }
-
-  public String getVAlign()
-  {
-    return getHTMLAttribute("valign");
-  }
-
-  public void setVAlign(String vAlign)
-  {
-    setHTMLAttribute("valign", vAlign);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java
deleted file mode 100644
index ade463e..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/* DomHTMLTableElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDOMException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLElement;
-import org.w3c.dom.html2.HTMLTableCaptionElement;
-import org.w3c.dom.html2.HTMLTableElement;
-import org.w3c.dom.html2.HTMLTableSectionElement;
-
-/**
- * An HTML 'TABLE' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTableElement
-  extends DomHTMLElement
-  implements HTMLTableElement
-{
-
-  protected DomHTMLTableElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public HTMLTableCaptionElement getCaption()
-  {
-    return (HTMLTableCaptionElement) getChildElement("caption");
-  }
-
-  public void setCaption(HTMLTableCaptionElement caption)
-  {
-    HTMLTableCaptionElement ref = getCaption();
-    if (ref == null)
-      {
-        appendChild(caption);
-      }
-    else
-      {
-        replaceChild(caption, ref);
-      }
-  }
-
-  public HTMLTableSectionElement getTHead()
-  {
-    return (HTMLTableSectionElement) getChildElement("thead");
-  }
-
-  public void setTHead(HTMLTableSectionElement tHead)
-  {
-    HTMLTableSectionElement ref = getTHead();
-    if (ref == null)
-      {
-        appendChild(tHead);
-      }
-    else
-      {
-        replaceChild(tHead, ref);
-      }
-  }
-
-  public HTMLTableSectionElement getTFoot()
-  {
-    return (HTMLTableSectionElement) getChildElement("tfoot");
-  }
-
-  public void setTFoot(HTMLTableSectionElement tFoot)
-  {
-    HTMLTableSectionElement ref = getTFoot();
-    if (ref == null)
-      {
-        appendChild(tFoot);
-      }
-    else
-      {
-        replaceChild(tFoot, ref);
-      }
-  }
-
-  public HTMLCollection getRows()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("tr");
-    ret.evaluate();
-    return ret;
-  }
-
-  public HTMLCollection getTBodies()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("tbody");
-    ret.evaluate();
-    return ret;
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getBgColor()
-  {
-    return getHTMLAttribute("bgcolor");
-  }
-
-  public void setBgColor(String bgColor)
-  {
-    setHTMLAttribute("bgcolor", bgColor);
-  }
-
-  public String getBorder()
-  {
-    return getHTMLAttribute("border");
-  }
-
-  public void setBorder(String border)
-  {
-    setHTMLAttribute("border", border);
-  }
-
-  public String getCellPadding()
-  {
-    return getHTMLAttribute("cellpadding");
-  }
-
-  public void setCellPadding(String cellPadding)
-  {
-    setHTMLAttribute("cellpadding", cellPadding);
-  }
-
-  public String getCellSpacing()
-  {
-    return getHTMLAttribute("cellspacing");
-  }
-
-  public void setCellSpacing(String cellSpacing)
-  {
-    setHTMLAttribute("cellspacing", cellSpacing);
-  }
-
-  public String getFrame()
-  {
-    return getHTMLAttribute("frame");
-  }
-
-  public void setFrame(String frame)
-  {
-    setHTMLAttribute("frame", frame);
-  }
-
-  public String getRules()
-  {
-    return getHTMLAttribute("rules");
-  }
-
-  public void setRules(String rules)
-  {
-    setHTMLAttribute("rules", rules);
-  }
-
-  public String getSummary()
-  {
-    return getHTMLAttribute("summary");
-  }
-
-  public void setSummary(String summary)
-  {
-    setHTMLAttribute("summary", summary);
-  }
-
-  public String getWidth()
-  {
-    return getHTMLAttribute("width");
-  }
-
-  public void setWidth(String width)
-  {
-    setHTMLAttribute("width", width);
-  }
-
-  public HTMLElement createTHead()
-  {
-    HTMLTableSectionElement ref = getTHead();
-    if (ref == null)
-      {
-        return (HTMLElement) getOwnerDocument().createElement("thead");
-      }
-    else
-      {
-        return ref;
-      }
-  }
-
-  public void deleteTHead()
-  {
-    HTMLTableSectionElement ref = getTHead();
-    if (ref != null)
-      {
-        removeChild(ref);
-      }
-  }
-
-  public HTMLElement createTFoot()
-  {
-    HTMLTableSectionElement ref = getTFoot();
-    if (ref == null)
-      {
-        return (HTMLElement) getOwnerDocument().createElement("tfoot");
-      }
-    else
-      {
-        return ref;
-      }
-  }
-
-  public void deleteTFoot()
-  {
-    HTMLTableSectionElement ref = getTFoot();
-    if (ref != null)
-      {
-        removeChild(ref);
-      }
-  }
-
-  public HTMLElement createCaption()
-  {
-    HTMLTableCaptionElement ref = getCaption();
-    if (ref == null)
-      {
-        return (HTMLElement) getOwnerDocument().createElement("caption");
-      }
-    else
-      {
-        return ref;
-      }
-  }
-
-  public void deleteCaption()
-  {
-    HTMLTableCaptionElement ref = getCaption();
-    if (ref != null)
-      {
-        removeChild(ref);
-      }
-  }
-
-  public HTMLElement insertRow(int index)
-  {
-    Node ref = getRow(index);
-    Node row = getOwnerDocument().createElement("tr");
-    if (ref == null)
-      {
-        Node tbody = getChildElement("tbody");
-        if (tbody == null)
-          {
-            tbody = getOwnerDocument().createElement("tfoot");
-            appendChild(tbody);
-          }
-        tbody.appendChild(row);
-      }
-    else
-      {
-        ref.getParentNode().insertBefore(row, ref);
-      }
-    return (HTMLElement) row;
-  }
-
-  public void deleteRow(int index)
-  {
-    Node ref = getRow(index);
-    if (ref == null)
-      {
-        throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
-      }
-    ref.getParentNode().removeChild(ref);
-  }
-
-  Node getRow(final int index)
-  {
-    int i = 0;
-    Node thead = getChildElement("thead");
-    if (thead != null)
-      {
-        for (Node ctx = thead.getFirstChild(); ctx != null;
-             ctx = ctx.getNextSibling())
-          {
-            String ctxName = ctx.getLocalName();
-            if (ctxName == null)
-              {
-                ctxName = ctx.getNodeName();
-              }
-            if (!"tr".equalsIgnoreCase(ctxName))
-              {
-                continue;
-              }
-            if (index == i)
-              {
-                return ctx;
-              }
-            i++;
-          }
-      }
-    Node tbody = getChildElement("tbody");
-    if (tbody == null)
-      {
-        tbody = this;
-      }
-    for (Node ctx = tbody.getFirstChild(); ctx != null;
-         ctx = ctx.getNextSibling())
-      {
-        String ctxName = ctx.getLocalName();
-        if (ctxName == null)
-          {
-            ctxName = ctx.getNodeName();
-          }
-        if (!"tr".equalsIgnoreCase(ctxName))
-          {
-            continue;
-          }
-        if (index == i)
-          {
-            return ctx;
-          }
-        i++;
-      }
-    Node tfoot = getChildElement("tfoot");
-    if (tfoot != null)
-      {
-        for (Node ctx = tfoot.getFirstChild(); ctx != null;
-             ctx = ctx.getNextSibling())
-          {
-            String ctxName = ctx.getLocalName();
-            if (ctxName == null)
-              {
-                ctxName = ctx.getNodeName();
-              }
-            if (!"tr".equalsIgnoreCase(ctxName))
-              {
-                continue;
-              }
-            if (index == i)
-              {
-                return ctx;
-              }
-            i++;
-          }
-      }
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java
deleted file mode 100644
index 9943585..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/* DomHTMLTableRowElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDOMException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLElement;
-import org.w3c.dom.html2.HTMLTableRowElement;
-
-/**
- * An HTML 'TR' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTableRowElement
-  extends DomHTMLElement
-  implements HTMLTableRowElement
-{
-
-  protected DomHTMLTableRowElement(DomHTMLDocument owner,
-                                   String namespaceURI,
-                                   String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public int getRowIndex()
-  {
-    return getIndex();
-  }
-
-  public int getSectionRowIndex()
-  {
-    int index = 0;
-    DomHTMLElement parent = (DomHTMLElement) getParentElement("table");
-    if (parent != null)
-      {
-        Node thead = parent.getChildElement("thead");
-        if (thead != null)
-          {
-            for (Node ctx = thead.getFirstChild(); ctx != null;
-                 ctx = ctx.getNextSibling())
-              {
-                if (ctx == this)
-                  {
-                    return index;
-                  }
-                index++;
-              }
-          }
-        Node tbody = parent.getChildElement("tbody");
-        if (tbody != null)
-          {
-            for (Node ctx = tbody.getFirstChild(); ctx != null;
-                 ctx = ctx.getNextSibling())
-              {
-                if (ctx == this)
-                  {
-                    return index;
-                  }
-                index++;
-              }
-          }
-        Node tfoot = parent.getChildElement("tfoot");
-        if (tfoot != null)
-          {
-            for (Node ctx = tfoot.getFirstChild(); ctx != null;
-                 ctx = ctx.getNextSibling())
-              {
-                if (ctx == this)
-                  {
-                    return index;
-                  }
-                index++;
-              }
-          }
-      }
-    throw new DomDOMException(DOMException.NOT_FOUND_ERR);
-  }
-
-  public HTMLCollection getCells()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("th");
-    ret.addNodeName("td");
-    ret.evaluate();
-    return ret;
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getBgColor()
-  {
-    return getHTMLAttribute("bgcolor");
-  }
-
-  public void setBgColor(String bgColor)
-  {
-    setHTMLAttribute("bgcolor", bgColor);
-  }
-
-  public String getCh()
-  {
-    return getHTMLAttribute("char");
-  }
-
-  public void setCh(String ch)
-  {
-    setHTMLAttribute("char", ch);
-  }
-
-  public String getChOff()
-  {
-    return getHTMLAttribute("charoff");
-  }
-
-  public void setChOff(String chOff)
-  {
-    setHTMLAttribute("charoff", chOff);
-  }
-
-  public String getVAlign()
-  {
-    return getHTMLAttribute("valign");
-  }
-
-  public void setVAlign(String vAlign)
-  {
-    setHTMLAttribute("valign", vAlign);
-  }
-
-  public HTMLElement insertCell(int index)
-  {
-    Node ref = getCell(index);
-    Node cell = getOwnerDocument().createElement("td");
-    if (ref == null)
-      {
-        appendChild(cell);
-      }
-    else
-      {
-        insertBefore(cell, ref);
-      }
-    return (HTMLElement) cell;
-  }
-
-  public void deleteCell(int index)
-  {
-    Node ref = getCell(index);
-    if (ref == null)
-      {
-        throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
-      }
-    removeChild(ref);
-  }
-
-  Node getCell(final int index)
-  {
-    int i = 0;
-    for (Node ctx = getFirstChild(); ctx != null;
-         ctx = ctx.getNextSibling())
-      {
-        String name = ctx.getLocalName();
-        if (name == null)
-          {
-            name = ctx.getNodeName();
-          }
-        if (!"td".equalsIgnoreCase(name) &&
-            !"th".equalsIgnoreCase(name))
-          {
-            continue;
-          }
-        if (index == i)
-          {
-            return ctx;
-          }
-        i++;
-      }
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java
deleted file mode 100644
index 389eb59..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/* DomHTMLTableSectionElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import gnu.xml.dom.DomDOMException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.html2.HTMLCollection;
-import org.w3c.dom.html2.HTMLElement;
-import org.w3c.dom.html2.HTMLTableSectionElement;
-
-/**
- * An HTML 'THEAD', 'TFOOT', or 'TBODY' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTableSectionElement
-  extends DomHTMLElement
-  implements HTMLTableSectionElement
-{
-
-  protected DomHTMLTableSectionElement(DomHTMLDocument owner,
-                                       String namespaceURI,
-                                       String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getAlign()
-  {
-    return getHTMLAttribute("align");
-  }
-
-  public void setAlign(String align)
-  {
-    setHTMLAttribute("align", align);
-  }
-
-  public String getCh()
-  {
-    return getHTMLAttribute("char");
-  }
-
-  public void setCh(String ch)
-  {
-    setHTMLAttribute("char", ch);
-  }
-
-  public String getChOff()
-  {
-    return getHTMLAttribute("charoff");
-  }
-
-  public void setChOff(String chOff)
-  {
-    setHTMLAttribute("charoff", chOff);
-  }
-
-  public String getVAlign()
-  {
-    return getHTMLAttribute("valign");
-  }
-
-  public void setVAlign(String vAlign)
-  {
-    setHTMLAttribute("valign", vAlign);
-  }
-
-  public HTMLCollection getRows()
-  {
-    DomHTMLCollection ret =
-      new DomHTMLCollection((DomHTMLDocument) getOwnerDocument(), this);
-    ret.addNodeName("tr");
-    ret.evaluate();
-    return ret;
-  }
-
-  public HTMLElement insertRow(int index)
-  {
-    Node ref = getRow(index);
-    Node row = getOwnerDocument().createElement("tr");
-    if (ref == null)
-      {
-        appendChild(row);
-      }
-    else
-      {
-        insertBefore(row, ref);
-      }
-    return (HTMLElement) row;
-  }
-
-  public void deleteRow(int index)
-  {
-    Node ref = getRow(index);
-    if (ref == null)
-      {
-        throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
-      }
-    removeChild(ref);
-  }
-
-  Node getRow(final int index)
-  {
-    int i = 0;
-    for (Node ctx = getFirstChild(); ctx != null;
-         ctx = ctx.getNextSibling())
-      {
-        String name = ctx.getLocalName();
-        if (name == null)
-          {
-            name = ctx.getNodeName();
-          }
-        if (!"tr".equalsIgnoreCase(name))
-          {
-            continue;
-          }
-        if (index == i)
-          {
-            return ctx;
-          }
-        i++;
-      }
-    return null;
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java
deleted file mode 100644
index 9acfab1..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* DomHTMLTextAreaElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLFormElement;
-import org.w3c.dom.html2.HTMLTextAreaElement;
-
-/**
- * An HTML 'TEXTAREA' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTextAreaElement
-  extends DomHTMLElement
-  implements HTMLTextAreaElement
-{
-
-  protected String value;
-
-  protected DomHTMLTextAreaElement(DomHTMLDocument owner,
-                                   String namespaceURI,
-                                   String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getDefaultValue()
-  {
-    return getHTMLAttribute("value");
-  }
-
-  public void setDefaultValue(String defaultValue)
-  {
-    setHTMLAttribute("value", defaultValue);
-  }
-
-  public HTMLFormElement getForm()
-  {
-    return (HTMLFormElement) getParentElement("form");
-  }
-
-  public String getAccessKey()
-  {
-    return getHTMLAttribute("accesskey");
-  }
-
-  public void setAccessKey(String accessKey)
-  {
-    setHTMLAttribute("accesskey", accessKey);
-  }
-
-  public int getCols()
-  {
-    return getIntHTMLAttribute("cols");
-  }
-
-  public void setCols(int cols)
-  {
-    setIntHTMLAttribute("cols", cols);
-  }
-
-  public boolean getDisabled()
-  {
-    return getBooleanHTMLAttribute("disabled");
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    setBooleanHTMLAttribute("disabled", disabled);
-  }
-
-  public String getName()
-  {
-    return getHTMLAttribute("name");
-  }
-
-  public void setName(String name)
-  {
-    setHTMLAttribute("name", name);
-  }
-
-  public boolean getReadOnly()
-  {
-    return getBooleanHTMLAttribute("readOnly");
-  }
-
-  public void setReadOnly(boolean readOnly)
-  {
-    setBooleanHTMLAttribute("readonly", readOnly);
-  }
-
-  public int getRows()
-  {
-    return getIntHTMLAttribute("rows");
-  }
-
-  public void setRows(int rows)
-  {
-    setIntHTMLAttribute("rows", rows);
-  }
-
-  public int getTabIndex()
-  {
-    return getIntHTMLAttribute("tabindex");
-  }
-
-  public void setTabIndex(int tabIndex)
-  {
-    setIntHTMLAttribute("tabindex", tabIndex);
-  }
-
-  public String getType()
-  {
-    return "textarea";
-  }
-
-  public String getValue()
-  {
-    if (value == null)
-      {
-        value = getDefaultValue();
-      }
-    return value;
-  }
-
-  public void setValue(String value)
-  {
-    this.value = value;
-  }
-
-  public void blur()
-  {
-    dispatchUIEvent("blur");
-  }
-
-  public void focus()
-  {
-    dispatchUIEvent("focus");
-  }
-
-  public void select()
-  {
-    dispatchUIEvent("select");
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java
deleted file mode 100644
index 4f58106..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* DomHTMLTitleElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLTitleElement;
-
-/**
- * An HTML 'TITLE' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLTitleElement
-  extends DomHTMLElement
-  implements HTMLTitleElement
-{
-
-  protected DomHTMLTitleElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public String getText()
-  {
-    return getTextContent();
-  }
-
-  public void setText(String text)
-  {
-    setTextContent(text);
-  }
-
-}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java
deleted file mode 100644
index 39cdce7..0000000
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* DomHTMLUListElement.java --
-   Copyright (C) 2005 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.xml.dom.html2;
-
-import org.w3c.dom.html2.HTMLUListElement;
-
-/**
- * An HTML 'UL' element node.
- *
- * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
- */
-public class DomHTMLUListElement
-  extends DomHTMLElement
-  implements HTMLUListElement
-{
-
-  protected DomHTMLUListElement(DomHTMLDocument owner, String namespaceURI,
-                                String name)
-  {
-    super(owner, namespaceURI, name);
-  }
-
-  public boolean getCompact()
-  {
-    return getBooleanHTMLAttribute("compact");
-  }
-
-  public void setCompact(boolean compact)
-  {
-    setBooleanHTMLAttribute("compact", compact);
-  }
-
-  public String getType()
-  {
-    return getHTMLAttribute("type");
-  }
-
-  public void setType(String type)
-  {
-    setHTMLAttribute("type", type);
-  }
-
-}