Tag for the 0.95beta release

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta@638310 13f79535-47bb-0310-9956-ffa450edef68

build.properties

@@ -24,8 +24,8 @@
 # javac.debug = on
 # javac.optimize = off
 # javac.deprecation = on
-# javac.source = 1.3
-# javac.target = 1.3
+# javac.source = 1.4
+# javac.target = 1.4
 # javac.fork = on
 
 ## JUnit task switches

build.xml

@@ -131,10 +131,6 @@ list of possible build targets.
     </fileset>
   </path>
 
-  <patternset id="exclude-jimi">
-    <exclude name="org/apache/fop/image/JimiImage.java" unless="jimi.present"/>
-  </patternset>
-
   <patternset id="exclude-jai">
     <exclude name="org/apache/fop/image/JAIImage.java" unless="jai.present"/>
     <exclude name="org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java" unless="jai.present"/>
@@ -214,7 +210,7 @@ list of possible build targets.
   <!-- =================================================================== -->
   <!-- Initialization target                                               -->
   <!-- =================================================================== -->
-  <target name="init" depends="init-avail, init-filters-jdk14, init-filters-jdk13">
+  <target name="init" depends="init-avail">
   </target>
 
   <target name="init-avail">
@@ -224,18 +220,6 @@ list of possible build targets.
     <echo message="VM: ${java.vm.version}, ${java.vm.vendor}"/>
     <echo message="JAVA_HOME: ${env.JAVA_HOME}"/>
 
-    <available property="jimi.present" classname="com.sun.jimi.core.Jimi"
-        classpathref="libs-build-classpath"/>
-    <condition property="jimi.message" value="Jimi Support PRESENT">
-      <equals arg1="${jimi.present}" arg2="true"/>
-    </condition>
-    <condition property="jimi.message" value="Jimi Support NOT Present">
-      <not>
-        <equals arg1="${jimi.present}" arg2="true"/>
-      </not>
-    </condition>
-    <echo message="${jimi.message}"/>
-
     <available property="jai.present" classname="javax.media.jai.JAI"
         classpathref="libs-build-classpath"/>
     <condition property="jai.message" value="JAI Support PRESENT">
@@ -261,7 +245,8 @@ list of possible build targets.
     <echo message="${jce.message}"/>
 
     <available property="jdk14.present" classname="java.lang.CharSequence"/>
-
+    <fail message="${Name} requires at least Java 1.4!" unless="jdk14.present"/>
+
     <available property="junit.present" classname="junit.framework.TestCase"
         classpathref="libs-build-classpath"/>
     <condition property="junit.message" value="JUnit Support PRESENT">
@@ -292,22 +277,6 @@ list of possible build targets.
 
   </target>
 
-  <target name="init-filters-jdk13" depends="init-avail" unless="jdk14.present">
-    <echo message="Use GraphicsConfiguration adapter for JDK 1.3 or earlier."/>
-    <path id="graphics-configuration-adapter">
-      <pathelement location="src/java-1.3"/>
-    </path>
-    <property name="src.java.version.dir" value="${basedir}/src/java-1.3"/>
-  </target>
-
-  <target name="init-filters-jdk14" depends="init-avail" if="jdk14.present">
-    <echo message="Use GraphicsConfiguration adapter for JDK 1.4."/>
-    <path id="graphics-configuration-adapter">
-      <pathelement location="src/java-1.4"/>
-    </path>
-    <property name="src.java.version.dir" value="${basedir}/src/java-1.4"/>
-  </target>
-
   <!-- =================================================================== -->
   <!-- Help on usage                                                       -->
   <!-- =================================================================== -->
@@ -401,12 +370,9 @@ list of possible build targets.
            source="${javac.source}" target="${javac.target}">
       <src path="${build.gensrc.dir}"/>
       <src path="${src.java.dir}"/>
-      <src refid="graphics-configuration-adapter"/>
       <patternset includes="**/*.java"/>
