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/17 09:59:58 UTC
svn commit: r637791 - in /xmlgraphics/fop/branches/fop-0_95: ./
src/java-1.3/ src/java-1.4/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/fo/ src/java/org/apache/fop/image/
src/java/org/apache/fop/image/analyser/ src/java/org/apache/fop/render/...
Author: jeremias
Date: Mon Mar 17 01:59:51 2008
New Revision: 637791
URL: http://svn.apache.org/viewvc?rev=637791&view=rev
Log:
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.
Added:
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/svg/GraphicsConfiguration.java
- copied unchanged from r637779, xmlgraphics/fop/branches/fop-0_95/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
Removed:
xmlgraphics/fop/branches/fop-0_95/src/java-1.3/
xmlgraphics/fop/branches/fop-0_95/src/java-1.4/
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/AbstractFopImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/BmpImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/EPSImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/EmfImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/FopImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/FopImageConsumer.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/GifImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/ImageCache.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/ImageFactory.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/ImageLoader.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/JAIImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/JimiImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/JpegImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/PNGImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/RegisterableImageProvider.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/TIFFImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/XMLImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/analyser/
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/ps/PSImageUtils.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/rtf/SVGConverter.java
Modified:
xmlgraphics/fop/branches/fop-0_95/build.properties
xmlgraphics/fop/branches/fop-0_95/build.xml
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/package.html
xmlgraphics/fop/branches/fop-0_95/test/java/org/apache/fop/URIResolutionTestCase.java
Modified: xmlgraphics/fop/branches/fop-0_95/build.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/build.properties?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/build.properties (original)
+++ xmlgraphics/fop/branches/fop-0_95/build.properties Mon Mar 17 01:59:51 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/fop-0_95/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/build.xml?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/build.xml (original)
+++ xmlgraphics/fop/branches/fop-0_95/build.xml Mon Mar 17 01:59:51 2008
@@ -131,15 +131,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"/>
- </patternset>
-
<patternset id="exclude-jce-dependencies">
<exclude name="org/apache/fop/pdf/PDFEncryptionJCE.java" unless="jce.present"/>
</patternset>
@@ -214,7 +205,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">
@@ -224,30 +215,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">
- <equals arg1="${jai.present}" arg2="true"/>
- </condition>
- <condition property="jai.message" value="JAI Support NOT Present">
- <not>
- <equals arg1="${jai.present}" arg2="true"/>
- </not>
- </condition>
- <echo message="${jai.message}"/>
-
<available property="jce.present" classname="javax.crypto.Cipher"
classpathref="libs-build-classpath"/>
<condition property="jce.message" value="JCE Support PRESENT">
@@ -261,7 +228,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">
@@ -292,22 +260,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 -->
<!-- =================================================================== -->
@@ -401,12 +353,8 @@
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}">
@@ -431,7 +379,6 @@
source="${javac.source}" target="${javac.target}">
<src path="${src.sandbox.dir}"/>
<patternset includes="**/*.java"/>
- <patternset refid="exclude-jai"/>
<classpath>
<path refid="libs-build-classpath"/>
<pathelement location="${build.classes.dir}"/>
@@ -543,7 +490,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>
@@ -1032,7 +978,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">
@@ -1206,25 +1151,10 @@
-->
<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>
<!-- =================================================================== -->
@@ -1234,8 +1164,6 @@
<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"/>
- <fail message="A complete binary build requires JAI" unless="jai.present"/>
<fail message="A complete binary build requires JCE" unless="jce.present"/>
<mkdir dir="${dist.bin.result.dir}"/>
<copy todir="${dist.bin.result.dir}">
Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/apps/FopFactory.java?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/apps/FopFactory.java Mon Mar 17 01:59:51 2008
@@ -46,7 +46,6 @@
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fonts.FontCache;
import org.apache.fop.hyphenation.HyphenationTreeResolver;
-import org.apache.fop.image.ImageFactory;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
import org.apache.fop.render.RendererFactory;
import org.apache.fop.render.XMLHandlerRegistry;
@@ -82,9 +81,6 @@
private ColorSpaceCache colorSpaceCache = null;
- /** Image factory for creating fop image objects */
- private ImageFactory imageFactory;
-
/** Image manager for loading and caching image objects */
private ImageManager imageManager;
@@ -155,7 +151,6 @@
this.elementMappingRegistry = new ElementMappingRegistry(this);
this.foURIResolver = new FOURIResolver(validateUserConfigStrictly());
this.colorSpaceCache = new ColorSpaceCache(foURIResolver);
- this.imageFactory = new ImageFactory();
this.imageManager = new ImageManager(this);
this.rendererFactory = new RendererFactory();
this.xmlHandlers = new XMLHandlerRegistry();
@@ -288,11 +283,6 @@
/** @return the content handler factory registry */
public ContentHandlerFactoryRegistry getContentHandlerFactoryRegistry() {
return this.contentHandlerFactoryRegistry;
- }
-
- /** @return the image factory */
- public ImageFactory getImageFactory() {
- return this.imageFactory;
}
/**
Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOPropertyMapping.java Mon Mar 17 01:59:51 2008
@@ -412,6 +412,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("top", l);
// right
@@ -419,6 +420,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("right", l);
// bottom
@@ -426,6 +428,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("bottom", l);
// left
@@ -433,6 +436,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("left", l);
}
@@ -1161,6 +1165,7 @@
m = new LengthProperty.Maker(PR_START_INDENT);
m.setInherited(true);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_REFAREA_WIDTH);
IndentPropertyMaker sCorr = new IndentPropertyMaker(m);
sCorr.setCorresponding(PR_MARGIN_LEFT, PR_MARGIN_RIGHT, PR_MARGIN_TOP);
sCorr.setUseParent(false);
@@ -1177,6 +1182,7 @@
m = new LengthProperty.Maker(PR_END_INDENT);
m.setInherited(true);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_REFAREA_WIDTH);
IndentPropertyMaker eCorr = new IndentPropertyMaker(m);
eCorr.setCorresponding(PR_MARGIN_RIGHT, PR_MARGIN_LEFT, PR_MARGIN_BOTTOM);
eCorr.setUseParent(false);
Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/FOTreeBuilder.java Mon Mar 17 01:59:51 2008
@@ -38,7 +38,6 @@
import org.apache.fop.fo.ElementMapping.Maker;
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.image.ImageFactory;
import org.apache.fop.util.ContentHandlerFactory;
import org.apache.fop.util.ContentHandlerFactory.ObjectBuiltListener;
import org.apache.fop.util.ContentHandlerFactory.ObjectSource;
@@ -155,10 +154,6 @@
log.debug("Parsing of document complete");
}
foEventHandler.endDocument();
-
- //Notify the image factory that this user agent has expired.
- ImageFactory imageFactory = userAgent.getFactory().getImageFactory();
- imageFactory.removeContext(this.userAgent);
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/package.html
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/package.html?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/package.html (original)
+++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/package.html Mon Mar 17 01:59:51 2008
@@ -18,6 +18,6 @@
<HTML>
<TITLE>org.apache.fop.image Package</TITLE>
<BODY>
-<P>Contains image loading adapters for various image sources and the image cache.</P>
+<P>Contains image loading adapters for various image sources.</P>
</BODY>
</HTML>
Modified: xmlgraphics/fop/branches/fop-0_95/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/java/org/apache/fop/URIResolutionTestCase.java?rev=637791&r1=637790&r2=637791&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/branches/fop-0_95/test/java/org/apache/fop/URIResolutionTestCase.java Mon Mar 17 01:59:51 2008
@@ -36,17 +36,19 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.w3c.dom.Document;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.xpath.XPathAPI;
+import org.apache.xpath.objects.XObject;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.xml.XMLRenderer;
-import org.apache.xpath.XPathAPI;
-import org.apache.xpath.objects.XObject;
-import org.w3c.dom.Document;
/**
* Tests URI resolution facilities.
@@ -85,9 +87,6 @@
private void innerTestFO1(boolean withStream) throws Exception {
FOUserAgent ua = fopFactory.newFOUserAgent();
- //Reset the image caches to force URI resolution!
- ua.getFactory().getImageFactory().clearCaches();
-
File foFile = new File(getBaseDir(), "test/xml/uri-resolution1.fo");
MyURIResolver resolver = new MyURIResolver(withStream);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org