You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/03/19 18:27:27 UTC
svn commit: r638943 [1/4] - in
/xmlgraphics/fop/branches/Temp_ProcessingFeedback: ./ lib/
src/documentation/content/ src/documentation/content/xdocs/
src/documentation/content/xdocs/0.95/
src/documentation/content/xdocs/0.95/layoutengine/ src/documenta...
Author: jeremias
Date: Wed Mar 19 10:26:45 2008
New Revision: 638943
URL: http://svn.apache.org/viewvc?rev=638943&view=rev
Log:
Merged revisions 634215-638841 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
................
r635508 | jeremias | 2008-03-10 11:06:37 +0100 (Mo, 10 Mrz 2008) | 4 lines
Fixed NPE in BlockContainerLayoutManager when used as a child of an inline-level FO. Split IP and BP stack limits in LayoutContext (there's now a certain amount of redundancy with "refIPD" in LayoutContext which I didn't resolve).
Areas are now generated for block-level FOs when used as children of inline-level FOs.
ClassCastException in ListLayoutManager.mustKeepTogether() fixed (occured if used as child of an inline-level FO).
................
r635686 | vhennebert | 2008-03-10 21:52:43 +0100 (Mo, 10 Mrz 2008) | 2 lines
Bugfix: forced break ignored when the minimum height of a table-row isn't reached
................
r635701 | jeremias | 2008-03-10 22:28:08 +0100 (Mo, 10 Mrz 2008) | 1 line
Need to clean up after myself.
................
r635741 | jeremias | 2008-03-10 23:39:38 +0100 (Mo, 10 Mrz 2008) | 1 line
Bugfix for row/body/col background painting when padding is used in the table-cells.
................
r635884 | vhennebert | 2008-03-11 12:02:27 +0100 (Di, 11 Mrz 2008) | 2 lines
Fixed a copy-paste error (getPaddingStart instead of getPaddingEnd)
................
r635961 | vhennebert | 2008-03-11 16:05:27 +0100 (Di, 11 Mrz 2008) | 2 lines
Forgot to add the testcase for forced break vs explicit row height in revision 635686
................
r635967 | vhennebert | 2008-03-11 16:13:51 +0100 (Di, 11 Mrz 2008) | 2 lines
Updated the disabled-testcases.xml file: re-enabled testcases which could easily be updated, removed the other ones which anyway were superseded by more complete ones
................
r636276 | vhennebert | 2008-03-12 11:51:09 +0100 (Mi, 12 Mrz 2008) | 2 lines
Since compliance.ihtml is now the source file and it would cost too much to revert to an xml version, tidied the file a bit. No content change.
................
r636293 | vhennebert | 2008-03-12 13:14:51 +0100 (Mi, 12 Mrz 2008) | 2 lines
Updated the compliance page. Re-added the 0.94 column since there are some noteworthy changes between the 0.94 and 0.95 versions
................
r636295 | vhennebert | 2008-03-12 13:19:15 +0100 (Mi, 12 Mrz 2008) | 3 lines
Update of the documentation before the release.
Added notes about improved checks and conformance in tables.
................
r636405 | vhennebert | 2008-03-12 17:25:52 +0100 (Mi, 12 Mrz 2008) | 2 lines
Initialized merge tracking via "svnmerge" from the 0.95 branch
................
r636409 | vhennebert | 2008-03-12 17:36:29 +0100 (Mi, 12 Mrz 2008) | 8 lines
Blocked revisions 636406 via svnmerge
........
r636406 | vhennebert | 2008-03-12 16:28:00 +0000 (Wed, 12 Mar 2008) | 2 lines
Set the version to 0.95beta
........
................
r636471 | vhennebert | 2008-03-12 20:24:05 +0100 (Mi, 12 Mrz 2008) | 2 lines
Removed no longer used borderAndPaddingBPD field
................
r637057 | jeremias | 2008-03-14 12:15:24 +0100 (Fr, 14 Mrz 2008) | 2 lines
Bugzilla #44412:
Bugfix: When there was a forced break after a block with (conditional) borders the border-after wasn't painted.
................
r637076 | vhennebert | 2008-03-14 13:22:44 +0100 (Fr, 14 Mrz 2008) | 2 lines
Reverting changes of rev. 637057. I applied the changes to the 0.95 branch instead so that they make their way into the 0.95 release. I will merge them back to the Trunk via svnmerge
................
r638396 | vhennebert | 2008-03-18 16:01:43 +0100 (Di, 18 Mrz 2008) | 53 lines
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
........
................
Added:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/GraphicsConfiguration.java
- copied unchanged from r638396, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/inline_block-level_nested_1.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_block-level_nested_1.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_backgrounds_2.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds_2.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_bug44621.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_bug44621.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_row-height_break.xml
- copied unchanged from r638396, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_row-height_break.xml
Removed:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java-1.3/
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java-1.4/
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/AbstractFopImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/BmpImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/EPSImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/EmfImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/FopImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/FopImageConsumer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/GifImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/ImageCache.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/ImageFactory.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/ImageLoader.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/JAIImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/JimiImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/JpegImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/PNGImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/RegisterableImageProvider.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/TIFFImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/XMLImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/analyser/
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSImageUtils.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/SVGConverter.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-body_background-image.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-header_background-image.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/ (props changed)
xmlgraphics/fop/branches/Temp_ProcessingFeedback/README
xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.properties
xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/lib/README.txt
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/.htaccess
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/compiling.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/fonts.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/known-issues.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/layoutengine/disabled-testcases.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/pdfencryption.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/running.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/compliance.ihtml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/dev/release.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/download.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/index.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/compiling.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/fonts.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/pdfencryption.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/running.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/image/package.html
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageBreaker.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableContentPosition.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableHeaderFooterPosition.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/status.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/disabled-testcases.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border-collapse_separate_1.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_border_padding.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/
------------------------------------------------------------------------------
svnmerge-blocked = /xmlgraphics/fop/branches/fop-0_95:636406
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 19 10:26:45 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-634214
+/xmlgraphics/fop/trunk:1-638841
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/README
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/README?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/README (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/README Wed Mar 19 10:26:45 2008
@@ -90,6 +90,46 @@
RELEASE NOTES
==============================================================================
+Version 0.95beta
+================
+
+This is a pre-version of the third production grade release of the new FOP
+codebase. It contains many bug fixes and new features. See below for details.
+
+Compliance
+----------
+
+This release implements the XSL 1.0 and 1.1 recommendations to a high
+degree of compliance. See the compliance page
+http://xmlgraphics.apache.org/fop/compliance.html for a detailed
+overview.
+
+Known issues
+------------
+
+The known issues of this release are listed at
+http://xmlgraphics.apache.org/fop/0.95/knownissues_overview.html.
+
+Major Changes in Version 0.95
+-----------------------------
+
+* Add new fox:external-document extension element that allows to insert whole
+ documents into a page-sequence (JM)
+* Add support for background on fo:table-column and fo:table-header/footer/body
+ elements (VH)
+* Add support for conditional borders in tables (VH)
+* Add support for scale-down-to-fit and scale-up-to-fit (JM)
+* Fix various bugs and performance problems with external graphics by
+ introducing a new image loading framework (JM)
+
+The long list of changes in this release is available at
+http://xmlgraphics.apache.org/fop/0.95/changes_0.95.html.
+
+The long list of changes in this and earlier releases is available at
+http://xmlgraphics.apache.org/fop/changes.html.
+
+
+
Version 0.94
============
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.properties?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.properties (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.properties Wed Mar 19 10:26:45 2008
@@ -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
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml Wed Mar 19 10:26:45 2008
@@ -133,10 +133,6 @@
</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"/>
@@ -150,7 +146,7 @@
<property name="name" value="fop"/>
<property name="NAME" value="FOP"/>
<property name="version" value="svn-trunk"/>
- <property name="year" value="1999-2007"/>
+ <property name="year" value="1999-2008"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
@@ -216,7 +212,7 @@
<!-- =================================================================== -->
<!-- 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">
@@ -226,18 +222,6 @@
<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">
@@ -263,7 +247,8 @@
<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">
@@ -294,22 +279,6 @@
</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 -->
<!-- =================================================================== -->
@@ -403,12 +372,9 @@
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>
@@ -592,7 +558,6 @@
<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>
@@ -1095,7 +1060,6 @@
<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">
@@ -1269,37 +1233,24 @@
-->
<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"/>
@@ -1315,10 +1266,9 @@
<copy todir="${dist.bin.result.dir}/build" file="build/fop.jar"/>
<chmod file="${dist.bin.result.dir}/fop" perm="ugo+rx"/>
- <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
- <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/>
+ <zip zipfile="${name}-${version}-bin.zip" basedir="${dist.bin.dir}" includes="**"/>
<tar longfile="gnu"
- destfile="${name}-${version}-${bin.suffix}.tar">
+ destfile="${name}-${version}-bin.tar">
<tarfileset dir="${dist.bin.dir}" mode="755">
<include name="${name}-${version}/fop"/>
</tarfileset>
@@ -1327,8 +1277,8 @@
<exclude name="${name}-${version}/fop"/>
</tarfileset>
</tar>
- <gzip zipfile="${name}-${version}-${bin.suffix}.tar.gz" src="${name}-${version}-${bin.suffix}.tar"/>
- <delete file="${name}-${version}-${bin.suffix}.tar"/>
+ <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/>
+ <delete file="${name}-${version}-bin.tar"/>
</target>
<target name="dist-src" depends="all">
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/lib/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/lib/README.txt?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/lib/README.txt (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/lib/README.txt Wed Mar 19 10:26:45 2008
@@ -142,8 +142,16 @@
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)
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/.htaccess
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/.htaccess?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/.htaccess (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/.htaccess Wed Mar 19 10:26:45 2008
@@ -18,8 +18,8 @@
# redirect to versioned documentation
Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.94
-Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.94
-Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk
+Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.95
+Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/0.95
Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/trunk
Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.93
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/compiling.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/compiling.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/compiling.xml Wed Mar 19 10:26:45 2008
@@ -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>
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/fonts.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/fonts.xml Wed Mar 19 10:26:45 2008
@@ -231,19 +231,11 @@
<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>
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/known-issues.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/known-issues.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/known-issues.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/known-issues.xml Wed Mar 19 10:26:45 2008
@@ -64,10 +64,6 @@
table-body, table-header, table-footer and table-row.
</known-issue>
<known-issue>
- The backgrounds of table-body, table-header, table-footer and
- table-column are not painted, yet.
- </known-issue>
- <known-issue>
Column balancing in multi-column documents may not work as expected
(<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=36356">Bugzilla #36356</a>)
</known-issue>
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/layoutengine/disabled-testcases.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/layoutengine/disabled-testcases.xml Wed Mar 19 10:26:45 2008
@@ -233,54 +233,6 @@
<description>Column balancing doesn't work as expected.</description>
</testcase>
<testcase>
- <name>No background-images on table-body</name>
- <file>table-body_background-image.xml</file>
- <description>The backgrounds of table-body, table-header,
- table-footer and table-column are not painted, yet.</description>
- </testcase>
- <testcase>
- <name>Collapsing Border Model NYI</name>
- <file>table_border-collapse_collapse_1.xml</file>
- <description>Border-collapse="collapse" is not yet
- implemented.</description>
- </testcase>
- <testcase>
- <name>Collapsing Border Model NYI</name>
- <file>table_border-collapse_collapse_2.xml</file>
- <description>Border-collapse="collapse" is not yet
- implemented.</description>
- </testcase>
- <testcase>
- <name>Problems with border and padding on tables</name>
- <file>table_border_padding.xml</file>
- <description>The element list seems to not be fully correct, yet, causing
- the layout to look odd.</description>
- </testcase>
- <testcase>
- <name>keep-with-previous doesn't work inside tables</name>
- <file>table-cell_block_keep-with-previous.xml</file>
- <description>Keep-with-previous doesn't work inside tables and
- lists, yet.</description>
- </testcase>
- <testcase>
- <name>Border and padding conditionality is NYI on table-cells</name>
- <file>table-cell_border_padding_conditionality.xml</file>
- <description>Border and padding conditionality are not supported
- on table-cells, yet.</description>
- </testcase>
- <testcase>
- <name>No background-images on table-header</name>
- <file>table-header_background-image.xml</file>
- <description>The backgrounds of table-body, table-header,
- table-footer and table-column are not painted, yet.</description>
- </testcase>
- <testcase>
- <name>keep-with-previous doesn't work on table-rows</name>
- <file>table-row_keep-with-previous.xml</file>
- <description>Keep-with-previous doesn't work inside tables and
- lists, yet.</description>
- </testcase>
- <testcase>
<name>table-cell empty area with marker.xml</name>
<file>table-cell_empty_area_with_marker.xml</file>
<description>A table-cell producing an empty area does currently not add any markers to a page.
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/pdfencryption.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/pdfencryption.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/pdfencryption.xml Wed Mar 19 10:26:45 2008
@@ -204,15 +204,10 @@
</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/>
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/running.xml?rev=638943&r1=638942&r2=638943&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/running.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/0.95/running.xml Wed Mar 19 10:26:45 2008
@@ -305,7 +305,7 @@
<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
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org