From 4aab5b174200bcaf9e62583d8a1c7ba4da17e3d6 Mon Sep 17 00:00:00 2001
From: Vincent Hennebert <vhennebert@apache.org>
Date: Mon, 17 Mar 2008 20:00:36 +0000
Subject: [PATCH] Changed the documentation to reflect the move to Java 1.4 as
 a minimum requirement

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95@638048 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/0.95/compiling.xml   |  4 ++--
 src/documentation/content/xdocs/0.95/fonts.xml       | 12 ++----------
 .../content/xdocs/0.95/pdfencryption.xml             |  7 +------
 src/documentation/content/xdocs/0.95/running.xml     |  2 +-
 src/documentation/content/xdocs/dev/release.xml      |  2 +-
 src/documentation/content/xdocs/trunk/compiling.xml  |  4 ++--
 src/documentation/content/xdocs/trunk/fonts.xml      | 12 ++----------
 .../content/xdocs/trunk/pdfencryption.xml            |  6 ++----
 src/documentation/content/xdocs/trunk/running.xml    |  2 +-
 9 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/src/documentation/content/xdocs/0.95/compiling.xml b/src/documentation/content/xdocs/0.95/compiling.xml
index c6c17a3c0..57761429f 100644
--- a/src/documentation/content/xdocs/0.95/compiling.xml
+++ b/src/documentation/content/xdocs/0.95/compiling.xml
@@ -41,7 +41,7 @@
       <section id="env-jdk">
         <title>JDK</title>
         <p>
-          Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
+          Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4
           (A Java Runtime Environment is not sufficient).
         </p>
       </section>
@@ -59,7 +59,7 @@
         <p>
           The build script uses <a href="ext:ant">Apache Ant</a>, a popular 
           Java-based build tool, which usually requires that the environment variable JAVA_HOME point to 
-          your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally 
+          your local JDK root directory. This is true even if you use JDK 1.4 or above, which normally 
           does not need this setting.
         </p>
       </section>
diff --git a/src/documentation/content/xdocs/0.95/fonts.xml b/src/documentation/content/xdocs/0.95/fonts.xml
index af1de28f2..423eaad11 100644
--- a/src/documentation/content/xdocs/0.95/fonts.xml
+++ b/src/documentation/content/xdocs/0.95/fonts.xml
@@ -231,20 +231,12 @@
         <title>Type 1 Font Metrics</title>
         <p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it.
           To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
-        <p>Windows (on JDK 1.4 and later):</p>
+        <p>Windows:</p>
         <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
           org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Windows (on JDK 1.3.x):</p>
-        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar;lib\xml-apis.jar;
-          lib\xercesImpl.jar;lib\xalan.jar;lib\serializer.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Unix (on JDK 1.4 and later):</p>
+        <p>Unix:</p>
         <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
           org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Unix (on JDK 1.3.1):</p>
-        <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar:lib/xml-apis.jar:
-          lib/xercesImpl.jar:lib/xalan.jar:lib/serializer.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
         <p>PFMReader [options]:</p>
         <ul>
           <li><strong>-fn &lt;fontname&gt;</strong> By default, FOP uses the fontname from the
diff --git a/src/documentation/content/xdocs/0.95/pdfencryption.xml b/src/documentation/content/xdocs/0.95/pdfencryption.xml
index c8cdbb29c..cda301aab 100644
--- a/src/documentation/content/xdocs/0.95/pdfencryption.xml
+++ b/src/documentation/content/xdocs/0.95/pdfencryption.xml
@@ -203,16 +203,11 @@ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent);
         install.
       </p>
       <ol>
-        <li>
-          Download the binary distribution for your JDK version. If you have JDK
-          1.3 or earlier you must also download a JCE from the same page.
-        </li>
         <li>
           Unpack the distribution. Add the jar file to your classpath. A
           convenient way to use the jar on Linux is to simply drop it into the
           FOP lib directory, it will be automatically picked up by
-          <code>fop.sh</code>.  If you have JDK 1.3 or earlier don't forget to
-          install the JCE as well.
+          <code>fop.sh</code>.
         </li>
         <li>
           Open the <code>java.security</code> file and add<br/>
diff --git a/src/documentation/content/xdocs/0.95/running.xml b/src/documentation/content/xdocs/0.95/running.xml
index 38df4be82..38e31cc6c 100644
--- a/src/documentation/content/xdocs/0.95/running.xml
+++ b/src/documentation/content/xdocs/0.95/running.xml
@@ -305,7 +305,7 @@ Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl
       <ul>
         <li>
           Increase memory available to the JVM. See 
-          <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</a> 
+          <a href="http://java.sun.com/j2se/1.4/docs/tooldocs/solaris/java.html">the -Xmx option</a> 
           for more information.
           <warning>
             It is usually unwise to increase the memory allocated to the JVM beyond the amount of 
