Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ basicnet/netprogs/subversion.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -65,5 +65,5 @@
 <xref linkend="openssh"/> (runtime only), 
 <ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>, 
-<xref linkend="j2sdk"/> (to build the <application>JAVA</application> 
+<xref linkend="jdk"/> (to build the <application>JAVA</application> 
 bindings), 
 <ulink url="http://www.junit.org/">JUnit</ulink> (for running the 
Index: general.ent
===================================================================
--- general.ent	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ general.ent	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -136,6 +136,6 @@
 <!ENTITY gcc3-version                 "3.3.4">
 <!ENTITY guile-version                "1.6.7">
-<!ENTITY j2sdk-bin-version            "1.4.2_07">
-<!ENTITY j2sdk-src-version            "1.4.2">
+<!ENTITY jdk-bin-version              "1.5.0_02">
+<!ENTITY jdk-src-version              "1.5.0">
 <!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "0.98.39">
Index: general/genutils/pilot-link.xml
===================================================================
--- general/genutils/pilot-link.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ general/genutils/pilot-link.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -55,5 +55,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libpng"/>, 
-<xref linkend="j2sdk"/>, 
+<xref linkend="jdk"/>, 
 <xref linkend="tcl"/>, 
 <xref linkend="python"/> and 
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ general/prog/gcc.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -175,8 +175,8 @@
 <note><para>Some of the <application>Java</application> programs installed by 
 the <application><acronym>GCC</acronym></application> package conflict (have 
-the same names) with programs from the <xref linkend="j2sdk"/> package. If 
+the same names) with programs from the <xref linkend="jdk"/> package. If 
 you're installing the <application>Java</application> language from the 
 <application><acronym>GCC</acronym></application> package but you wish to 
-use the programs from the <application>J2SDK</application> as the defaults, 
+use the programs from the <application>JDK</application> as the defaults, 
 ensure <filename class='directory'>$JAVA_HOME/bin</filename> is listed before 
 <filename class='directory'>/usr/bin</filename> in your <envar>PATH</envar> 
Index: neral/prog/j2sdk.xml
===================================================================
--- general/prog/j2sdk.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ 	(revision )
@@ -1,570 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY j2sdk-download-source "http://www.sun.com/software/communitysource/j2se/java2/download.html">
-  <!ENTITY j2sdk-download-binary "http://java.sun.com/j2se/1.4.2/download.html">
-  <!ENTITY j2sdk-source-md5sum   "http://anduin.linuxfromscratch.org/sources/BLFS/SVN/I-K/j2sdk-&j2sdk-src-version;.md5sums">
-  <!ENTITY j2sdk-bin-md5sum      "a55a9150977de7d5c7f78d29593a8b8c">
-  <!ENTITY j2sdk-bin-size        "36.4 MB">
-  <!ENTITY j2sdk-src-size        "55.1 MB (three .zip files)">
-  <!ENTITY j2sdk-src-buildsize   "1285 MB">
-  <!ENTITY j2sdk-time            "29.57 SBU">
-]>
-
-<sect1 id="j2sdk" xreflabel="J2SDK-&j2sdk-src-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="j2sdk.html" ?>
-<title><application>J2<acronym>SDK</acronym></application>-&j2sdk-src-version;</title>
-<indexterm zone="j2sdk">
-<primary sortas="a-J2SDK">J2SDK</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to 
-<application>J2<acronym>SDK</acronym></application></title>
-
-<para>The <application>J2<acronym>SDK</acronym></application> package contains 
-Sun's <application>Java</application> development environment. This is useful 
-for developing <application>Java</application> programs and provides the 
-runtime environment necessary to run <application>Java</application> programs. 
-It also includes a plug-in for browsers so that they can be 
-<application>Java</application> aware.</para>
-
-<para>The <acronym>JDK</acronym> comes in two flavors, a precompiled binary 
-and a source package. Previously, the plugin included in the 
-<acronym>JDK</acronym> binary package was unusable on <acronym>LFS</acronym> 
-owing to incompatibilities with <acronym>GCC</acronym>-3 compiled browsers. 
-This is not the case anymore.</para>
-
-<para>The source package requires registration at the Sun developer site and 
-accepting the Sun Community Source License. The source code cannot be 
-downloaded from some countries, so for users from those countries, the binary 
-may be the only option.</para>
-
-<para>Even if you plan on compiling the <acronym>JDK</acronym> source, you will 
-need to download the binary version to bootstrap the <acronym>JDK</acronym>
-build. Follow the link below to download both source and binary packages. When
-downloading the source (two files required), also download the 
-<application>Mozilla</application> headers package available at the same 
-location. To build from source, you'll end up downloading a total of four 
-files.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Binary download: 
-<ulink url="&j2sdk-download-binary;"/></para></listitem>
-<listitem><para>Source download: 
-<ulink url="&j2sdk-download-source;"/></para></listitem>
-<listitem><para>Version used (binary): 
-&j2sdk-bin-version;</para></listitem>
-<listitem><para>Download MD5 sum (binary): 
-&j2sdk-bin-md5sum;</para></listitem>
-<listitem><para>Download MD5 sum (source): 
-<ulink url="&j2sdk-source-md5sum;"/></para></listitem>
-<listitem><para>Download size (binary): 
-&j2sdk-bin-size;</para></listitem>
-<listitem><para>Download size (source): 
-&j2sdk-src-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&j2sdk-src-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&j2sdk-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-fix_inline_asm-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-gcc33-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-motif_mkmsgcat-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-nptl-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_debug_image-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_fixed_paths-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-static_cxx-1.patch"/></para>
-</listitem>
-<listitem><para><ulink 
-url="&patch-root;/j2sdk-&j2sdk-src-version;-ash-1.patch"/> 
-(Only required if /bin/sh is symlinked to <xref linkend="ash"/>)</para>
-</listitem>
-</itemizedlist>
-</sect3>
-
-<sect3><title><application>J2SDK</application> dependencies</title>
-<sect4><title>Required (to build <application>J2SDK</application> from 
-source)</title>
-<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="zip"/>, 
-<xref linkend="unzip"/>, 
-<xref linkend="cpio"/>, 
-<xref linkend="alsa"/>, 
-<xref linkend="tcsh"/> and 
-<xref linkend="gcc3"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>J2SDK</application></title>
-
-<para>Both versions will be installed in parallel. You may choose to keep
-either or both.</para>
-
-<para>Installation of the precompiled <acronym>JDK</acronym> is easy:
-create a directory to install from, copy the .bin there, and run the
-following commands:</para>
-
-<screen><userinput><command>export VERSION=&j2sdk-bin-version; &amp;&amp;
-export MV=`echo $VERSION | cut -d "_" -f 1,1` &amp;&amp;
-export V=`echo ${VERSION} | sed -e "s/\./_/g"` &amp;&amp;
-sed -i "s:^PATH=.*::" j2sdk-${V}-linux-i?86.bin &amp;&amp;
-chmod +x j2sdk-${V}-linux-i?86.bin &amp;&amp;
-mkdir -p bin &amp;&amp;
-ln -sf /bin/true bin/more &amp;&amp;
-yes | PATH=$PWD/bin:$PATH ./j2sdk-${V}-linux-i?86.bin &amp;&amp;
-cd j2sdk${VERSION}</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>install -d /opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
-mv * /opt/j2sdk/j2sdk-precompiled-${MV}
-chown -R root:root /opt/j2sdk/j2sdk-precompiled-${MV}</command></userinput></screen>
-
-<para>The binary version is now installed.</para>
-
-<para>If you don't want to compile the source or are not in a position to 
-download the source owing to license restrictions, skip ahead to the 
-configuration section.</para>
-
-<para>Add the recently installed <acronym>JDK</acronym> to the path.</para>
-
-<screen><userinput><command>export JAVA_HOME=/opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
-export PATH=$PATH:${JAVA_HOME}/bin</command></userinput></screen>
-
-<para>Unzip the sources:</para>
-
-<screen><userinput><command>mkdir j2sdk-build &amp;&amp;
-cd j2sdk-build &amp;&amp;
-VERSION=&j2sdk-src-version; &amp;&amp;
-V=`echo $VERSION | sed -e "s/\./_/g"` &amp;&amp;
-unzip ../j2sdk-${V}-src-scsl.zip &amp;&amp;
-unzip ../j2sdk-${V}-mozilla_headers-unix.zip &amp;&amp;
-unzip ../j2sdk-${V}-bin-scsl.zip</command></userinput></screen>
-
-<para>Apply all the patches downloaded above.</para>
-
-<screen><userinput><command>for PATCH in ../j2sdk-&j2sdk-src-version;*.patch
-do
-   patch -Np1 -i $PATCH
-done</command></userinput></screen>
-
-<para>Set/unset some variables which affect the build:</para>
-
-<screen><userinput><command>export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;
-unset JAVA_HOME &amp;&amp;
-unset CLASSPATH
-unset CFLAGS
-unset CXXFLAGS
-unset LDFLAGS
-export ALT_DEVTOOLS_PATH="/usr/bin" &amp;&amp;
-export BUILD_NUMBER="blfs-`date +%s`" &amp;&amp;
-export DEV_ONLY=true &amp;&amp;
-export ALT_MOZILLA_PATH=$PWD &amp;&amp;
-export INSANE=true &amp;&amp;
-export MAKE_VERBOSE=true &amp;&amp;
-export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts
-export PATH_HOLD=$PATH
-export PATH=/opt/gcc-&gcc3-version;/bin:$PATH</command></userinput></screen>
-
-<warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make the build 
-fail. If you are interested in optimizing the build, set 
-OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.</para></warning>
-
-<para>Additionally, if you would like to make in parallel, add the following
-(adjust <envar>MAKE_PARALLEL</envar> to your liking):</para>
-
-<screen><userinput><command>export HOTSPOT_BUILD_JOBS=$MAKE_PARALLEL</command></userinput></screen>
-
-<para>If the included <application>Motif</application> doesn't build properly, 
-the error is noticed much later in the build. A solution is to build the 
-<application>Motif</application> library before compiling the 
-<application>J2<acronym>SDK</acronym></application>.</para>
-
-<screen><userinput><command>cd motif/lib/Xm &amp;&amp;
-make &amp;&amp;
-cd ../../..</command></userinput></screen>
-
-<para>Build <application>J2SDK</application> with the following
-commands. There will be a lot of messages about missing files that look like
-errors. As long as the build doesn't stop, the messages are harmless, so 
-ignore them.</para>
-
-<screen><userinput><command>cd control/make &amp;&amp;
-make &amp;&amp;
-cd ../build/linux-i?86</command></userinput></screen>
-
-<para>Now, as the root user, install <application>J2SDK</application>:</para>
-
-<screen><userinput role='root'><command>cp -a j2sdk-image /opt/j2sdk/j2sdk-&j2sdk-src-version; &amp;&amp;
-chown -R root:root /opt/j2sdk/j2sdk-&j2sdk-src-version;</command></userinput></screen>
-
-<para>Restore the environment using the following commands:</para>
-
-<screen><userinput><command>unset VERSION &amp;&amp;
-unset MV &amp;&amp;
-unset V &amp;&amp;
-unset ALT_BOOTDIR &amp;&amp;
-unset ALT_DEVTOOLS_PATH &amp;&amp;
-unset BUILD_NUMBER &amp;&amp;
-unset DEV_ONLY &amp;&amp;
-unset ALT_MOZILLA_PATH &amp;&amp;
-unset INSANE &amp;&amp;
-unset MAKE_VERBOSE &amp;&amp;
-unset ALT_CACERTS_FILE &amp;&amp;
-export PATH=$PATH_HOLD &amp;&amp;
-unset PATH_HOLD</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><command>export ALT_BOOTDIR="$JAVA_HOME"</command>: This var sets
-the location of the bootstrap <acronym>JDK</acronym>.</para>
-
-<para><command>export ALT_MOZILLA_PATH=$PWD</command>: This sets the
-variable that points to where you unzipped the 
-<application>Mozilla</application> headers.</para>
-
-<para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command>: This
-changes the location where the build finds the needed executables.</para>
-
-<para><command>export BUILD_NUMBER="blfs-`date +%s`"</command>: This will
-help you identify this compiled version of the runtime environment and
-virtual machine by appending this information to the version in the
-output to <command>java -version</command>.</para>
-
-<para><command>export DEV_ONLY=true</command>: This command
-eliminates compiling the documentation and a dependency for
-<application>rpm</application>.</para>
-
-<para><command>unset JAVA_HOME</command>: This clears the
-<envar>JAVA_HOME</envar> variable as recommended by the build 
-instructions.</para>
-
-<para><command>unset CLASSPATH</command>: This clears the
-<envar>CLASSPATH</envar> variable as per the recommendations in the build 
-instructions.</para>
-
-<para><command>unset CFLAGS...</command>: These flags cause miscompilation
-of the build. Never set these.</para>
-
-<para><command>export INSANE=true</command>: Unless you specify that you
-are insane the build will not proceed. The certified platform for the build is
-Redhat 6.1. The above variable ensures that all the errors related to
-compiling on a non-certified platform will be converted to warnings.</para>
-
-<para><command>export MAKE_VERBOSE=true</command>: Allows the current
-compilation command to be displayed on the console.</para>
-
-<para><command>export ALT_CACERTS_FILE...</command>: Specifies the
-certificate file to use.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>J2SDK</application></title>
-
-<sect3><title>Configuration Information</title>
-
-<para>There are now two Java 2 <acronym>SDK</acronym>'s installed in
-<filename>/opt/j2sdk</filename>. You should decide on which one you
-would like to use as the default. For example if you decide to use the source
-compiled <application>J2SDK</application>, do the following:</para>
-
-<screen><userinput><command>ln -nsf j2sdk-&j2sdk-src-version; /opt/j2sdk/j2sdk</command></userinput></screen>
-
-<para>Add the following lines to your shell startup file (e.g.,
-<filename>/etc/profile</filename>).</para>
-
-<screen><userinput>export JAVA_HOME=/opt/j2sdk/j2sdk
-export PATH=$PATH:$JAVA_HOME/bin</userinput></screen>
-
-<para>Add <filename>$JAVA_HOME/man</filename> to your
-<envar>MANPATH</envar> variable or to
-<filename>/etc/man.conf</filename></para>
-
-<para>The <application>Java</application> plugin is in the directory
-<filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns610/</filename>.
-Make a symbolic link to the file in that directory from your plugins directory.
-Note that the plugin must be a symlink for it to work. If not, the browsers
-just crash when you attempt to load a <application>Java</application> 
-plugin.</para>
-
-</sect3>
-
-<sect3><title>Handling CLASSPATH</title>
-
-<para>When compiling packages, the <envar>CLASSPATH</envar> environment 
-variable is used by the <acronym>JDK</acronym> to locate classes at 
-compile-time and run-time. It is tedious to add all the classes used to the 
-<envar>CLASSPATH</envar> manually. You may add the following lines to your 
-shell startup file to set <envar>CLASSPATH</envar> automatically to include 
-all JAR files in a specified directory, which in the example below is 
-<filename>/usr/lib/auto-java-classpath</filename>.</para>
-
-<screen><userinput>AUTO_CLASSPATH_DIR=/usr/lib/auto-java-classpath
-if [ -z $CLASSPATH ]
-then
-  CLASSPATH=.:$AUTO_CLASSPATH_DIR
-else
-  CLASSPATH=$CLASSPATH:.:$AUTO_CLASSPATH_DIR
-fi
-for i in $(ls $AUTO_CLASSPATH_DIR/*.jar 2>/dev/null)
-do
-  CLASSPATH=$CLASSPATH:$i
-done</userinput></screen>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directory</segtitle>
-
-<seglistitem>
-<seg>appletviewer, extcheck, idlj, jar, jarsigner, java, javac, javadoc, 
-javah, javap, jdb, keytool, native2ascii, orbd, policytool, rmic, rmid, 
-rmiregistry, serialver, servertool and tnameserv</seg>
-<seg><envar>$JAVA_HOME</envar>/lib/*, <envar>$JAVA_HOME</envar>/jre/lib/* 
-and libjavaplugin_oji.so</seg>
-<seg>/opt/j2sdk</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="appletviewer">
-<term><command>appletviewer</command></term>
-<listitem><para>runs <application>Java</application> applets outside of the 
-context of a browser.</para>
-<indexterm zone="j2sdk appletviewer">
-<primary sortas="b-appletviewer">appletviewer</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="extcheck">
-<term><command>extcheck</command></term>
-<listitem><para>checks a specified <filename>JAR</filename> file for title 
-and version conflicts with any extensions installed in the 
-<acronym>JDK</acronym> software.</para>
-<indexterm zone="j2sdk extcheck">
-<primary sortas="b-extcheck">extcheck</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="idlj">
-<term><command>idlj</command></term>
-<listitem><para>generates <application>Java</application> bindings from a 
-given <acronym>IDL</acronym> file.</para>
-<indexterm zone="j2sdk 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 <acronym>JAR</acronym> 
-archive file.</para>
-<indexterm zone="j2sdk jar">
-<primary sortas="b-jar">jar</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="jarsigner">
-<term><command>jarsigner</command></term>
-<listitem><para>signs <filename>JAR</filename> (Java ARchive) files and 
-verifies the signatures and integrity of a signed 
-<filename>JAR</filename>.</para>
-<indexterm zone="j2sdk jarsigner">
-<primary sortas="b-jarsigner">jarsigner</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="java">
-<term><command>java</command></term>
-<listitem><para>launches a <application>Java</application> application by 
-starting a <application>Java</application> runtime environment, loading a 
-specified class and invoking its main method.</para>
-<indexterm zone="j2sdk 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 
-<application>Java</application> programming language, and compiles them into 
-bytecode class files.</para>
-<indexterm zone="j2sdk 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 
-<application>Java</application> source files and produces a corresponding set 
-of <acronym>HTML</acronym> pages describing the classes, interfaces, 
-constructors, methods, and fields.</para>
-<indexterm zone="j2sdk javadoc">
-<primary sortas="b-javadoc">javadoc</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="javah">
-<term><command>javah</command></term>
-<listitem><para>generates <application>C</application> header and source files 
-that are needed to implement native methods.</para>
-<indexterm zone="j2sdk javah">
-<primary sortas="b-javah">javah</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="javap">
-<term><command>javap</command></term>
-<listitem><para>disassembles a <application>Java</application> class 
-file.</para>
-<indexterm zone="j2sdk javap">
-<primary sortas="b-javap">javap</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="jdb">
-<term><command>jdb</command></term>
-<listitem><para>is a simple command-line debugger for 
-<application>Java</application> classes.</para>
-<indexterm zone="j2sdk jdb">
-<primary sortas="b-jdb">jdb</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="keytool">
-<term><command>keytool</command></term>
-<listitem><para>is a key and certificate management utility.</para>
-<indexterm zone="j2sdk 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="j2sdk 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 <acronym>CORBA</acronym> 
-environment.</para>
-<indexterm zone="j2sdk orbd">
-<primary sortas="b-orbd">orbd</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="policytool">
-<term><command>policytool</command></term>
-<listitem><para>creates and manages a policy file graphically.</para>
-<indexterm zone="j2sdk 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 <application>Java</application> classes that 
-contain remote object implementations.</para>
-<indexterm zone="j2sdk 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="j2sdk 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="j2sdk rmiregistry">
-<primary sortas="b-rmiregistry">rmiregistry</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="j2sdk 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="j2sdk servertool">
-<primary sortas="b-servertool">servertool</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="tnameserv">
-<term><command>tnameserv</command></term>
-<listitem><para>starts the <application>Java</application> 
-<acronym>IDL</acronym> name server.</para>
-<indexterm zone="j2sdk tnameserv">
-<primary sortas="b-tnameserv">tnameserv</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
-
Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
+++ general/prog/jdk.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY jdk-download-source "http://java.sun.com/j2se/jrl_download.html">
+  <!ENTITY jdk-download-binary "http://java.sun.com/j2se/1.5.0/download.jsp">
+  <!ENTITY jdk-source-md5sum   "http://anduin.linuxfromscratch.org/sources/BLFS/SVN/I-K/jdk/jdk-&jdk-src-version;.md5sums">
+  <!ENTITY jdk-bin-md5sum      "562d9797af801bfbe2b5e44417d8ccc4">
+  <!ENTITY jdk-bin-size        "45 MB">
+  <!ENTITY jdk-src-size        "65.7 MB (three .zip files)">
+  <!ENTITY jdk-src-buildsize   "1444 MB">
+  <!ENTITY jdk-time            "33.06 SBU">
+]>
+
+<sect1 id="jdk" xreflabel="JDK-&jdk-src-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="jdk.html" ?>
+<title><application>JDK</application>-&jdk-src-version;</title>
+<indexterm zone="jdk">
+<primary sortas="a-JDK">JDK</primary>
+</indexterm>
+
+<sect2>
+<title>Introduction to 
+<application>JDK</application></title>
+
+<para>The <application>JDK</application> package contains 
+Sun's <application>Java</application> development environment. This is useful 
+for developing <application>Java</application> programs and provides the 
+runtime environment necessary to run <application>Java</application> programs. 
+It also includes a plug-in for browsers so that they can be 
+<application>Java</application> aware.</para>
+
+<para>The <acronym>JDK</acronym> comes in two flavors, a precompiled binary 
+and a source package. Previously, the plugin included in the 
+<acronym>JDK</acronym> binary package was unusable on <acronym>LFS</acronym> 
+owing to incompatibilities with <acronym>GCC</acronym>-3 compiled browsers. 
+This is not the case anymore.</para>
+
+<para>In order to use the source code and patches, you must read and agree
+to the Sun <ulink url="http://java.sun.com/j2se/1.5.0/jrl_5.0-license.txt">
+Java Research License</ulink>. In addition, the source code cannot be 
+downloaded from some countries, so for users from those countries, the binary 
+is the only option.</para>
+
+<para>If you plan on compiling the <acronym>JDK</acronym> source, you 
+will still need to download the binary version to bootstrap the 
+<acronym>JDK</acronym> build.  You will need to download a total of four 
+files to complete the source build:  
+<filename>jdk-1_5_0_02-linux-i586.bin</filename>; 
+<filename>jdk-1_5_0-src-jrl.zip</filename>; 
+<filename>jdk-1_5_0-bin-jrl.zip</filename>;
+and <filename>jdk-1_5_0-mozilla_headers-unix.zip</filename>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Binary download: 
+<ulink url="&jdk-download-binary;"/></para></listitem>
+<listitem><para>Version used (binary):
+&jdk-bin-version;</para></listitem>
+<listitem><para>Download MD5 sum (binary):
+&jdk-bin-md5sum;</para></listitem>
+<listitem><para>Source download: 
+<ulink url="&jdk-download-source;"/></para></listitem>
+<listitem><para>Download MD5 sum (source): 
+<ulink url="&jdk-source-md5sum;"/></para></listitem>
+<listitem><para>Download size (binary): 
+&jdk-bin-size;</para></listitem>
+<listitem><para>Download size (source): 
+&jdk-src-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&jdk-src-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&jdk-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Needed Patches</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink
+url="&patch-root;/jdk-&jdk-src-version;-gcc_3.4.2+-3.patch"/></para>
+</listitem>
+<listitem><para><ulink 
+url="&patch-root;/jdk-&jdk-src-version;-motif_mkmsgcat-1.patch"/></para>
+</listitem>
+<listitem><para><ulink
+url="&patch-root;/jdk-&jdk-src-version;-nptl-1.patch"/></para></listitem>
+<listitem><para><ulink 
+url="&patch-root;/jdk-&jdk-src-version;-remove_broken_demo-1.patch"/></para>
+</listitem>
+<listitem><para><ulink
+url="&patch-root;/jdk-&jdk-src-version;-remove_fixed_paths-1.patch"/></para>
+</listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title>Recommended Patches</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink 
+url="&patch-root;/jdk-&jdk-src-version;-remove_debug_image-1.patch"/>
+(Skips compiling of the <application>JDK</application> debug image)</para>
+</listitem>
+<listitem><para><ulink 
+url="&patch-root;/jdk-&jdk-src-version;-static_cxx-1.patch"/>
+(Forces dynamic linking to gcc libs)</para></listitem>
+<listitem><para><ulink 
+url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/> 
+(Only required if building agianst <xref linkend="xorg"/>)</para></listitem>
+</itemizedlist>
+</sect3>
+
+
+<sect3><title><application>JDK</application> dependencies</title>
+<sect4><title>Required (to build <application>JDK</application> from 
+source)</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+<xref linkend="zip"/>, 
+<xref linkend="unzip"/>, 
+<xref linkend="cpio"/>, 
+<xref linkend="alsa"/>, and 
+<xref linkend="tcsh"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>JDK</application></title>
+
+<para>Both versions will be installed in parallel. You may choose to keep
+either or both.</para>
+
+<para>Install the precompiled <acronym>JDK</acronym> with the
+following commands:</para>
+
+<screen><userinput><command>export VERSION=&jdk-bin-version; &amp;&amp;
+export MV=`echo $VERSION | cut -d "_" -f 1,1` &amp;&amp;
+export V=`echo ${VERSION} | sed -e "s/\./_/g"` &amp;&amp;
+sed -i "s:^PATH=.*::" jdk-${V}-linux-i?86.bin &amp;&amp;
+chmod +x jdk-${V}-linux-i?86.bin &amp;&amp;
+mkdir -p bin &amp;&amp;
+ln -sf /bin/true bin/more &amp;&amp;
+yes | PATH=$PWD/bin:$PATH ./jdk-${V}-linux-i?86.bin &amp;&amp;
+cd jdk${VERSION}</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>install -d /opt/jdk/jdk-precompiled-${MV} &amp;&amp;
+mv * /opt/jdk/jdk-precompiled-${MV}
+chown -R root:root /opt/jdk/jdk-precompiled-${MV}</command></userinput></screen>
+
+<para>The binary version is now installed.</para>
+
+<para>If you don't want to compile the source or are not in a position to 
+download the source owing to license restrictions, skip ahead to the 
+configuration section.</para>
+
+<para>Add the recently installed <acronym>JDK</acronym> to the path.</para>
+
+<screen><userinput><command>export JAVA_HOME=/opt/jdk/jdk-precompiled-${MV} &amp;&amp;
+export PATH=$PATH:${JAVA_HOME}/bin</command></userinput></screen>
+
+<para>Unzip the sources:</para>
+
+<screen><userinput><command>mkdir jdk-build &amp;&amp;
+cd jdk-build &amp;&amp;
+VERSION=&jdk-src-version; &amp;&amp;
+V=`echo $VERSION | sed -e "s/\./_/g"` &amp;&amp;
+unzip ../jdk-${V}-src-jrl.zip &amp;&amp;
+unzip ../jdk-${V}-bin-jrl.zip &amp;&amp;
+unzip ../jdk-${V}-mozilla_headers-unix.zip</command></userinput></screen>
+
+<para>Apply all the patches downloaded above.</para>
+
+<screen><userinput><command>for PATCH in ../jdk-&jdk-src-version;*.patch
+    do patch -Np1 -i ${PATCH}
+done</command></userinput></screen>
+
+<para>Set/unset some variables which affect the build:</para>
+
+<screen><userinput><command>export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;
+unset JAVA_HOME &amp;&amp;
+unset CLASSPATH
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS
+export ALT_DEVTOOLS_PATH="/usr/bin" &amp;&amp;
+export BUILD_NUMBER="blfs-&blfs-version;" &amp;&amp;
+export DEV_ONLY=true &amp;&amp;
+export ALT_MOZILLA_PATH=$PWD &amp;&amp;
+export INSANE=true &amp;&amp;
+export MAKE_VERBOSE=true &amp;&amp;
+export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</command></userinput></screen>
+
+<warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make the build 
+fail. If you are interested in optimizing the build, set 
+OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.</para></warning>
+
+<para>Additionally, if you would like to make in parallel, add the 
+following:</para>
+
+<screen><userinput><command>export HOTSPOT_BUILD_JOBS=<replaceable>[3]</replaceable></command></userinput></screen>
+
+<para>Build the <application>JDK</application> with the following
+commands. There will be a lot of messages about missing files that look like
+errors. These are caused by not meeting the expected build environemnt 
+(Red Hat).  As long as the build doesn't stop, the messages 
+are harmless.</para>
+
+<screen><userinput><command>cd control/make &amp;&amp;
+make &amp;&amp;
+cd ../build/linux-i?86</command></userinput></screen>
+
+<para>Now, as the root user, install the <application>JDK</application>:</para>
+
+<screen><userinput role='root'><command>cp -a j2sdk-image /opt/jdk/jdk-&jdk-src-version; &amp;&amp;
+chown -R root:root /opt/jdk/jdk-&jdk-src-version;</command></userinput></screen>
+
+<para>Restore the environment using the following commands:</para>
+
+<screen><userinput><command>unset VERSION &amp;&amp;
+unset MV &amp;&amp;
+unset V &amp;&amp;
+unset ALT_BOOTDIR &amp;&amp;
+unset ALT_DEVTOOLS_PATH &amp;&amp;
+unset BUILD_NUMBER &amp;&amp;
+unset DEV_ONLY &amp;&amp;
+unset ALT_MOZILLA_PATH &amp;&amp;
+unset INSANE &amp;&amp;
+unset MAKE_VERBOSE &amp;&amp;
+unset ALT_CACERTS_FILE</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>export ALT_BOOTDIR="$JAVA_HOME"</command>: This var sets
+the location of the bootstrap <acronym>JDK</acronym>.</para>
+
+<para><command>export ALT_MOZILLA_PATH=$PWD</command>: This tells the build 
+where to find the base directory of the plugin path (which contains the
+<application>Mozilla</application> headers).</para>
+
+<para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command>: This
+changes the location where the build finds the needed executables.</para>
+
+<para><command>export BUILD_NUMBER="blfs-&blfs-version;"</command>: 
+This will help you identify the compiled version of the runtime environment 
+and virtual machine by appending this information to the version 
+string.</para>
+
+<para><command>export DEV_ONLY=true</command>: This command
+skips compiling the documentation and eliminates a dependency on
+<application>rpm</application>.</para>
+
+<para><command>unset JAVA_HOME</command>: This clears the
+<envar>JAVA_HOME</envar> variable as recommended by the build 
+instructions.</para>
+
+<para><command>unset CLASSPATH</command>: This clears the
+<envar>CLASSPATH</envar> variable as per the recommendations in the build 
+instructions.</para>
+
+<para><command>unset CFLAGS/CXXFLAGS...</command>: These variables cause 
+miscompilation of the build. Never set them.</para>
+
+<para><command>export INSANE=true</command>: The certified platform for the 
+build is Redhat Enterprise Advanced Server 2.1. This variable ensures that 
+all the errors related to compiling on a non-certified platform will be 
+displayed as warnings instead of errors.</para>
+
+<para><command>export MAKE_VERBOSE=true</command>: Allows the compiler 
+commands to be displayed on the console.</para>
+
+<para><command>export ALT_CACERTS_FILE...</command>: Specifies the
+certificate file to use (from the installed binary 
+<application>JDK</application>).</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>JDK</application></title>
+
+<sect3><title>Configuration Information</title>
+
+<para>There are now two Java 2 <acronym>SDK</acronym>'s installed in
+<filename>/opt/jdk</filename>. You should decide on which one you
+would like to use as the default. For example if you decide to use the source
+compiled <application>JDK</application>, do the following:</para>
+
+<screen><userinput><command>ln -nsf jdk-&jdk-src-version; /opt/jdk/jdk</command></userinput></screen>
+
+<para>Add the following <filename>jdk.sh</filename> shell startup file to
+the <filename>/etc/profile.d</filename> directory with the following 
+commands:</para>
+
+<screen><userinput><command>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"</command>
+# Begin /etc/profile.d/jdk.sh
+
+# Set JAVA_HOME directory
+JAVA_HOME=/opt/jdk/jdk
+export JAVA_HOME
+
+# Adjust PATH and MANPATH
+pathappend ${JAVA_HOME}/bin PATH
+pathappend ${JAVA_HOME}/man MANPATH
+
+# Auto Java Classpath Updating
+# Create symlinks to this directory for auto classpath setting
+AUTO_CLASSPATH_DIR=/usr/lib/classpath
+if [ -z ${CLASSPATH} ]; then
+	CLASSPATH=.:${AUTO_CLASSPATH_DIR}
+else
+	pathappend . CLASSPATH
+	pathappend ${AUTO_CLASSPATH_DIR} CLASSPATH
+fi
+
+for i in $(ls ${AUTO_CLASSPATH_DIR}/*.jar 2>/dev/null)
+	do pathappend ${i} CLASSPATH
+done
+
+# End /etc/profile.d/jdk.sh
+<command>EOF</command></userinput></screen>
+
+<para>The <application>Java</application> plugin is loacated in
+<filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns7/</filename>.
+Make a symbolic link to the file in that directory from your browser 
+plugins directory.</para>
+
+<note><para>The plugin must be a symlink for it to work. If not, the browsers
+just crash when you attempt to load a <application>Java</application> 
+application.</para></note>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directory</segtitle>
+
+<seglistitem>
+<seg>appletviewer, extcheck, idlj, jar, jarsigner, java, javac, javadoc, 
+javah, javap, jdb, keytool, native2ascii, orbd, policytool, rmic, rmid, 
+rmiregistry, serialver, servertool and tnameserv</seg>
+<seg><envar>$JAVA_HOME</envar>/lib/*, <envar>$JAVA_HOME</envar>/jre/lib/* 
+and libjavaplugin_oji.so</seg>
+<seg>/opt/jdk</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="appletviewer">
+<term><command>appletviewer</command></term>
+<listitem><para>runs <application>Java</application> applets outside of the 
+context of a browser.</para>
+<indexterm zone="jdk appletviewer">
+<primary sortas="b-appletviewer">appletviewer</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="extcheck">
+<term><command>extcheck</command></term>
+<listitem><para>checks a specified <filename>JAR</filename> file for title 
+and version conflicts with any extensions installed in the 
+<acronym>JDK</acronym> software.</para>
+<indexterm zone="jdk extcheck">
+<primary sortas="b-extcheck">extcheck</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="idlj">
+<term><command>idlj</command></term>
+<listitem><para>generates <application>Java</application> bindings from a 
+given <acronym>IDL</acronym> file.</para>
+<indexterm zone="jdk 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 <acronym>JAR</acronym> 
+archive file.</para>
+<indexterm zone="jdk jar">
+<primary sortas="b-jar">jar</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="jarsigner">
+<term><command>jarsigner</command></term>
+<listitem><para>signs <filename>JAR</filename> (Java ARchive) files and 
+verifies the signatures and integrity of a signed 
+<filename>JAR</filename>.</para>
+<indexterm zone="jdk jarsigner">
+<primary sortas="b-jarsigner">jarsigner</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="java">
+<term><command>java</command></term>
+<listitem><para>launches a <application>Java</application> application by 
+starting a <application>Java</application> runtime environment, loading a 
+specified class and invoking its main method.</para>
+<indexterm zone="jdk 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 
+<application>Java</application> programming language, and compiles them into 
+bytecode class files.</para>
+<indexterm zone="jdk 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 
+<application>Java</application> source files and produces a corresponding set 
+of <acronym>HTML</acronym> pages describing the classes, interfaces, 
+constructors, methods, and fields.</para>
+<indexterm zone="jdk javadoc">
+<primary sortas="b-javadoc">javadoc</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="javah">
+<term><command>javah</command></term>
+<listitem><para>generates <application>C</application> header and source files 
+that are needed to implement native methods.</para>
+<indexterm zone="jdk javah">
+<primary sortas="b-javah">javah</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="javap">
+<term><command>javap</command></term>
+<listitem><para>disassembles a <application>Java</application> class 
+file.</para>
+<indexterm zone="jdk javap">
+<primary sortas="b-javap">javap</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="jdb">
+<term><command>jdb</command></term>
+<listitem><para>is a simple command-line debugger for 
+<application>Java</application> classes.</para>
+<indexterm zone="jdk jdb">
+<primary sortas="b-jdb">jdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="keytool">
+<term><command>keytool</command></term>
+<listitem><para>is a key and certificate management utility.</para>
+<indexterm zone="jdk 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="jdk 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 <acronym>CORBA</acronym> 
+environment.</para>
+<indexterm zone="jdk orbd">
+<primary sortas="b-orbd">orbd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="policytool">
+<term><command>policytool</command></term>
+<listitem><para>creates and manages a policy file graphically.</para>
+<indexterm zone="jdk 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 <application>Java</application> classes that 
+contain remote object implementations.</para>
+<indexterm zone="jdk 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="jdk 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="jdk rmiregistry">
+<primary sortas="b-rmiregistry">rmiregistry</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="jdk 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="jdk servertool">
+<primary sortas="b-servertool">servertool</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="tnameserv">
+<term><command>tnameserv</command></term>
+<listitem><para>starts the <application>Java</application> 
+<acronym>IDL</acronym> name server.</para>
+<indexterm zone="jdk tnameserv">
+<primary sortas="b-tnameserv">tnameserv</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
+
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ general/prog/pdl.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -183,5 +183,5 @@
 <ulink url="http://www.svgalib.org/">SVGAlib</ulink>, 
 <xref linkend="gnome-libs"/>, 
-<xref linkend="j2sdk"/>, 
+<xref linkend="jdk"/>, 
 <xref linkend="tk"/>, 
 <xref linkend="python"/> (with the 
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ general/prog/prog.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -23,5 +23,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="j2sdk.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="jdk.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="librep.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>
Index: general/sysutils/apache-ant.xml
===================================================================
--- general/sysutils/apache-ant.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ general/sysutils/apache-ant.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -59,5 +59,5 @@
 <sect3><title><application>Apache Ant</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="j2sdk"/></para>
+<para><xref linkend="jdk"/></para>
 </sect4>
 </sect3>
Index: gnome/add/java-access-bridge.xml
===================================================================
--- gnome/add/java-access-bridge.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ gnome/add/java-access-bridge.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -53,5 +53,5 @@
 <sect3><title><application>Java Access Bridge</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="at-spi"/> and <xref linkend="j2sdk"/></para>
+<para><xref linkend="at-spi"/> and <xref linkend="jdk"/></para>
 </sect4>
 </sect3>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ introduction/welcome/changelog.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -23,4 +23,8 @@
 <itemizedlist>
 
+<listitem><para>April 24th, 2005 [dj]: Updated to JDK-1.5.0, added gcc-3.4.2+
+and jdk-1.5.0 patches to OpenOffice, and added jdk-1.5.0 patch for 
+fop.</para></listitem>
+
 <listitem><para>April 24th, 2005 [randy]: Fixed incorrect path pointing to the 
 documentation in the Cyrus-SASL configuration section and incorrect library
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ introduction/welcome/credits.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -190,5 +190,5 @@
 <listitem><para>MySQL: <emphasis>Jesse Tie-Ten-Quee</emphasis></para></listitem>
 
-<listitem><para>fontconfig, gcc, gcc2, j2sdk, mozilla, nas, openoffice, ispell, nail,
+<listitem><para>fontconfig, gcc, gcc2, jdk, mozilla, nas, openoffice, ispell, nail,
 ImageMagick, hd2u,
 STLport, tcl, tk and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
@@ -294,5 +294,5 @@
 <!--
 <listitem><para><emphasis>Tushar Teredesai</emphasis> for writing the
-Compiling Java 2 SDK from Scratch hint on which j2sdk is based and for writing 
+Compiling Java 2 SDK from Scratch hint on which jdk is based and for writing 
 the docbook hint used throughout the typesetting chapter.</para></listitem>
 -->
Index: kde/add/kdebindings.xml
===================================================================
--- kde/add/kdebindings.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ kde/add/kdebindings.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -64,5 +64,5 @@
     <xref linkend="python"/>,
     <xref linkend="ruby"/>,
-    <xref linkend="j2sdk"/>,
+    <xref linkend="jdk"/>,
     <xref linkend="mozilla"/>, 
     <ulink url="http://go-mono.org">Mono</ulink>, 
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ kde/core/kdebase.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -63,5 +63,5 @@
 <xref linkend="libxml2"/>, 
 <xref linkend="openssl"/> and 
-<xref linkend="j2sdk"/></para>
+<xref linkend="jdk"/></para>
 </sect4>
 
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ postlfs/security/cyrus-sasl.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -61,5 +61,5 @@
 <xref linkend="openldap"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
-<xref linkend="j2sdk"/>, 
+<xref linkend="jdk"/>, 
 <xref linkend="mysql"/>, 
 <xref linkend="postgresql"/>, 
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ pst/printing/cups.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -64,5 +64,5 @@
 <xref linkend="php"/>, 
 <xref linkend="python"/>, 
-<xref linkend="j2sdk"/>, 
+<xref linkend="jdk"/>, 
 <ulink url="http://www.openslp.org/">OpenSLP</ulink>, 
 <ulink url="http://packages.debian.org/unstable/source/libpaper">
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ pst/ps/fop.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -58,4 +58,13 @@
 </sect3>
 
+<sect3><title>Required Patch</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink
+url="&patch-root;/fop_&fop-version;-jdk_&jdk-src-version;-1.patch"/> For
+use with jdk-&jdk-src-version;.</para>
+</listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing="compact">
@@ -78,5 +87,5 @@
 <sect3><title><application>FOP</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="j2sdk"/></para>
+<para><xref linkend="jdk"/></para>
 </sect4>
 
@@ -95,8 +104,4 @@
 <title>Installation of <application>FOP</application></title>
 
-<note><para>Ensure <envar>$JAVA_HOME</envar> is set correctly before beginning 
-the build. Additionally, the build will fail if your version of the 
-<acronym>JDK</acronym> is higher than 1.4.2_x.</para></note>
-
 <para>Some versions of tar will display a message similar to 
 <quote><computeroutput>tar: A lone zero block at 33476</computeroutput></quote> 
@@ -120,5 +125,6 @@
 following commands:</para>
 
-<screen><userinput><command>./build.sh &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../fop_&fop-version;-jdk_&jdk-src-version;-1.patch &amp;&amp;
+./build.sh &amp;&amp;
 sed -i -e "s/build/lib/" fop.sh</command></userinput></screen>
 
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ server/databases/db.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -46,5 +46,5 @@
 <sect3><title><application>Berkeley DB</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="tcl"/> and <xref linkend="j2sdk"/></para>
+<para><xref linkend="tcl"/> and <xref linkend="jdk"/></para>
 </sect4>
 </sect3>
Index: server/major/openssh.xml
===================================================================
--- server/major/openssh.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ server/major/openssh.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -57,5 +57,5 @@
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
-<xref linkend="j2sdk"/>, 
+<xref linkend="jdk"/>, 
 <xref linkend="net-tools"/>, 
 <ulink url="http://www.opensc.org/">OpenSC</ulink> and 
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ xsoft/graphweb/firefox.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -164,5 +164,5 @@
 <para>For installing various <application>Firefox</application> plugins, refer
 to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc
-Project</ulink>. If you have <xref linkend="j2sdk"/> already installed, create
+Project</ulink>. If you have <xref linkend="jdk"/> already installed, create
 the following link as the root user to utilize the
 <application>JAVA</application> plugin: </para>
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ xsoft/graphweb/mozilla.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -343,5 +343,5 @@
 <para>For installing various <application>Mozilla</application> plugins, refer 
 to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc 
-Project</ulink>. If you have <xref linkend="j2sdk"/> already installed, create 
+Project</ulink>. If you have <xref linkend="jdk"/> already installed, create 
 the following link as the root user to utilize the 
 <application>JAVA</application> plugin: </para>
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 6a25deb2b64c568a6b26e83a0eaca091fd220800)
+++ xsoft/suites/openoffice.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
@@ -49,6 +49,6 @@
 <itemizedlist spacing='compact'>
 
-<listitem><para>Required patch for gcc-&gcc3-version;: <ulink
-url="&patch-root;/OOo_&openoffice-version;-gcc33-1.patch"/></para>
+<listitem><para>Required patch for gcc-&gcc-version;: <ulink
+url="&patch-root;/OOo_&openoffice-version;-gcc_3.4.2+_fixes-1.patch"/></para>
 </listitem>
 
@@ -58,6 +58,6 @@
 
 <listitem><para>Required patch if compiling with 
-<acronym>J2SDK</acronym>-&j2sdk-src-version;: <ulink
-url="&patch-root;/OOo_&openoffice-version;-jdk_&j2sdk-src-version;_fix-1.patch"/></para>
+<acronym>JDK</acronym>-&jdk-src-version;: <ulink
+url="&patch-root;/OOo_&openoffice-version;-jdk_&jdk-src-version;_fix-1.patch"/></para>
 </listitem>
 
@@ -68,4 +68,8 @@
 </listitem>
 
+<listitem><para>Required patch for STLport-4.6.2: <ulink
+url="&patch-root;/OOo_&openoffice-version;-STLport_4.6.2-1.patch"/></para>
+</listitem>
+
 <listitem><para>Optional patch if you wish to use the system freetype:
 <ulink
@@ -79,7 +83,6 @@
 </listitem>
 
-<listitem><para>General Polygon Clipper Library (Optional if 
-libart_lgpl-&libart_lgpl-version; is used): <ulink
-url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/></para>
+<listitem><para>STLport-4.6.2: <ulink
+url="http://www.stlport.org/archive/STLport-4.6.2.tar.gz"/></para>
 </listitem>
 
@@ -97,22 +100,23 @@
 <xref linkend="zip"/>, 
 <xref linkend="unzip"/>, 
-<xref linkend="tcsh"/>, 
-<xref linkend="which"/> and 
-<xref linkend="gcc3"/>.</para>
+<xref linkend="tcsh"/>, and
+<xref linkend="which"/>.</para>
 </sect4>
 
 <sect4><title>Recommended</title>
-<para><xref linkend="j2sdk"/>, 
+<para><xref linkend="jdk"/>, 
 <xref linkend="freetype2"/>, 
 <xref linkend="pkgconfig"/>, 
-<xref linkend="startup-notification"/> and 
-<xref linkend="desktop-file-utils"/>.</para>
+<xref linkend="startup-notification"/>, 
+<xref linkend="desktop-file-utils"/>,
+<xref linkend="apache-ant"/>,
+<xref linkend="libart_lgpl"/>, and
+<xref linkend="curl"/>.</para>
+
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/>, 
-<xref linkend="libart_lgpl"/>, 
-<xref linkend="apache-ant"/> and 
-<xref linkend="curl"/>.</para>
+<para><xref linkend="Linux_PAM"/> and 
+<xref linkend="nas"/>.</para> 
 </sect4>
 </sect3>
@@ -131,24 +135,23 @@
 tar -zxf ../OOo_&openoffice-version;_source.tar.gz</command></userinput></screen>
 
-<para>Optionally, untar and move the gpc files, and apply the downloaded
-patches:</para>
-
-<screen><userinput><command>tar -zxf ../gpc231.tar.Z &amp;&amp;
-mv gpc231/* external/gpc &amp;&amp;
-rmdir gpc231 &amp;&amp;
-for patch in ../OOo_&openoffice-version;-*.patch
-  do patch -Np1 -i $patch
-  done</command></userinput></screen>
+<para>Apply all of the downloaded patches:</para>
+
+<screen><userinput><command>for PATCH in ../OO_&openoffice-version;-*.patch
+    do patch -Np1 -i ${PATCH}
+done</command></userinput></screen>
+
+<para>Copy the STLport <acronym>TAR</acronym>ball into the source tree:</para>
+
+<screen><userinput><command>cp ../STLport-4.6.2.tar.gz stlport/download/</command></userinput></screen>
 
 <para>STLport looks for the c++ headers in the wrong location.  Put a
 temporary symlink in place to satisfy STLport:</para>
 
-<screen><userinput><command>ln -sf /opt/gcc-&gcc3-version;/include/c++/&gcc3-version; /usr/g++-v3</command></userinput></screen>
-
-<para>OpenOffice fails to build with gcc-3.4.1.  Set your path to
-include gcc-&gcc3-version;:</para>
-
-<screen><userinput><command>export PATH_HOLD=$PATH &amp;&amp;
-export PATH=/opt/gcc-&gcc3-version;/bin:$PATH</command></userinput></screen>
+<screen><userinput><command>ln -sf /usr/include/c++/&gcc-version; /usr/g++-v3</command></userinput></screen>
+
+<para>Create a temprorary symlink to the <acronym>JRE</acronym>'s 
+<application>motif</application> libraries:</para>
+
+<screen><userinput><command>ln -sf ${JAVA_HOME}/jre/lib/motif21/libmawt.so /usr/lib</command></userinput></screen>
 
 <para>If you want to optimize the build, edit
@@ -174,5 +177,7 @@
     --with-dict=ENUS --without-fonts \
     --enable-libsn --with-system-zlib \
-    --with-system-freetype &amp;&amp;
+    --with-system-freetype \
+    --with-system-curl --disable-fontooo \
+    --enable-libart &amp;&amp;
 cd ..</command></userinput></screen>
 
@@ -227,8 +232,8 @@
 rename ooo645 ooo /usr/share/applications/ooo645*.desktop</command></userinput></screen>
 
-<para>Finally, return your environment to it's original state:</para>
-
-<screen><userinput><command>export PATH=$PATH_HOLD &amp;&amp;
-rm -f /usr/g++-v3</command></userinput></screen>
+<para>Finally, remove the temporary symlinks:</para>
+
+<screen><userinput><command>rm /usr/g++-v3 &amp;&amp;
+rm /usr/lib/libmawt.so</command></userinput></screen>
 
 </sect2>
@@ -236,8 +241,4 @@
 <sect2>
 <title>Command explanations</title>
-
-<para>
-<command>mv ../gpc231/gpc.* external/gpc</command>: Copy the gpc files to the 
-appropriate location.</para>
 
 <para><parameter>--with-lang=ENUS</parameter>: Make install set for the