-      <!--patternset includes="org/apache/fop/svg/GraphicsConfiguration.java"/-->
       <patternset refid="exclude-jce-dependencies"/>
       <patternset refid="exclude-jai"/>
-      <patternset refid="exclude-jimi"/>
       <classpath refid="libs-build-classpath"/>
     </javac>
     <copy todir="${build.classes.dir}">
@@ -543,7 +509,6 @@ list of possible build targets.
     <uptodate property="jar.sources.uptodate" targetfile="${build.dir}/fop-sources.jar">
       <srcfiles dir="${build.gensrc.dir}"/>
       <srcfiles dir="${src.java.dir}"/>
-      <srcfiles refid="graphics-configuration-adapter"/>
     </uptodate>
   </target>
 
@@ -1032,7 +997,6 @@ NOTE:
         <pathelement path="${src.java.dir}"/>
         <pathelement path="${src.sandbox.dir}"/>
         <pathelement path="${build.gensrc.dir}"/>
-        <path refid="graphics-configuration-adapter"/>
       </sourcepath>
       <tag name="todo" scope="all" description="To do:"/>
       <group title="Control and Startup">
@@ -1206,37 +1170,24 @@ NOTE:
     -->
     <echo message="Make sure you have a proper Forrest installation (see http://forrest.apache.org/)"/>
 
-    <!--<antcall target="site"/>-->
-
-    <!-- You can provide a JDK 1.4 for a JDK 1.3 build by adding "javahome.jdk14" to build-local.properties -->
-    <condition property="javahome.jdk14.override" value="${javahome.jdk14}">
-      <isset property="javahome.jdk14"/>
-    </condition>
-    <echo message="java home: ${javahome.jdk14.override}"/>
-    <condition property="javahome.jdk14.override" value="${env.JAVA_HOME}">
-      <not>
-        <isset property="javahome.jdk14.override"/>
-      </not>
-    </condition>
-    <echo message="java home: ${javahome.jdk14.override}"/>
     <condition property="forrest.call" value="forrest.bat" else="forrest">
       <os family="windows"/>
     </condition>
-    <exec executable="${forrest.call}">
-      <env key="JAVA_HOME" value="${javahome.jdk14.override}"/>
-    </exec>
+    <exec executable="${forrest.call}"/>
   </target>
 
   <!-- =================================================================== -->
   <!-- Creates the distribution                                            -->
   <!-- =================================================================== -->
-  <target name="dist" depends="dist-src,dist-bin" description="Generates the distribution package"/>
+  <target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/>
 
-  <target name="dist-bin" depends="all,javadocs,docs">
-    <echo message="Building the binary distribution files (zip,tar)"/>
-    <fail message="A complete binary build requires Jimi" unless="jimi.present"/>
+  <target name="dist-prereq" depends="init">
     <fail message="A complete binary build requires JAI" unless="jai.present"/>
     <fail message="A complete binary build requires JCE" unless="jce.present"/>
+  </target>
+
+  <target name="dist-bin" depends="all,javadocs,docs">
+    <echo message="Building the binary distribution files (zip,tar)"/>
     <mkdir dir="${dist.bin.result.dir}"/>
     <copy todir="${dist.bin.result.dir}">
       <fileset refid="dist.bin"/>

lib/README.txt

@@ -142,8 +142,16 @@ Please make sure you've read the license of each package.
     https://jai-imageio.dev.java.net/
     BSD license
 
-    Note: Not the whole JAI is needed, only the ImageIO-compatible codecs
-    packaged as "Image I/O Tools". The name may be misleading.
+    Note: This is not the same as JAI! Only the ImageIO-compatible codecs
+    are packaged as "Image I/O Tools". The name may be misleading.
+
+ - JAI (Java Advanced Imaging API) 
+
+    http://java.sun.com/products/java-media/jai 	 
+    Java Research License and Java Distribution License (Check which one applies to you!)
+
+    Currently used for:
+    - Grayscale error diffusion dithering in the PCL Renderer
 
 - JEuclid (MathML implementation, for the MathML extension)
 

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>

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

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/>

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 

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

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>

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

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/>

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