diff --git a/src/documentation/content/xdocs/dev/release.xml b/src/documentation/content/xdocs/dev/release.xml
index fa4dbfa37..641758d78 100644
--- a/src/documentation/content/xdocs/dev/release.xml
+++ b/src/documentation/content/xdocs/dev/release.xml
@@ -73,7 +73,7 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         <code>fop-hyph.jar</code> to lib/ (e.g. from
         <code>http://sourceforge.net/projects/offo</code></li>
         <li>Alternatively, create a build-local.properties file that points to the above libs.</li>
-        <li>Run build[.sh] dist. Do this once using Sun JDK 1.3.1_15 or later and once with Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
+        <li>Run build[.sh] dist. Do this using Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
         <li>Create signatures. Don't forget to upload your KEY:
           <code>gpg -a -b --force-v3-sigs fop-0.94-src.tar.gz</code> etc.</li>
         <li>Upload the dist and signature files to your web directory
diff --git a/src/documentation/content/xdocs/trunk/compiling.xml b/src/documentation/content/xdocs/trunk/compiling.xml
index c6c17a3c0..57761429f 100644
--- a/src/documentation/content/xdocs/trunk/compiling.xml
+++ b/src/documentation/content/xdocs/trunk/compiling.xml
@@ -41,7 +41,7 @@
       <section id="env-jdk">
         <title>JDK</title>
         <p>
-          Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
+          Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4
           (A Java Runtime Environment is not sufficient).
         </p>
       </section>
@@ -59,7 +59,7 @@
         <p>
           The build script uses <a href="ext:ant">Apache Ant</a>, a popular 
           Java-based build tool, which usually requires that the environment variable JAVA_HOME point to 
-          your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally 
+          your local JDK root directory. This is true even if you use JDK 1.4 or above, which normally 
           does not need this setting.
         </p>
       </section>
diff --git a/src/documentation/content/xdocs/trunk/fonts.xml b/src/documentation/content/xdocs/trunk/fonts.xml
index af1de28f2..423eaad11 100644
--- a/src/documentation/content/xdocs/trunk/fonts.xml
+++ b/src/documentation/content/xdocs/trunk/fonts.xml
@@ -231,20 +231,12 @@
         <title>Type 1 Font Metrics</title>
         <p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it.
           To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
-        <p>Windows (on JDK 1.4 and later):</p>
+        <p>Windows:</p>
         <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
           org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Windows (on JDK 1.3.x):</p>
-        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar;lib\xml-apis.jar;
-          lib\xercesImpl.jar;lib\xalan.jar;lib\serializer.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Unix (on JDK 1.4 and later):</p>
+        <p>Unix:</p>
         <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
           org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Unix (on JDK 1.3.1):</p>
-        <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar:lib/xml-apis.jar:
-          lib/xercesImpl.jar:lib/xalan.jar:lib/serializer.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
         <p>PFMReader [options]:</p>
         <ul>
           <li><strong>-fn &lt;fontname&gt;</strong> By default, FOP uses the fontname from the
diff --git a/src/documentation/content/xdocs/trunk/pdfencryption.xml b/src/documentation/content/xdocs/trunk/pdfencryption.xml
index c8cdbb29c..22d965057 100644
--- a/src/documentation/content/xdocs/trunk/pdfencryption.xml
+++ b/src/documentation/content/xdocs/trunk/pdfencryption.xml
@@ -204,15 +204,13 @@ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent);
       </p>
       <ol>
         <li>
-          Download the binary distribution for your JDK version. If you have JDK
-          1.3 or earlier you must also download a JCE from the same page.
+          Download the binary distribution for your JDK version.
         </li>
         <li>
           Unpack the distribution. Add the jar file to your classpath. A
           convenient way to use the jar on Linux is to simply drop it into the
           FOP lib directory, it will be automatically picked up by
-          <code>fop.sh</code>.  If you have JDK 1.3 or earlier don't forget to
-          install the JCE as well.
+          <code>fop.sh</code>.
         </li>
         <li>
           Open the <code>java.security</code> file and add<br/>
diff --git a/src/documentation/content/xdocs/trunk/running.xml b/src/documentation/content/xdocs/trunk/running.xml
index 38df4be82..38e31cc6c 100644
--- a/src/documentation/content/xdocs/trunk/running.xml
+++ b/src/documentation/content/xdocs/trunk/running.xml
@@ -305,7 +305,7 @@ Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl
       <ul>
         <li>
           Increase memory available to the JVM. See 
-          <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</a> 
+          <a href="http://java.sun.com/j2se/1.4/docs/tooldocs/solaris/java.html">the -Xmx option</a> 
           for more information.
           <warning>
             It is usually unwise to increase the memory allocated to the JVM beyond the amount of 
-- 
2.39.5