Index: archive/kde/add/kdeutils.xml
===================================================================
--- archive/kde/add/kdeutils.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ archive/kde/add/kdeutils.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -98,5 +98,5 @@
     program will require appropriate utilities to handle various archives,
     including <xref linkend="zip"/>, <xref linkend="unzip"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/> (for the
+    <xref linkend="openjdk"/> <!--  or <xref linkend="jdk"/> --> (for the
     <command>jar</command> program),
     <xref linkend="unrar"/>, <ulink url="http://www.rarlabs.com">rar</ulink>
Index: archive/kde/devel/kdebindings.xml
===================================================================
--- archive/kde/devel/kdebindings.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ archive/kde/devel/kdebindings.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -83,5 +83,5 @@
     <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+    <xref linkend="openjdk"/>, <!-- or <xref linkend="jdk"/>, -->
     <xref linkend="seamonkey"/>,
     <ulink url="http://http://www.riverbankcomputing.co.uk/qscintilla/index.php">QScintilla</ulink>,
Index: archive/obsolete/java-access-bridge.xml
===================================================================
--- archive/obsolete/java-access-bridge.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ archive/obsolete/java-access-bridge.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -63,5 +63,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="at-spi"/> and
-    either <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
+    <!-- either --> <xref linkend="openjdk"/> <!-- or <xref linkend="jdk"/> --></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: archive/pdl.xml
===================================================================
--- archive/pdl.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ archive/pdl.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -237,5 +237,5 @@
             <ulink url="&gnome-download-http;/gnome-libs/1.4/">GNOME
             Libraries-1.4</ulink>,
-            <xref linkend="icedtea6"/>, <!-- or <xref linkend="jdk"/>, -->
+            <xref linkend="openjdk"/>, <!-- or <xref linkend="jdk"/>, -->
             <xref linkend="tk"/>,
             <xref linkend="python2"/> (with
Index: archive/pilot-link.xml
===================================================================
--- archive/pilot-link.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ archive/pilot-link.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -71,5 +71,5 @@
     <xref linkend="popt"/>,
     <xref linkend="libusb-compat"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+    <xref linkend="openjdk"/>, <!-- or <xref linkend="jdk"/>, -->
     <xref linkend="tcl"/>,
     <xref linkend="python2"/>,
Index: general.ent
===================================================================
--- general.ent	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general.ent	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 6th, &year;">
+<!ENTITY releasedate  "June 7th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -60,5 +60,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "201205011">
+<!ENTITY blfs-bootscripts-version     "20120607">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
@@ -370,6 +370,7 @@
 <!ENTITY git-version                  "1.7.10.1">
 <!ENTITY guile-version                "2.0.5">
-<!ENTITY icedtea6-version             "1.9.7">
-<!ENTITY jdk-version                  "6 Update 18">
+<!ENTITY icedtea-version              "2.2">
+<!ENTITY openjdk-version              "1.7.0.4">
+<!-- <!ENTITY jdk-version                  "6 Update 18"> -->
 <!ENTITY junit-version                "4.10">
 <!ENTITY librep-version               "0.90.5">
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/genlib/libidn.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -76,5 +76,5 @@
       <xref linkend="emacs"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="icedtea6"/>,
+      <xref linkend="openjdk"/>,
       <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink> and
       <ulink url="http://valgrind.org/">Valgrind</ulink>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/genutils/graphviz.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -119,5 +119,5 @@
       (<application>SWIG</application> must be installed or no bindings will be built),
       <xref linkend="guile"/>,
-      <xref linkend="icedtea6"/>,
+      <xref linkend="openjdk"/>,
       <ulink url="http://www.iolanguage.com/about/">Io</ulink>,
       <ulink url="http://www.lua.org/">Lua</ulink>,
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/prog/gcc.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -40,5 +40,5 @@
     need one of these additional compilers (C and C++ are installed in LFS)
     before you install them. Additionally, there are instructions in the BLFS
-    book to install <xref linkend="icedtea6"/>, which can be used instead of
+    book to install <xref linkend="openjdk"/>, which can be used instead of
     the Java provided by the <application>GCC</application> package. Many
     consider the Iced Tea version to be a more robust Java environment than the
Index: neral/prog/icedtea6.xml
===================================================================
--- general/prog/icedtea6.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ 	(revision )
@@ -1,973 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY icedtea6-download-binary-x86  "http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-&icedtea6-version;-1-x86-bin.tar.xz">
-  <!ENTITY icedtea6-bin-md5sum-x86       "616f3841562b2787ce101a85378029d1">
-  <!ENTITY icedtea6-bin-size-x86         "100 MB">
-  <!ENTITY icedtea6-bin-buildsize-x86    "846 MB">
-
-<!-- This is not an error, x86 is larger than x86_64 because x86 includes a
-     client VM, whereas one is not available on x86_64 -->
-
-  <!ENTITY icedtea6-download-binary-x64  "http://anduin.linuxfromscratch.org/files/BLFS/icedtea6-&icedtea6-version;-1-x86_64-bin.tar.xz">
-  <!ENTITY icedtea6-bin-md5sum-x64       "98cf8a009c63cb2b32a94dd23b828fca">
-  <!ENTITY icedtea6-bin-size-x64         "77 MB">
-  <!ENTITY icedtea6-bin-buildsize-x64    "564 MB">
-
-  <!ENTITY icedtea6-source-md5sum        "54a327a9591dab15049b81ec3c0af724">
-  <!ENTITY openjdk-md5sum                "0b36adbf67e4f261e1b827ed4be4f447">
-  <!ENTITY jaf-md5sum                    "bc95c133620bd68c161cac9891592901">
-  <!ENTITY jaxp-md5sum                   "22e95fbdb9fb7d8b6b6fc0a1d76d1fbd">
-  <!ENTITY jaxws-md5sum                  "91adfd41e6f001add4f92ae31216b1e3">
-  <!ENTITY ecj-md5sum                    "448c6e65234fc61624e14b0964d75bd9">
-  <!ENTITY rhino-md5sum                  "40d0a9abec8169e42920214b37fa8e0e">
-  <!ENTITY xalan-md5sum                  "99d049717c9d37a930450e630d8a6531">
-  <!ENTITY xerces-md5sum                 "408500aaaf1ff9f1e03e79defe90facc">
-
-  <!ENTITY icedtea6-source-size          "6.3 MB">
-  <!ENTITY openjdk-size                  "43 MB">
-  <!ENTITY jaf-size                      "70 KB">
-  <!ENTITY jaxp-size                     "5.8 MB">
-  <!ENTITY jaxws-size                    "5.3 MB">
-  <!ENTITY ecj-size                      "1.6 MB">
-  <!ENTITY rhino-size                    "2.9 MB">
-  <!ENTITY xalan-size                    "16.8 MB">
-  <!ENTITY xerces-size                   "7.0 MB">
-
-  <!ENTITY icedtea6-src-buildsize         "6.6 GB">
-  <!ENTITY icedtea6-time                  "23 SBU (an additional 83 SBU for testsuite)">
-
-  <!ENTITY openjdk-build "b20">
-  <!ENTITY openjdk-date "21_jun_2010">
-  <!ENTITY icedtea6-download-source "http://icedtea.classpath.org/download/source/icedtea6-&icedtea6-version;.tar.gz">
-  <!ENTITY openjdk-download "http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-&openjdk-build;-&openjdk-date;.tar.gz">
-  <!ENTITY jaf-download "http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaf-&openjdk-build;.zip">
-  <!ENTITY jaxp-download "http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaxp-&openjdk-build;.zip">
-  <!ENTITY jaxws-download "http://icedtea.classpath.org/builds/icedtea6/src/drops/jdk6-jaxws-&openjdk-build;.zip">
-  <!ENTITY ecj-download "http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/ecj-3.6.2.jar">
-  <!ENTITY rhino-download "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip">
-  <!ENTITY xalan-download "http://apache.osuosl.org/xml/xalan-j/xalan-j_2_7_1-bin.zip">
-  <!ENTITY xerces-download "http://apache.osuosl.org/xerces/j/Xerces-J-bin.2.11.0.zip">
-
-]>
-
-<sect1 id="icedtea6" xreflabel="IcedTea6-&icedtea6-version;">
-  <?dbhtml filename="icedtea6.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>IcedTea6-&icedtea6-version;</title>
-
-  <indexterm zone="icedtea6">
-    <primary sortas="a-IcedTea6">IcedTea6</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IcedTea6</title>
-
-    <para><application>IcedTea6</application> provides a build harness for the
-    <application>OpenJDK</application> package, Oracle's recently open-sourced
-    <application>Java</application> development environment.  In order to
-    provide a completely free runtime environment, similar to Oracle's closed
-    distribution, the <application>IcedTea6</application> package also
-    provides free versions of the <application>Java</application> browser
-    plugin, and <application>Java Web Start</application> application, which
-    have not been open-sourced to date. <application>IcedTea6</application> is
-    useful for developing <application>Java</application> programs and provides
-    a complete runtime environment to run <application>Java</application>
-    programs.</para>
-
-    <note><para>The browser plugin and webstart implementation have been split
-    off into a separate project. To provide a complete implementation in a
-    source build, you will need to later install <xref linkend="icedtea-web"/>.
-    The binary installation does contain IcedTea-Web components.</para></note>
-
-    <para>OpenJDK (and IcedTea6) is GPL'd code, however, it should be explained
-    that there has been a special exception made for non-free projects to use
-    these classes in their products.  In similar fashion to the LGPL, which
-    allows non-free programs to link to libraries provided by free software,
-    the <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU
-    General Public License, version 2, with the Classpath Exception</ulink>
-    allows third party programs to use classes provided by free software
-    without the requirment that the third party software also be free.  As with
-    the LGPL, any modifictaions made to the free software portions of a
-    third party application, must also be made freely availible.</para>
-
-    <note>
-      <para>The OpenJDK source bundle includes a very thorough, open source
-      test suite titled <application>JTreg</application>.
-      <application>JTreg</application> is intended to test the just built JDK
-      for reasonable compatibility with the closed Oracle JDK.  However, in
-      order for an independent implementation to claim compatibility, including
-      the Oracle sponsored <application>OpenJDK</application> project, it must
-      pass a closed <application>JCK/TCK</application> test suite.  No claims
-      of compatibility, even partial compatibility,  may be made without
-      passing an approved test suite.</para>
-
-      <para>Oracle does provide free community access, on a case by case basis,
-      to a closed toolkit to ensure 100% compatibility with its proprietary JDK.
-      The binary version provided here has not been tested against the
-      <ulink url="http://openjdk.java.net/groups/conformance/JckAccess/jck-access.html">
-      TCK</ulink>. Any version that is built using the instructions given,
-      cannot claim to be compatible with the proprietary JDK, without the user
-      applying for, and completing the compatibility tests themselves.</para>
-
-      <para>With that in mind, the binaries produced using this build method are
-      regularly tested against the TCK by the members listed on the site above.
-      In addition to the community license above, an educational, non-commercial
-      license for the TCK can be obtained from
-      <ulink url="http://www.oracle.com/technetwork/java/index-137188.html">
-      here</ulink>.</para>
-    </note>
-
-    <bridgehead renderas="sect3">Source Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>IcedTea6 Source
-          <simplelist>
-            <member><ulink url="&icedtea6-download-source;"/></member>
-            <member>&icedtea6-source-md5sum;</member>
-            <member>&icedtea6-source-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>OpenJDK Source
-          <simplelist>
-            <member><ulink url="&openjdk-download;"/></member>
-            <member>&openjdk-md5sum;</member>
-            <member>&openjdk-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>JAF Source
-          <simplelist>
-            <member><ulink url="&jaf-download;"/></member>
-            <member>&jaf-md5sum;</member>
-            <member>&jaf-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>JAXP Source
-          <simplelist>
-            <member><ulink url="&jaxp-download;"/></member>
-            <member>&jaxp-md5sum;</member>
-            <member>&jaxp-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>JAXWS Source
-          <simplelist>
-            <member><ulink url="&jaxws-download;"/></member>
-            <member>&jaxws-md5sum;</member>
-            <member>&jaxws-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &icedtea6-src-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &icedtea6-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (x86):
-        <ulink url="&icedtea6-download-binary-x86;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &icedtea6-bin-md5sum-x86;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &icedtea6-bin-size-x86;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &icedtea6-bin-buildsize-x86;</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (x86_64):
-        <ulink url="&icedtea6-download-binary-x64;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &icedtea6-bin-md5sum-x64;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &icedtea6-bin-size-x64;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &icedtea6-bin-buildsize-x64;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <bridgehead renderas="sect4">Required Patches</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/icedtea6-&icedtea6-version;-upstream_fixes-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/icedtea6-&icedtea6-version;-generate_cacerts-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/icedtea6-&icedtea6-version;-xerces2_10-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/icedtea6-&icedtea6-version;-fixed_paths-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Required Jar Files</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Eclipse Java Complier
-          <simplelist>
-            <member><ulink url="&ecj-download;"/></member>
-            <member>&ecj-md5sum;</member>
-            <member>&ecj-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Rhino Java Script
-          <simplelist>
-            <member><ulink url="&rhino-download;"/></member>
-            <member>&rhino-md5sum;</member>
-            <member>&rhino-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Xalan
-          <simplelist>
-            <member><ulink url="&xalan-download;"/></member>
-            <member>&xalan-md5sum;</member>
-            <member>&xalan-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Xerces
-          <simplelist>
-            <member><ulink url="&xerces-download;"/></member>
-            <member>&xerces-md5sum;</member>
-            <member>&xerces-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">IcedTea6 Dependencies</bridgehead>
-
-<!-- Remove required dependency after BLFS-6.7
-    <bridgehead renderas="sect4">Required Dependencies</bridgehead>
-    <para role="required">
-    <xref linkend="xz-utils"/>
-    </para>
--->
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies (required for
-    source installation)</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="xorg7-lib"/> and
-      <ulink url="https://developer.mozilla.org/en/XULRunner">xulrunner</ulink>.
-    </para>
-
-    <bridgehead renderas="sect4">Additional Requirements
-    (for source build, including optional requirements)</bridgehead>
-    <para role="required">
-    <xref linkend="apache-ant"/>,
-    <xref linkend="unzip"/>,
-    <xref linkend="which"/>, and
-    <xref linkend="zip"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/icedtea6"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IcedTea6</title>
-
-    <para>The instructions below install both the binary and source versions.
-    You may stop after installing the binary version or continue on installing
-    the source version. You can choose to keep either or both.</para>
-
-    <bridgehead renderas="sect3">IcedTea6 Binary Installation</bridgehead>
-    <para>Begin by extracting the appropriate binary tarball and changing to
-    the extracted dirctory. Install the binary
-    <application>IcedTea6</application> with the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cp -R j2sdk-image /opt/icedtea6-&icedtea6-version;-bin &amp;&amp;
-chown -R root:root /opt/icedtea6-&icedtea6-version;-bin</userinput></screen>
-
-    <para>Configure the temporary <application>IcedTea6</application> 
-    installation with the following commands:</para>
-
-<screen><userinput>export PATH_HOLD="${PATH}" &amp;&amp;
-export JAVA_HOME="/opt/icedtea6-&icedtea6-version;-bin" &amp;&amp;
-export CLASSPATH=".:/usr/share/java" &amp;&amp;
-export PATH="${PATH}:${JAVA_HOME}/bin"</userinput></screen>
-
-    <para>The binary version is now installed. If you don't want to compile the
-    sources, skip ahead to the configuration section.</para>
-
-    <bridgehead renderas="sect3">IcedTea6 Source Installation</bridgehead>
-    <note><para>The source build of IcedTea6 requires
-    <xref linkend="apache-ant"/>.  You'll need to build that first to satisfy
-    the reciprocal dependency, and return to this section to continue building
-    IcedTea6.</para></note>
-
-    <para>Like other packages in BLFS, begin by extracting the
-    <application>IcedTea6</application> source package and changing into the
-    extracted dirctory.</para>
-
-    <para><application>IcedTea6</application> requires several freely
-    available jar files for the bootstrap compiler.  You may leave these
-    items in place after the build is complete, as they will be needed by other
-    programs, or remove them if you choose.  You can optionally choose not to
-    install them at all, and provide the necessary configure options to find
-    the files. Install the necessary tools with the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>mkdir jarfiles &amp;&amp;
-cd jarfiles &amp;&amp;
-unzip ../../rhino1_7R2.zip &amp;&amp;
-unzip ../../xalan-j_2_7_1-bin.zip &amp;&amp;
-unzip ../../Xerces-J-bin.2.11.0.zip &amp;&amp;
-install -v -d -m755 /usr/share/java &amp;&amp;
-install -v -m755 rhino1_7R2/*.jar /usr/share/java &amp;&amp;
-install -v -m755 xalan-j_2_7_1/*.jar /usr/share/java &amp;&amp;
-install -v -m755 xerces-2_11_0/*.jar /usr/share/java &amp;&amp;
-install -v -m755 ../../ecj-3.6.1.jar /usr/share/java &amp;&amp;
-ln -s ecj-3.6.1.jar /usr/share/java/ecj.jar &amp;&amp;
-ln -s xalan.jar /usr/share/java/xalan2.jar &amp;&amp;
-cd .. &amp;&amp;
-rm -r jarfiles</userinput></screen>
-
-    <para><application>IcedTea6</application> is composed of several individual
-    components of the proprietary <application>JDK</application> that have been
-    relicensed under an open source license.  Put all of the individual
-    components into the source tree with the following commands:</para>
-
-<screen><userinput>mkdir drops &amp;&amp;
-cp -v ../jdk6-jaf-&openjdk-build;.zip drops/ &amp;&amp;
-cp -v ../jdk6-jaxp-&openjdk-build;.zip drops/ &amp;&amp;
-cp -v ../jdk6-jaxws-&openjdk-build;.zip drops/ &amp;&amp;
-cp -v ../openjdk-6-src-&openjdk-build;-&openjdk-date;.tar.gz .</userinput></screen>
-
-    <para>Apply a patch to allow building with an installed 
-    <application>IcedTea6</application> as the bootstrap JDK:</para>
-
-<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>Apply a patch to generate a valid cacerts file using the system CA
-    certificates:</para>
-
-<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-generate_cacerts-1.patch</userinput></screen>
-
-    <para>Apply a patch to fix the build when using a newer version of
-    Xerces2:</para>
-
-<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-xerces2_10-1.patch</userinput></screen>
-
-    <para>Apply a patch to replace fixed paths with ones appropriate for
-    BLFS:</para>
-
-<screen><userinput>patch -Np1 -i ../icedtea6-&icedtea6-version;-fixed_paths-1.patch</userinput></screen>
-
-    <para>Configure and build the package with the following commands:</para>
-
-<screen><userinput>unset JAVA_HOME &amp;&amp;
-./autogen.sh &amp;&amp;
-./configure --with-jdk-home=/opt/icedtea6-&icedtea6-version;-bin \
-            --enable-cacerts \
-            --disable-plugin \
-            --disable-webstart &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. The
-    included version of <application>jtreg</application> is old, and the test
-    suite is also very dependent on the host system. You should expect to
-    see 6 or 7 failures and 1 error in the langtools tests, and 20 to 23
-    failures in jdk with up to 3 errors. The other 4700+ tests should
-    pass. The reason for the variable results is due to different
-    architechtures, versions of dependent libraries, and even the CA
-    certificates used to generate the <filename>cacerts</filename> file.</para>
-
-    <para>Install the package with the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cp -R openjdk.build/j2sdk-image /opt/icedtea6-&icedtea6-version; &amp;&amp;
-chown -R root:root /opt/icedtea6-&icedtea6-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>./autogen.sh</command>: This command forces rebuilding of
-    auto-generated files to account for new options added to
-    <filename>configure</filename>.</para>
-
-    <para><parameter>--with-jdk-home</parameter>: This switch provides the
-    location of the temporary <application>JDK</application>.</para>
-
-    <para><parameter>--enable-cacerts</parameter>: This switch enables the 
-    build to generate a cacerts file, from the system installed CA
-    certificates, suitable for use by
-    <application>IcedTea6</application>.</para>
-
-    <para><parameter>--disable-plugin</parameter>: This switch disables
-    building of the included Java browser plugin. The included plugin and
-    webstart implementation has been split off into a separate project
-    <xref linkend="icedtea-web"/>. Omit this switch if you do not wish to build
-    <application>IcedTea-Web</application> separately.</para>
-
-    <para><parameter>--disable-webstart</parameter>: This switch disables 
-    building of the included <application>webstart</application>
-    implementation. As noted above, <application>webstart</application> has
-    split off into a separate project <xref linkend="icedtea-web"/>. Omit this
-    switch if you do not wish to build <application>IcedTea-Web</application>
-    separately.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring IcedTea6</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>There are now two <application>IcedTea6</application> SDKs
-      installed in <filename>/opt</filename>. You should decide on which one
-      you would like to use as the default. For example if you decide to use
-      the precompiled <application>IcedTea6</application>, do the following as
-      the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -v -nsf icedtea6-&icedtea6-version;-bin /opt/icedtea</userinput></screen>
-
-    <para>The information below assumes your system is set up using the
-    instructions found in
-    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
-    extract the relevant information below and incorporate it into your
-    system's startup files if your system is set up differently.</para>
-
-    <para>Add the following <filename>icedtea.sh</filename> shell startup file
-    to the <filename>/etc/profile.d</filename> directory with the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/icedtea.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/icedtea.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/icedtea
-
-# Adjust PATH
-pathappend ${JAVA_HOME}/bin PATH
-
-# Auto Java CLASSPATH
-# Copy jar files to, or create symlinks in this directory
-AUTO_CLASSPATH_DIR=/usr/share/java
-pathprepend . CLASSPATH
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-export JAVA_HOME CLASSPATH
-unset AUTO_CLASSPATH_DIR
-unset dir
-
-# End /etc/profile.d/icedtea.sh</literal>
-EOF</userinput></screen>
-
-    <para>If you've installed only the binary distribution, the
-    <application>Java</application> plugin is located at
-    <filename class="directory">$JAVA_HOME/jre/lib/<replaceable>&lt;arch&gt;</replaceable>/IcedTeaPlugin.so</filename>.
-    Make a symbolic link to the file in that directory from your browser(s)
-    plugins directory. If you've built from source, move on to the
-    <xref linkend="icedtea-web"/> instructions to build the browser
-    plugin.</para>
-
-    <important>
-      <para>The plugin must be a symlink for it to work. If not, the browsers
-      will crash when you attempt to load a <application>Java</application>
-      application.</para>
-    </important>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>apt, extcheck, idlj, HtmlConverter, jar,
-        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
-        jconsole, jdb, jhat, jinfo, jmap, jps,
-        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
-        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
-        schemagen, serialver, servertool, tnameserv, unpack200,
-        wsgen, wsimport, and xjc</seg>
-        <seg><envar>$JAVA_HOME</envar>/lib/*, and
-        <envar>$JAVA_HOME</envar>/jre/lib/*</seg>
-        <seg>/opt/icedtea6-&icedtea6-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apt-it6">
-        <term><command>apt</command></term>
-        <listitem>
-          <para>is an annotation processing tool.</para>
-          <indexterm zone="icedtea6 apt-it6">
-            <primary sortas="b-apt">apt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extcheck-it6">
-        <term><command>extcheck</command></term>
-        <listitem>
-          <para>checks a specified jar file for title and version conflicts
-          with any extensions installed in the <application>IcedTea</application>
-          software.</para>
-          <indexterm zone="icedtea6 extcheck-it6">
-            <primary sortas="b-extcheck">extcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idlj-it6">
-        <term><command>idlj</command></term>
-        <listitem>
-          <para>generates Java bindings from a given IDL file.</para>
-          <indexterm zone="icedtea6 idlj-it6">
-            <primary sortas="b-idlj">idlj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jar-it6">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>combines multiple files into a single jar archive.</para>
-          <indexterm zone="icedtea6 jar-it6">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner-it6">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>signs jar files and verifies the signatures and integrity
-          of a signed jar file.</para>
-          <indexterm zone="icedtea6 jarsigner-it6">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-it6">
-        <term><command>java</command></term>
-        <listitem>
-          <para>launches a Java application by starting a Java runtime
-          environment, loading a specified class and invoking its main
-          method.</para>
-          <indexterm zone="icedtea6 java-it6">
-            <primary sortas="b-java">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac-it6">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>reads class and interface definitions, written in the
-          Java programming language, and compiles them into bytecode
-          class files.</para>
-          <indexterm zone="icedtea6 javac-it6">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc-it6">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>parses the declarations and documentation comments in a
-          set of Java source files and produces a corresponding set of
-          HTML pages describing the classes, interfaces,constructors,
-          methods, and fields.</para>
-          <indexterm zone="icedtea6 javadoc-it6">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javah-it6">
-        <term><command>javah</command></term>
-        <listitem>
-          <para>generates C header and source files
-          that are needed to implement native methods.</para>
-          <indexterm zone="icedtea6 javah-it6">
-            <primary sortas="b-javah">javah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap-it6">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>disassembles a Java class file.</para>
-          <indexterm zone="icedtea6 javap-it6">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-rmi.cgi-it6">
-        <term><command>java-rmi.cgi</command></term>
-        <listitem>
-          <para>is the Java RMI client.</para>
-          <indexterm zone="icedtea6 java-rmi.cgi-it6">
-            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole-it6">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>is a graphical console tool to monitor and manage both
-          local and remote Java applications and virtual machines.</para>
-          <indexterm zone="icedtea6 jconsole-it6">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb-it6">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>is a simple command-line debugger for Java classes.</para>
-          <indexterm zone="icedtea6 jdb-it6">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhat-it6">
-        <term><command>jhat</command></term>
-        <listitem>
-          <para>parses a java heap dump file and allows viewing
-          in a webbrowser.</para>
-          <indexterm zone="icedtea6 jhat-it6">
-            <primary sortas="b-jhat">jhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo-it6">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>prints Java configuration information for a given Java
-          process, core file, or a remote debug server.</para>
-          <indexterm zone="icedtea6 jinfo-it6">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap-it6">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>prints shared object memory maps or heap memory details
-          of a given process, core file, or a remote debug server.</para>
-          <indexterm zone="icedtea6 jmap-it6">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps-it6">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>lists the instrumented JVMs on the target system.</para>
-          <indexterm zone="icedtea6 jps-it6">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript-it6">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>is a command line script shell.</para>
-          <indexterm zone="icedtea6 jrunscript-it6">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsadebugd-it6">
-        <term><command>jsadebugd</command></term>
-        <listitem>
-          <para>attaches to a Java process or core file and acts as a
-          debug server.</para>
-          <indexterm zone="icedtea6 jsadebugd-it6">
-            <primary sortas="b-jsadebugd">jsadebugd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack-it6">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>prints Java stack traces of Java threads for a given
-          Java process, core file, or a remote debug server.</para>
-          <indexterm zone="icedtea6 jstack-it6">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat-it6">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>displays performance statistics for an instrumented JVM.</para>
-          <indexterm zone="icedtea6 jstat-it6">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd-it6">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>is an RMI server application that monitors for the creation
-          and termination of instrumented JVMs.</para>
-          <indexterm zone="icedtea6 jstatd-it6">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool-it6">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>is a key and certificate management utility.</para>
-          <indexterm zone="icedtea6 keytool-it6">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="native2ascii-it6">
-        <term><command>native2ascii</command></term>
-        <listitem>
-          <para> converts files that contain non-supported character encoding
-          into files containing Latin-1 or Unicode-encoded characters.</para>
-          <indexterm zone="icedtea6 native2ascii-it6">
-            <primary sortas="b-native2ascii">native2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="orbd-it6">
-        <term><command>orbd</command></term>
-        <listitem>
-          <para>is used to enable clients to transparently locate and invoke
-          persistent objects on servers in the CORBA environment.</para>
-          <indexterm zone="icedtea6 orbd-it6">
-            <primary sortas="b-orbd">orbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pack200-it6">
-        <term><command>pack200</command></term>
-        <listitem>
-          <para>is a Java application that transforms a jar file into a
-          compressed pack200 file using the Java gzip compressor.</para>
-          <indexterm zone="icedtea6 pack200-it6">
-            <primary sortas="b-pack200">pack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pluginappletviewer-it6">
-        <term><command>pluginappletviewer</command></term>
-          <listitem>
-            <para>is a helper program for IcedTeaPlugin.so.</para>
-            <indexterm zone="icedtea6 pluginappletviewer-it6">
-              <primary sortas="b-pluginappletviewer">pluginappletviewer</primary>
-            </indexterm>
-          </listitem>
-       </varlistentry>
-
-      <varlistentry id="policytool-it6">
-        <term><command>policytool</command></term>
-        <listitem>
-          <para>creates and manages a policy file graphically.</para>
-          <indexterm zone="icedtea6 policytool-it6">
-            <primary sortas="b-policytool">policytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmic-it6">
-        <term><command>rmic</command></term>
-        <listitem>
-          <para>generates stub and skeleton class files for remote objects
-          from the names of compiled Java classes that contain remote
-          object implementations.</para>
-          <indexterm zone="icedtea6 rmic-it6">
-            <primary sortas="b-rmic">rmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmid-it6">
-        <term><command>rmid</command></term>
-        <listitem>
-          <para>starts the activation system daemon.</para>
-          <indexterm zone="icedtea6 rmid-it6">
-            <primary sortas="b-rmid">rmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry-it6">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>creates and starts a remote object registry on the specified
-          port on the current host.</para>
-          <indexterm zone="icedtea6 rmiregistry-it6">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="schemagen-it6">
-        <term><command>schemagen</command></term>
-        <listitem>
-          <para>is a Java XML binding schema generator.</para>
-          <indexterm zone="icedtea6 schemagen-it6">
-            <primary sortas="b-schemagen">schemagen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver-it6">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>returns the serialVersionUID for one or more classes in a
-          form suitable for copying into an evolving class.</para>
-          <indexterm zone="icedtea6 serialver-it6">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="servertool-it6">
-        <term><command>servertool</command></term>
-        <listitem>
-          <para>provides an ease-of-use interface for application programmers
-          to register, unregister, startup and shutdown a server.</para>
-          <indexterm zone="icedtea6 servertool-it6">
-            <primary sortas="b-servertool">servertool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tnameserv-it6">
-        <term><command>tnameserv</command></term>
-        <listitem>
-          <para>starts the Java IDL name server.</para>
-          <indexterm zone="icedtea6 tnameserv-it6">
-            <primary sortas="b-tnameserv">tnameserv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unpack200-it6">
-        <term><command>unpack200</command></term>
-        <listitem>
-          <para>is a native implementation that transforms a packed file
-          produced by <application>pack200</application> into a jar
-          file.</para>
-          <indexterm zone="icedtea6 unpack200-it6">
-            <primary sortas="b-unpack200">unpack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsgen-it6">
-        <term><command>wsgen</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts used in JAX-WS
-          web services.</para>
-          <indexterm zone="icedtea6 wsgen-it6">
-            <primary sortas="b-wsgen">wsgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsimport-it6">
-        <term><command>wsimport</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts.</para>
-          <indexterm zone="icedtea6 wsimport-it6">
-            <primary sortas="b-wsimport">wsimport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xjc-it6">
-        <term><command>xjc</command></term>
-        <listitem>
-          <para>is a Java XML binding compiler.</para>
-          <indexterm zone="icedtea6 xjc-it6">
-            <primary sortas="b-xjc">xjc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/junit.xml
===================================================================
--- general/prog/junit.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/prog/junit.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -90,5 +90,5 @@
 
     <para>To run the <application>JUnit</application> regression self-tests,
-    you'll need to have <xref linkend="icedtea6"/>,<!-- <xref linkend="jdk"/>,--> or
+    you'll need to have <xref linkend="openjdk"/>,<!-- <xref linkend="jdk"/>,--> or
     <ulink url="http://jikes.sourceforge.net/">Jikes</ulink> installed and the
     <envar>CLASSPATH</envar> environment variable updated. Then, as an
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
+++ general/prog/openjdk.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -0,0 +1,966 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY anduin-download               "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;">
+  <!ENTITY openjdk-download-binary-x86   "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
+  <!ENTITY openjdk-bin-md5sum-x86        "b449e15c4ff908db2cb6e4729649df6b">
+  <!ENTITY openjdk-bin-size-x86          "82 MB">
+  <!ENTITY openjdk-bin-buildsize-x86     "534 MB">
+
+  <!ENTITY openjdk-download-binary-x64   "&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
+  <!ENTITY openjdk-bin-md5sum-x64        "e1430a7fccc08985ec792765477c9ede">
+  <!ENTITY openjdk-bin-size-x64          "112 MB">
+  <!ENTITY openjdk-bin-buildsize-x64     "854 MB">
+
+  <!ENTITY icedtea-download              "http://icedtea.classpath.org/download/source/icedtea-&icedtea-version;.tar.gz">
+
+  <!ENTITY icedtea-md5sum                "f9c47b7340031fe0ba2d2fc04c5785ab">
+  <!ENTITY icedtea-size                  "4.6 MB">
+
+  <!ENTITY corba-download                "&anduin-download;/corba.tar.gz">
+  <!ENTITY corba-md5sum                  "7c47c0aff6fdd10e273b32f4a0c86f9e">
+  <!ENTITY corba-size                    "1.4 MB">
+
+  <!ENTITY hotspot-download              "&anduin-download;/hotspot.tar.gz">
+  <!ENTITY hotspot-md5sum                "ccb03e59283e478e6047b243b2b33342">
+  <!ENTITY hotspot-size                  "9.0 MB">
+
+  <!ENTITY jaxp-download                 "&anduin-download;/jaxp.tar.gz">
+  <!ENTITY jaxp-md5sum                   "fe28339778835ccbcd3823a504148dc1">
+  <!ENTITY jaxp-size                     "3.8 MB">
+
+  <!ENTITY jaxws-download                "&anduin-download;/jaxws.tar.gz">
+  <!ENTITY jaxws-md5sum                  "5a5c0596865c17dc91a6541af8778aef">
+  <!ENTITY jaxws-size                    "2.7 MB">
+
+  <!ENTITY jdk-download                  "&anduin-download;/jdk.tar.gz">
+  <!ENTITY jdk-md5sum                    "4c77fcca0fc44a9c9d2b6e09f4187e0a">
+  <!ENTITY jdk-size                      "43 MB">
+
+  <!ENTITY langtools-download            "&anduin-download;/langtools.tar.gz">
+  <!ENTITY langtools-md5sum              "d8e302ddb366c363685c95f5e4a06865">
+  <!ENTITY langtools-size                "2.3 MB">
+
+  <!ENTITY openjdk-download              "&anduin-download;/openjdk.tar.gz">
+  <!ENTITY openjdk-md5sum                "86ec3297a13f512544712918db387ef5">
+  <!ENTITY openjdk-size                  "132 KB">
+
+  <!ENTITY rhino-download                "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip">
+  <!ENTITY rhino-md5sum                  "99d94103662a8d0b571e247a77432ac5">
+  <!ENTITY rhino-size                    "4.5 MB">
+
+  <!ENTITY openjdk-buildsize             "5.0-7.2 GB">
+  <!ENTITY openjdk-time                  "45 SBU (an additional 130 SBU for testsuite)">
+
+]>
+
+<sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;">
+  <?dbhtml filename="openjdk.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>OpenJDK-&openjdk-version;</title>
+
+  <indexterm zone="openjdk">
+    <primary sortas="a-OpenJDK">OpenJDK</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to OpenJDK and IcedTea</title>
+
+    <para><application>IcedTea</application> provides a build harness for the
+    <application>OpenJDK</application> package, Oracle's recently open-sourced
+    <application>Java</application> development environment.  In order to
+    provide a completely free runtime environment, similar to Oracle's closed
+    distribution, the <application>IcedTea</application> build harness also
+    provides free, and arguably better versions of parts of the JDK which
+    have not been open-sourced to date. <application>OpenJDK</application> is
+    useful for developing <application>Java</application> programs and provides
+    a complete runtime environment to run <application>Java</application>
+    programs.</para>
+
+    <note><para>The browser plugin and webstart implementation have been split
+    off into a separate project. To provide a complete implementation, you will
+    need to later install <xref linkend="icedtea-web"/>.</para></note>
+
+    <para>OpenJDK is GPL'd code, however, it should be explained that there has
+    been a special exception made for non-free projects to use these classes in
+    their proprietary products.  In similar fashion to the LGPL, which
+    allows non-free programs to link to libraries provided by free software,
+    the <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU
+    General Public License, version 2, with the Classpath Exception</ulink>
+    allows third party programs to use classes provided by free software
+    without the requirment that the third party software also be free.  As with
+    the LGPL, any modifictaions made to the free software portions of a
+    third party application, must also be made freely availible.</para>
+
+    <note>
+      <para>The IcedTea build environment includes a very thorough, open source
+      test suite titled <application>JTreg</application>.
+      <application>JTreg</application> is intended to test the just built JDK
+      for reasonable compatibility with the closed Oracle JDK.  However, in
+      order for an independent implementation to claim compatibility, including
+      the Oracle sponsored <application>OpenJDK</application> project, it must
+      pass a closed <application>JCK/TCK</application> test suite.  No claims
+      of compatibility, even partial compatibility,  may be made without
+      passing an approved test suite.</para>
+
+      <para>Oracle does provide free community access, on a case by case basis,
+      to a closed toolkit to ensure 100% compatibility with its proprietary JDK.
+      The binary version provided here has not been tested against the
+      <ulink url="http://openjdk.java.net/groups/conformance/JckAccess/jck-access.html">
+      TCK</ulink>. Any version that is built using the instructions given,
+      cannot claim to be compatible with the proprietary JDK, without the user
+      applying for, and completing the compatibility tests themselves.</para>
+
+      <para>With that in mind, the binaries produced using this build method are
+      regularly tested against the TCK by the members listed on the site above.
+      In addition to the community license above, an educational, non-commercial
+      license for the TCK can be obtained from
+      <ulink url="http://www.oracle.com/technetwork/java/index-137188.html">
+      here</ulink>.</para>
+    </note>
+
+    &lfs71_checked;
+
+    <bridgehead renderas="sect3">Source Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>IcedTea Source Package
+          <simplelist>
+            <member>Download: <ulink url="&icedtea-download;"/></member>
+            <member>Download MD5 sum: &icedtea-md5sum;</member>
+            <member>Download Size: &icedtea-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Corba Source
+          <simplelist>
+            <member>Download: <ulink url="&corba-download;"/></member>
+            <member>Download MD5 sum: &corba-md5sum;</member>
+            <member>Download Size: &corba-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Hotspot Source
+          <simplelist>
+            <member>Download: <ulink url="&hotspot-download;"/></member>
+            <member>Download MD5 sum: &hotspot-md5sum;</member>
+            <member>Download Size: &hotspot-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>IcedTea Build Source
+          <simplelist>
+            <member>Download: <ulink url="&openjdk-download;"/></member>
+            <member>Download MD5 sum: &openjdk-md5sum;</member>
+            <member>Download Size: &openjdk-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>JAXP Source
+          <simplelist>
+            <member>Download: <ulink url="&jaxp-download;"/></member>
+            <member>Download MD5 sum: &jaxp-md5sum;</member>
+            <member>Download Size: &jaxp-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>JAXWS Source
+          <simplelist>
+            <member>Download: <ulink url="&jaxws-download;"/></member>
+            <member>Download MD5 sum: &jaxws-md5sum;</member>
+            <member>Download Size: &jaxws-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Langtools Source
+          <simplelist>
+            <member>Download: <ulink url="&langtools-download;"/></member>
+            <member>Download MD5 sum: &langtools-md5sum;</member>
+            <member>Download Size: &langtools-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>OpenJDK Source
+          <simplelist>
+            <member>Download: <ulink url="&jdk-download;"/></member>
+            <member>Download MD5 sum: &jdk-md5sum;</member>
+            <member>Download Size: &jdk-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &openjdk-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &openjdk-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Binary download (x86):
+        <ulink url="&openjdk-download-binary-x86;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &openjdk-bin-md5sum-x86;</para>
+      </listitem>
+      <listitem>
+        <para>Download size (binary): &openjdk-bin-size-x86;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &openjdk-bin-buildsize-x86;</para>
+      </listitem>
+    </itemizedlist>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Binary download (x86_64):
+        <ulink url="&openjdk-download-binary-x64;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &openjdk-bin-md5sum-x64;</para>
+      </listitem>
+      <listitem>
+        <para>Download size (binary): &openjdk-bin-size-x64;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &openjdk-bin-buildsize-x64;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <bridgehead renderas="sect4">Required Patches</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/icedtea-&icedtea-version;-generate_cacerts-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/icedtea-&icedtea-version;-fixed_paths-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/icedtea-&icedtea-version;-fix_tests-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Required Jar File</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Rhino Java Script
+          <simplelist>
+            <member>Download: <ulink url="&rhino-download;"/></member>
+            <member>Download MD5 sum: &rhino-md5sum;</member>
+            <member>Download Size: &rhino-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+    </itemizedlist>
+    <bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies (required for
+    source installation)</bridgehead>
+    <para role="optional">
+      <xref linkend="cacerts"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="giflib"/>,
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="xorg7-lib"/> and
+      <xref linkend="xulrunner"/>.
+    </para>
+
+    <bridgehead renderas="sect4">Additional Requirements
+    (for source build, including optional requirements)</bridgehead>
+    <para role="required">
+    <xref linkend="apache-ant"/>,
+    <xref linkend="cpio"/>,
+    <xref linkend="unzip"/>,
+    <xref linkend="which"/>, and
+    <xref linkend="zip"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/openjdk"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of OpenJDK</title>
+
+    <para>The instructions below install both the binary and source versions.
+    You may stop after installing the binary version or continue on installing
+    the source version. You can choose to keep either or both.</para>
+
+    <bridgehead renderas="sect3">OpenJDK Binary Installation</bridgehead>
+    <para>Begin by extracting the appropriate binary tarball and changing to
+    the extracted dirctory. Install the binary
+    <application>OpenJDK</application> with the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -vdm755 /opt/OpenJDK-&openjdk-version;-bin &amp;&amp;
+cp -R * /opt/OpenJDK-&openjdk-version;-bin &amp;&amp;
+chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
+
+    <para>Configure the temporary <application>OpenJDK</application> 
+    installation with the following commands:</para>
+
+<screen><userinput>export PATH_HOLD="${PATH}" &amp;&amp;
+export JAVA_HOME="/opt/OpenJDK-&openjdk-version;-bin" &amp;&amp;
+export CLASSPATH=".:/usr/share/java" &amp;&amp;
+export PATH="${PATH}:${JAVA_HOME}/bin"</userinput></screen>
+
+    <para>The binary version is now installed. If you don't want to compile the
+    sources, skip ahead to the configuration section.</para>
+
+    <bridgehead renderas="sect3">OpenJDK Source Installation</bridgehead>
+    <note><para>The source build of OpenJDK requires
+    <xref linkend="apache-ant"/>.  You'll need to build that first to satisfy
+    the reciprocal dependency, and return to this section to continue building
+    OpenJDK.</para></note>
+
+    <para>Unlike other packages in BLFS, the <application>OpenJDK</application>
+    source packages are distributed in multiple downloads. Since the IcedTea
+    build harness wil be used to build <application>OpenJDK</application>,
+    begin by extracting the IcedTea package and changing into the
+    extracted dirctory.</para>
+
+    <para>The IcedTea <application>OpenJDK</application> distribuion requires
+    that <filename>js.jar</filename> (from the Rhino package) be in place in
+    order to provide a java-script implementation for the free JDK. If you have
+    not installed the js.jar file in another way, do so with the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>unzip ../../rhino1_7R3.zip &amp;&amp;
+install -v -d -m755 /usr/share/java &amp;&amp;
+install -v -m755 rhino1_7R3/*.jar /usr/share/java</userinput></screen>
+
+    <para>As mentioned previously, <application>OpenJDK</application> is
+    composed of several individual projects of the proprietary
+    <application>JDK</application> that have been relicensed under an open
+    source license.  Put all of the individual components into the source tree
+    with the following commands:</para>
+
+<screen><userinput>cp -v ../corba.tar.gz . &amp;&amp;
+cp -v ../hotspot.tar.gz . &amp;&amp;
+cp -v ../jaxp.tar.gz . &amp;&amp;
+cp -v ../jaxws.tar.gz . &amp;&amp;
+cp -v ../jdk.tar.gz . &amp;&amp;
+cp -v ../langtools.tar.gz . &amp;&amp;
+cp -v ../openjdk.tar.gz .</userinput></screen>
+
+    <para>Apply a patch to generate a valid cacerts file using the system CA
+    certificates:</para>
+
+<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-generate_cacerts-1.patch</userinput></screen>
+
+    <para>Apply a patch to replace fixed paths with ones appropriate for
+    BLFS:</para>
+
+<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fixed_paths-1.patch</userinput></screen>
+
+    <para>Apply a patch to exclude known broken tests from the test suite:</para>
+
+<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fix_tests-1.patch</userinput></screen>
+
+
+    <para>Configure and build the package with the following commands:</para>
+
+<screen><userinput>unset JAVA_HOME &amp;&amp;
+./autogen.sh &amp;&amp;
+./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin \
+            --enable-nss \
+            --enable-pulse-java &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make jtregcheck</command>. The
+    included version of <application>jtreg</application> is old, and the test
+    suite is also very dependent on the host system and the environment that it
+    is run in. You should expect to see anywhere between a clean set of tests
+    and up to 160 failures in jdk with up to 17 errors in the tests themselves.
+    The majority of the 6000+ tests should pass. The reason for the
+    greatly varrying results is due to how stringent the testing environment
+    must be. Varrying architechtures, different versions of dependent
+    libraries, unexpected X Window environment and window managers, the CA
+    certificates used to generate the <filename>cacerts</filename> file, and
+    even any user input or power management or screen saver interuptions during
+    the testing can lead to various failures. While the known broken tests have
+    been removed, with the fix_tests patch above, the graphics tests faiulres
+    cannot be pre-determined (short of removing them all). Best bet for a
+    completely clean result is to run the test suite in a frambuffer on a
+    different screen (Xvfb). Even still, Disk I/O can cause failures.</para>
+
+    <para>Install the package with the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cp -R openjdk.build/j2sdk-image /opt/OpenJDK-&openjdk-version; &amp;&amp;
+chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>./autogen.sh</command>: This command forces rebuilding of
+    auto-generated files to account for new options added to
+    <filename>configure</filename>.</para>
+
+    <para><parameter>--with-jdk-home</parameter>: This switch provides the
+    location of the temporary <application>JDK</application>.</para>
+
+    <para><parameter>--enable-nss</parameter>: This switch enables the 
+    build to utilize additional crytography supplied by the nss
+    libraries.</para>
+
+    <para><parameter>--enable-pulse-audio</parameter>: This switch enables
+    building of the pulseaudio libraries (needed to provide a complete
+    implementation that is reasonably compatible with the proprietary
+    JDK).</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring OpenJDK</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>There are now two <application>OpenJDK</application> SDKs
+      installed in <filename>/opt</filename>. You should decide on which one
+      you would like to use as the default. For example if you decide to use
+      the precompiled <application>OpenJDK</application>, do the following as
+      the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version;-bin /opt/OpenJDK</userinput></screen>
+
+    <para>The information below assumes your system is set up using the
+    instructions found in
+    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
+    extract the relevant information below and incorporate it into your
+    system's startup files if your system is set up differently.</para>
+
+    <para>Add the following <filename>openjdk.sh</filename> shell startup file
+    to the <filename>/etc/profile.d</filename> directory with the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/openjdk.sh
+
+# Set JAVA_HOME directory
+JAVA_HOME=/opt/OpenJDK
+
+# Adjust PATH
+pathappend ${JAVA_HOME}/bin PATH
+
+# Auto Java CLASSPATH
+# Copy jar files to, or create symlinks in this directory
+AUTO_CLASSPATH_DIR=/usr/share/java
+pathprepend . CLASSPATH
+for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
+    pathappend $dir CLASSPATH
+done
+for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
+    pathappend $jar CLASSPATH
+done
+
+export JAVA_HOME CLASSPATH
+unset AUTO_CLASSPATH_DIR
+unset dir
+unset jar
+
+# End /etc/profile.d/openjdk.sh</literal>
+EOF</userinput></screen>
+
+    <para>Finally, add the man pages to <application>man_db</application>'s
+    configuration. As the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
+<literal>MANDATORY_MANPATH     /opt/OpenJDK/man
+MANPATH_MAP           /opt/OpenJDK/bin     /opt/OpenJDK/man
+MANDB_MAP             /opt/OpenJDK/man     /var/cache/man/OpenJDK</literal>
+EOF
+mandb -c /opt/OpenJDK/man</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>appletviewer, apt, extcheck, idlj, jar,
+        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
+        jcmd, jconsole, jdb, jhat, jinfo, jmap, jps,
+        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
+        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
+        schemagen, serialver, servertool, tnameserv, unpack200,
+        wsgen, wsimport, and xjc</seg>
+        <seg><envar>$JAVA_HOME</envar>/lib/*, and
+        <envar>$JAVA_HOME</envar>/jre/lib/*</seg>
+        <seg>/opt/openjdk-&openjdk-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="appletviewer">
+        <term><command>appletviewer</command></term>
+        <listitem>
+          <para>allows you to run applets outside of a web browser.</para>
+          <indexterm zone="openjdk appletviewer">
+            <primary sortas="b-appletviewer">appletviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="apt">
+        <term><command>apt</command></term>
+        <listitem>
+          <para>is an annotation processing tool.</para>
+          <indexterm zone="openjdk apt">
+            <primary sortas="b-apt">apt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="extcheck">
+        <term><command>extcheck</command></term>
+        <listitem>
+          <para>checks a specified jar file for title and version conflicts
+          with any extensions installed in the
+          <application>OpenJDK</application> software.</para>
+          <indexterm zone="openjdk extcheck">
+            <primary sortas="b-extcheck">extcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="idlj">
+        <term><command>idlj</command></term>
+        <listitem>
+          <para>generates Java bindings from a given IDL file.</para>
+          <indexterm zone="openjdk idlj">
+            <primary sortas="b-idlj">idlj</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jar">
+        <term><command>jar</command></term>
+        <listitem>
+          <para>combines multiple files into a single jar archive.</para>
+          <indexterm zone="openjdk jar">
+            <primary sortas="b-jar">jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jarsigner">
+        <term><command>jarsigner</command></term>
+        <listitem>
+          <para>signs jar files and verifies the signatures and integrity
+          of a signed jar file.</para>
+          <indexterm zone="openjdk jarsigner">
+            <primary sortas="b-jarsigner">jarsigner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="java">
+        <term><command>java</command></term>
+        <listitem>
+          <para>launches a Java application by starting a Java runtime
+          environment, loading a specified class and invoking its main
+          method.</para>
+          <indexterm zone="openjdk java">
+            <primary sortas="b-java">java</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javac">
+        <term><command>javac</command></term>
+        <listitem>
+          <para>reads class and interface definitions, written in the
+          Java programming language, and compiles them into bytecode
+          class files.</para>
+          <indexterm zone="openjdk javac">
+            <primary sortas="b-javac">javac</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javadoc">
+        <term><command>javadoc</command></term>
+        <listitem>
+          <para>parses the declarations and documentation comments in a
+          set of Java source files and produces a corresponding set of
+          HTML pages describing the classes, interfaces,constructors,
+          methods, and fields.</para>
+          <indexterm zone="openjdk javadoc">
+            <primary sortas="b-javadoc">javadoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javah">
+        <term><command>javah</command></term>
+        <listitem>
+          <para>generates C header and source files
+          that are needed to implement native methods.</para>
+          <indexterm zone="openjdk javah">
+            <primary sortas="b-javah">javah</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javap">
+        <term><command>javap</command></term>
+        <listitem>
+          <para>disassembles a Java class file.</para>
+          <indexterm zone="openjdk javap">
+            <primary sortas="b-javap">javap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="java-rmi.cgi">
+        <term><command>java-rmi.cgi</command></term>
+        <listitem>
+          <para>is the Java RMI client.</para>
+          <indexterm zone="openjdk java-rmi.cgi">
+            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jcmd">
+        <term><command>jcmd</command></term>
+        <listitem>
+          <para>is a utility to send diagnostic command requests to a running
+          Java Virtual Machine.</para>
+          <indexterm zone="openjdk jcmd">
+            <primary sortas="b-jcmd">jcmd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jconsole">
+        <term><command>jconsole</command></term>
+        <listitem>
+          <para>is a graphical console tool to monitor and manage both
+          local and remote Java applications and virtual machines.</para>
+          <indexterm zone="openjdk jconsole">
+            <primary sortas="b-jconsole">jconsole</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jdb">
+        <term><command>jdb</command></term>
+        <listitem>
+          <para>is a simple command-line debugger for Java classes.</para>
+          <indexterm zone="openjdk jdb">
+            <primary sortas="b-jdb">jdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jhat">
+        <term><command>jhat</command></term>
+        <listitem>
+          <para>parses a java heap dump file and allows viewing
+          in a webbrowser.</para>
+          <indexterm zone="openjdk jhat">
+            <primary sortas="b-jhat">jhat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jinfo">
+        <term><command>jinfo</command></term>
+        <listitem>
+          <para>prints Java configuration information for a given Java
+          process, core file, or a remote debug server.</para>
+          <indexterm zone="openjdk jinfo">
+            <primary sortas="b-jinfo">jinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jmap">
+        <term><command>jmap</command></term>
+        <listitem>
+          <para>prints shared object memory maps or heap memory details
+          of a given process, core file, or a remote debug server.</para>
+          <indexterm zone="openjdk jmap">
+            <primary sortas="b-jmap">jmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jps">
+        <term><command>jps</command></term>
+        <listitem>
+          <para>lists the instrumented JVMs on the target system.</para>
+          <indexterm zone="openjdk jps">
+            <primary sortas="b-jps">jps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jrunscript">
+        <term><command>jrunscript</command></term>
+        <listitem>
+          <para>is a command line script shell.</para>
+          <indexterm zone="openjdk jrunscript">
+            <primary sortas="b-jrunscript">jrunscript</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jsadebugd">
+        <term><command>jsadebugd</command></term>
+        <listitem>
+          <para>attaches to a Java process or core file and acts as a
+          debug server.</para>
+          <indexterm zone="openjdk jsadebugd">
+            <primary sortas="b-jsadebugd">jsadebugd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstack">
+        <term><command>jstack</command></term>
+        <listitem>
+          <para>prints Java stack traces of Java threads for a given
+          Java process, core file, or a remote debug server.</para>
+          <indexterm zone="openjdk jstack">
+            <primary sortas="b-jstack">jstack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstat">
+        <term><command>jstat</command></term>
+        <listitem>
+          <para>displays performance statistics for an instrumented JVM.</para>
+          <indexterm zone="openjdk jstat">
+            <primary sortas="b-jstat">jstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstatd">
+        <term><command>jstatd</command></term>
+        <listitem>
+          <para>is an RMI server application that monitors for the creation
+          and termination of instrumented JVMs.</para>
+          <indexterm zone="openjdk jstatd">
+            <primary sortas="b-jstatd">jstatd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="keytool">
+        <term><command>keytool</command></term>
+        <listitem>
+          <para>is a key and certificate management utility.</para>
+          <indexterm zone="openjdk keytool">
+            <primary sortas="b-keytool">keytool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="native2ascii">
+        <term><command>native2ascii</command></term>
+        <listitem>
+          <para> converts files that contain non-supported character encoding
+          into files containing Latin-1 or Unicode-encoded characters.</para>
+          <indexterm zone="openjdk native2ascii">
+            <primary sortas="b-native2ascii">native2ascii</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="orbd">
+        <term><command>orbd</command></term>
+        <listitem>
+          <para>is used to enable clients to transparently locate and invoke
+          persistent objects on servers in the CORBA environment.</para>
+          <indexterm zone="openjdk orbd">
+            <primary sortas="b-orbd">orbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pack200">
+        <term><command>pack200</command></term>
+        <listitem>
+          <para>is a Java application that transforms a jar file into a
+          compressed pack200 file using the Java gzip compressor.</para>
+          <indexterm zone="openjdk pack200">
+            <primary sortas="b-pack200">pack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="policytool">
+        <term><command>policytool</command></term>
+        <listitem>
+          <para>creates and manages a policy file graphically.</para>
+          <indexterm zone="openjdk policytool">
+            <primary sortas="b-policytool">policytool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmic">
+        <term><command>rmic</command></term>
+        <listitem>
+          <para>generates stub and skeleton class files for remote objects
+          from the names of compiled Java classes that contain remote
+          object implementations.</para>
+          <indexterm zone="openjdk rmic">
+            <primary sortas="b-rmic">rmic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmid">
+        <term><command>rmid</command></term>
+        <listitem>
+          <para>starts the activation system daemon.</para>
+          <indexterm zone="openjdk rmid">
+            <primary sortas="b-rmid">rmid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmiregistry">
+        <term><command>rmiregistry</command></term>
+        <listitem>
+          <para>creates and starts a remote object registry on the specified
+          port on the current host.</para>
+          <indexterm zone="openjdk rmiregistry">
+            <primary sortas="b-rmiregistry">rmiregistry</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="schemagen">
+        <term><command>schemagen</command></term>
+        <listitem>
+          <para>is a Java XML binding schema generator.</para>
+          <indexterm zone="openjdk schemagen">
+            <primary sortas="b-schemagen">schemagen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="serialver">
+        <term><command>serialver</command></term>
+        <listitem>
+          <para>returns the serialVersionUID for one or more classes in a
+          form suitable for copying into an evolving class.</para>
+          <indexterm zone="openjdk serialver">
+            <primary sortas="b-serialver">serialver</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="servertool">
+        <term><command>servertool</command></term>
+        <listitem>
+          <para>provides an ease-of-use interface for application programmers
+          to register, unregister, startup and shutdown a server.</para>
+          <indexterm zone="openjdk servertool">
+            <primary sortas="b-servertool">servertool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tnameserv">
+        <term><command>tnameserv</command></term>
+        <listitem>
+          <para>starts the Java IDL name server.</para>
+          <indexterm zone="openjdk tnameserv">
+            <primary sortas="b-tnameserv">tnameserv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unpack200">
+        <term><command>unpack200</command></term>
+        <listitem>
+          <para>is a native implementation that transforms a packed file
+          produced by <application>pack200</application> into a jar
+          file.</para>
+          <indexterm zone="openjdk unpack200">
+            <primary sortas="b-unpack200">unpack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsgen">
+        <term><command>wsgen</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts used in JAX-WS
+          web services.</para>
+          <indexterm zone="openjdk wsgen">
+            <primary sortas="b-wsgen">wsgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsimport">
+        <term><command>wsimport</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts.</para>
+          <indexterm zone="openjdk wsimport">
+            <primary sortas="b-wsimport">wsimport</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xjc">
+        <term><command>xjc</command></term>
+        <listitem>
+          <para>is a Java XML binding compiler.</para>
+          <indexterm zone="openjdk xjc">
+            <primary sortas="b-xjc">xjc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/prog/prog.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -36,5 +36,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="git.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea6.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/prog/subversion.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -109,5 +109,5 @@
     <bridgehead renderas="sect4">Optional (for the Java Bindings)</bridgehead>
     <para role="optional">
-      One of <xref linkend="icedtea6"/>, 
+      One of <xref linkend="openjdk"/>, 
      <!-- <xref linkend="jdk"/>, -->
       <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
Index: general/sysutils/apache-ant.xml
===================================================================
--- general/sysutils/apache-ant.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ general/sysutils/apache-ant.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -68,5 +68,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="icedtea6"/> <!-- or <xref linkend="jdk"/> -->
+      <xref linkend="openjdk"/> <!-- or <xref linkend="jdk"/> -->
     </para>
 
Index: gnome/add/libgda.xml
===================================================================
--- gnome/add/libgda.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ gnome/add/libgda.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -98,5 +98,5 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="gtksourceview"/>,
-      <xref linkend="icedtea6"/>,
+      <xref linkend="openjdk"/>,
       <xref linkend="mysql"/>,
       <xref linkend="openldap"/> and
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ introduction/welcome/changelog.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -43,4 +43,16 @@
 -->
     <listitem>
+      <para>June 7th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Added OpenJDK-1.7.0.4.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Removed IcedTea6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
+    <listitem>
       <para>June 6th, 2012</para>
       <itemizedlist>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ postlfs/security/cyrus-sasl.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -82,5 +82,5 @@
     <xref linkend="openldap"/>,
     <xref linkend="mitkrb"/>,
-    <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
+    <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/>-->,
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ postlfs/security/openssh.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -96,5 +96,5 @@
     <bridgehead renderas="sect4">Optional Runtime (Used only to gather entropy)</bridgehead>
     <para role="optional">
-      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
+      <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/>-->,
       <xref linkend="net-tools"/> and
       <xref linkend="sysstat"/>.
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ pst/printing/cups.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -81,5 +81,5 @@
       <xref linkend="gs"/>,
       <xref linkend="python2"/>,
-      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
+      <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/>-->,
       <ulink url="http://portland.freedesktop.org/wiki/">Xdg-utils</ulink>,
       <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ server/databases/db.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -78,5 +78,5 @@
     <para role="optional">
       <xref linkend="tcl"/>,
-      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->, and
+      <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/>-->, and
       <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
     </para>
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision eaa4f8787bb90298fa812627337a426a767fae28)
+++ xsoft/other/icedtea-web.xml	(revision 49b50d4c7e5236b6c83a22ca505220f3f16733dd)
@@ -62,5 +62,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="icedtea6"/>, and 
+      <xref linkend="openjdk"/>, and 
       <xref linkend="xulrunner"/>
     </para>
