Merged revisions 636400-636405,636407-638388 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95

........
  r636403 | vhennebert | 2008-03-12 16:24:48 +0000 (Wed, 12 Mar 2008) | 2 lines
  
  Updated copyright years
........
  r637075 | vhennebert | 2008-03-14 12:19:45 +0000 (Fri, 14 Mar 2008) | 4 lines
  
  Bugzilla #44412:
  Bugfix: When there was a forced break after a block with (conditional) borders the border-after wasn't painted.
  Changes made by Jeremias
........
  r637119 | jeremias | 2008-03-14 14:41:03 +0000 (Fri, 14 Mar 2008) | 2 lines
  
  Bugzilla #44412:
  Bugfix: The before border of a block is no longer swallowed if its first child issues a break-before.
........
  r637791 | jeremias | 2008-03-17 08:59:51 +0000 (Mon, 17 Mar 2008) | 3 lines
  
  Removed old image adapters.
  Removed support for Java 1.3 building as it didn't work anymore anyway.
  Added a check to require Java 1.4 for building.
........
  r637857 | jeremias | 2008-03-17 12:24:33 +0000 (Mon, 17 Mar 2008) | 3 lines
  
  Partially reverted revision 637791:
  Restored JAI as a required dependency for distribution builds (used for error diffusion dithering in the PCL Renderer). It is optional otherwise.
  Updated the licensing info and release notes to make the changes clear.
........
  r637993 | vhennebert | 2008-03-17 17:48:44 +0000 (Mon, 17 Mar 2008) | 3 lines
  
  Bugzilla #44621: when the after border of a cell, in the trailing case, is bigger than in the normal case, the generated sequence of Knuth elements was wrong, leading to content being swallowed
  This is a partial fix only: the content is no longer swallowed, but the penalty is wrong (shorter than it should be). This will lead to the table overflowing the region-body without warning.
........
  r638048 | vhennebert | 2008-03-17 20:00:36 +0000 (Mon, 17 Mar 2008) | 2 lines
  
  Changed the documentation to reflect the move to Java 1.4 as a minimum requirement
........
  r638308 | vhennebert | 2008-03-18 10:26:32 +0000 (Tue, 18 Mar 2008) | 2 lines
  
  Simplified the getNextKnuthElements method a little bit
........
  r638316 | vhennebert | 2008-03-18 11:06:59 +0000 (Tue, 18 Mar 2008) | 2 lines
  
  Removed the 'jdk1.4' suffix appended to the binary artifacts. There's no point in making the distinction anymore since there is only one binary now
........
  r638317 | vhennebert | 2008-03-18 11:08:29 +0000 (Tue, 18 Mar 2008) | 2 lines
  
  Updated the probable date of the release
........


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@638396 13f79535-47bb-0310-9956-ffa450edef68

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
@@ -204,15 +204,10 @@ 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.
-        </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