updated and renamed batik jar (note: many batik classes were moved to different packages)

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

49 files changed, 69 insertions, 82 deletions

diff --git a/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java b/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
index 5c13b9d92..1e8f2b606 100644
--- a/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
+++ b/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
@@ -22,11 +22,11 @@ package org.apache.fop.afp.svg;
 import java.awt.geom.AffineTransform;
 
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.DocumentLoader;
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
-import org.apache.batik.gvt.font.FontFamilyResolver;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
diff --git a/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java b/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
index 85bb78593..efc26eda3 100644
--- a/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
+++ b/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.afp.svg;
 
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextPainter;
 
 import org.apache.fop.svg.AbstractFOPTextElementBridge;
 
diff --git a/src/java/org/apache/fop/afp/svg/AFPTextPainter.java b/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
index 996ae8691..3cc377034 100644
--- a/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
+++ b/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
@@ -21,8 +21,8 @@ package org.apache.fop.afp.svg;
 
 import java.awt.Graphics2D;
 
-import org.apache.batik.gvt.font.FontFamilyResolver;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.StrokingTextPainter;
 
 import org.apache.fop.afp.AFPGraphics2D;
 import org.apache.fop.svg.AbstractFOPTextPainter;
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
index e5af471af..a53fdfd34 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
@@ -20,7 +20,6 @@
 package org.apache.fop.complexscripts.fonts;
 
 import java.lang.ref.WeakReference;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
index 8db7f109e..2b1d636e1 100644
--- a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
+++ b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
@@ -20,7 +20,6 @@
 package org.apache.fop.complexscripts.util;
 
 import java.nio.IntBuffer;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/java/org/apache/fop/fo/XMLObj.java b/src/java/org/apache/fop/fo/XMLObj.java
index a62054e72..1c4597295 100644
--- a/src/java/org/apache/fop/fo/XMLObj.java
+++ b/src/java/org/apache/fop/fo/XMLObj.java
@@ -26,7 +26,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java b/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
index 67f6567c9..eacb29659 100644
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
@@ -26,12 +26,11 @@ import javax.xml.transform.sax.TransformerHandler;
 
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.fop.util.ContentHandlerFactory;
 import org.apache.fop.util.DelegatingContentHandler;
diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
index 63506dd0a..ccb732132 100644
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
@@ -27,11 +27,11 @@ import java.net.URI;
 
 import org.w3c.dom.Element;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMElement;
 import org.apache.batik.bridge.UnitProcessor;
 import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
 import org.apache.batik.dom.util.XMLSupport;
 import org.apache.batik.util.SVGConstants;
 
diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
index 0e46076cd..1b1afe6ab 100644
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
@@ -28,7 +28,7 @@ import org.w3c.dom.DOMImplementation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.util.XMLResourceDescriptor;
 
 import org.apache.fop.fo.ElementMapping;
diff --git a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
index 7f843279e..9ce22180e 100644
--- a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
+++ b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
@@ -20,7 +20,6 @@
 package org.apache.fop.fo.properties;
 
 import java.awt.Color;
-
 import java.util.Iterator;
 import java.util.List;
 
diff --git a/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java b/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
index 7766fdbcb..e96cb68ed 100644
--- a/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
+++ b/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.image.loader.batik;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.XMLNamespaceEnabledImageFlavor;
diff --git a/src/java/org/apache/fop/image/loader/batik/BatikUtil.java b/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
index c5b6264b4..cda57b596 100644
--- a/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
+++ b/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
@@ -38,7 +38,7 @@ public final class BatikUtil {
      */
     public static boolean isBatikAvailable() {
         try {
-            Class.forName("org.apache.batik.dom.svg.SVGDOMImplementation");
+            Class.forName("org.apache.batik.anim.dom.SVGDOMImplementation");
             return true;
         } catch (Exception e) {
             //ignore
diff --git a/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java b/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
index b1808a7b9..c1782dc13 100644
--- a/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
+++ b/src/java/org/apache/fop/image/loader/batik/GenericFOPBridgeContext.java
@@ -21,10 +21,10 @@ package org.apache.fop.image.loader.batik;
 
 import java.awt.geom.AffineTransform;
 
+import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.DocumentLoader;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SVGOMDocument;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
diff --git a/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java b/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
index d56f543c7..85244aea5 100644
--- a/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
@@ -27,8 +27,8 @@ import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.svggen.SVGGeneratorContext;
 import org.apache.batik.svggen.SVGGraphics2D;
 
diff --git a/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java b/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
index ec187b8d0..b5d8626f9 100644
--- a/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
@@ -28,12 +28,12 @@ import org.w3c.dom.Document;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.image.GraphicsConstants;
 import org.apache.xmlgraphics.image.loader.Image;
diff --git a/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java b/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
index bb9c7d395..53a7e2cc7 100644
--- a/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
@@ -22,7 +22,7 @@ package org.apache.fop.image.loader.batik;
 import java.io.IOException;
 import java.util.Map;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.xmlgraphics.image.loader.Image;
 import org.apache.xmlgraphics.image.loader.ImageException;
diff --git a/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java b/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
index 58daadc52..7df9a6cb6 100644
--- a/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
@@ -33,12 +33,12 @@ import org.w3c.dom.svg.SVGDocument;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.UnitProcessor;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.image.loader.ImageContext;
 import org.apache.xmlgraphics.image.loader.ImageInfo;
diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index ba49b7dc0..16abdb527 100644
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -249,7 +249,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
             }
         }
         labelList = !labelDone ? label.getNextKnuthElements(childLC, alignment, labelLMStack,
-                labelRestartPosition, labelRestartLM) : new LinkedList<KnuthElement>();
+                labelRestartPosition, labelRestartLM) : (List) new LinkedList<KnuthElement>();
 
         //Space resolution as if the contents were placed in a new reference area
         //(see 6.8.3, XSL 1.0, section on Constraints, last paragraph)
@@ -286,7 +286,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
             }
         }
         bodyList = !bodyDone ? body.getNextKnuthElements(childLC, alignment, bodyLMStack,
-                bodyRestartPosition, bodyRestartLM) : new LinkedList<KnuthElement>();
+                bodyRestartPosition, bodyRestartLM) : (List) new LinkedList<KnuthElement>();
 
         //Space resolution as if the contents were placed in a new reference area
         //(see 6.8.3, XSL 1.0, section on Constraints, last paragraph)
diff --git a/src/java/org/apache/fop/pdf/PDFColorHandler.java b/src/java/org/apache/fop/pdf/PDFColorHandler.java
index 8dfcf7f24..3477ea3e7 100644
--- a/src/java/org/apache/fop/pdf/PDFColorHandler.java
+++ b/src/java/org/apache/fop/pdf/PDFColorHandler.java
@@ -34,7 +34,6 @@ import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
 import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
 import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
 import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
-
 import org.apache.xmlgraphics.util.DoubleFormatUtil;
 
 /**
diff --git a/src/java/org/apache/fop/pdf/PDFDictionary.java b/src/java/org/apache/fop/pdf/PDFDictionary.java
index d3e2e57d1..d91e87d92 100644
--- a/src/java/org/apache/fop/pdf/PDFDictionary.java
+++ b/src/java/org/apache/fop/pdf/PDFDictionary.java
@@ -21,7 +21,6 @@ package org.apache.fop.pdf;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
index 983a5ad90..e329765db 100644
--- a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
+++ b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
@@ -26,12 +26,12 @@ import java.io.IOException;
 
 import org.w3c.dom.Document;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
 
diff --git a/src/java/org/apache/fop/render/XMLHandlerConfigurator.java b/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
index fbce59a07..9baed9959 100644
--- a/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
+++ b/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
@@ -21,7 +21,6 @@ package org.apache.fop.render;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
index aa3ed824d..9ea871d17 100644
--- a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
+++ b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
@@ -26,10 +26,10 @@ import java.io.IOException;
 
 import org.w3c.dom.Document;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
diff --git a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
index f3128c600..b4347070d 100644
--- a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
+++ b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
@@ -29,9 +29,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
 
 import org.apache.fop.image.loader.batik.BatikUtil;
 import org.apache.fop.render.AbstractGenericSVGHandler;
diff --git a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
index fa3813d06..fac9f4005 100644
--- a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
+++ b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
@@ -29,9 +29,9 @@ import org.w3c.dom.Document;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
 import org.apache.batik.util.SVGConstants;
 
diff --git a/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
index 31571f987..a09f55bec 100644
--- a/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSBatikFlowTextElementBridge.java
@@ -22,11 +22,11 @@ package org.apache.fop.render.ps;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.extension.svg.BatikFlowTextElementBridge;
 import org.apache.batik.extension.svg.FlowExtTextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 
diff --git a/src/java/org/apache/fop/render/ps/PSBridgeContext.java b/src/java/org/apache/fop/render/ps/PSBridgeContext.java
index c0244db04..b774c598f 100644
--- a/src/java/org/apache/fop/render/ps/PSBridgeContext.java
+++ b/src/java/org/apache/fop/render/ps/PSBridgeContext.java
@@ -24,8 +24,8 @@ import java.awt.geom.AffineTransform;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.DocumentLoader;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
diff --git a/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java b/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
index 56b1f91bd..df9e22053 100644
--- a/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSSVGFlowRootElementBridge.java
@@ -22,11 +22,11 @@ package org.apache.fop.render.ps;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
+import org.apache.batik.bridge.FlowTextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.svg12.SVGFlowRootElementBridge;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.flow.FlowTextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 
diff --git a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
index c5240dff2..f331ecad9 100644
--- a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
+++ b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
@@ -23,9 +23,9 @@ import org.w3c.dom.Element;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 /**
  * <p>Bridge class for the &lt;text> element.
diff --git a/src/java/org/apache/fop/servlet/FopPrintServlet.java b/src/java/org/apache/fop/servlet/FopPrintServlet.java
index 0fe77142f..006a95dfc 100644
--- a/src/java/org/apache/fop/servlet/FopPrintServlet.java
+++ b/src/java/org/apache/fop/servlet/FopPrintServlet.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletResponse;
-
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
diff --git a/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java b/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
index 6efa31e45..59db21d63 100644
--- a/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
@@ -23,9 +23,9 @@ import org.w3c.dom.Element;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 /**
  * <p>Bridge class for the &lt;text> element.
diff --git a/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java b/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
index 9cb868448..df24dbb92 100644
--- a/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
@@ -32,11 +32,11 @@ import java.text.CharacterIterator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
+import org.apache.batik.bridge.Mark;
+import org.apache.batik.bridge.StrokingTextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.text.Mark;
 import org.apache.batik.gvt.text.TextPaintInfo;
 
 import org.apache.fop.afp.AFPGraphics2D;
diff --git a/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java b/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
index 33f5aecf6..430638a4b 100644
--- a/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
@@ -32,13 +32,12 @@ import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.impl.SimpleLog;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.bridge.FontFamilyResolver;
 import org.apache.batik.dom.util.DocumentFactory;
-import org.apache.batik.gvt.font.FontFamilyResolver;
 import org.apache.batik.transcoder.ErrorHandler;
 import org.apache.batik.transcoder.SVGAbstractTranscoder;
 import org.apache.batik.transcoder.TranscoderException;
diff --git a/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java b/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
index fce6ed2b6..b8e73a29d 100644
--- a/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
+++ b/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
@@ -22,12 +22,11 @@ package org.apache.fop.svg;
 import java.io.IOException;
 
 import org.w3c.dom.Document;
-
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 
 /**
  * This is a special subclass to allow setting a special EntityResolver.
diff --git a/src/java/org/apache/fop/svg/NativeTextPainter.java b/src/java/org/apache/fop/svg/NativeTextPainter.java
index cb96368c8..126e1efc3 100644
--- a/src/java/org/apache/fop/svg/NativeTextPainter.java
+++ b/src/java/org/apache/fop/svg/NativeTextPainter.java
@@ -36,16 +36,15 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.GlyphLayout;
 import org.apache.batik.bridge.SVGGVTFont;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.StrokingTextPainter;
+import org.apache.batik.bridge.TextLayoutFactory;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextSpanLayout;
 import org.apache.batik.gvt.font.GVTGlyphVector;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter.TextChunk;
-import org.apache.batik.gvt.text.GlyphLayout;
-import org.apache.batik.gvt.text.TextLayoutFactory;
 import org.apache.batik.gvt.text.TextPaintInfo;
-import org.apache.batik.gvt.text.TextSpanLayout;
 
 import org.apache.fop.fonts.Font;
 import org.apache.fop.fonts.FontInfo;
diff --git a/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java b/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
index 90dd9f304..44f3b10fa 100644
--- a/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
@@ -19,10 +19,10 @@
 
 package org.apache.fop.svg;
 
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.extension.svg.BatikFlowTextElementBridge;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 
diff --git a/src/java/org/apache/fop/svg/PDFBridgeContext.java b/src/java/org/apache/fop/svg/PDFBridgeContext.java
index 4a6e6e275..0f6ba60c8 100644
--- a/src/java/org/apache/fop/svg/PDFBridgeContext.java
+++ b/src/java/org/apache/fop/svg/PDFBridgeContext.java
@@ -21,12 +21,12 @@ package org.apache.fop.svg;
 
 import java.awt.geom.AffineTransform;
 
+import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.DocumentLoader;
 import org.apache.batik.bridge.SVGTextElementBridge;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
diff --git a/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java b/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
index 0f11e99bf..5472a9fa1 100644
--- a/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
+++ b/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
@@ -22,8 +22,8 @@ package org.apache.fop.svg;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
+import org.apache.batik.bridge.TextNode;
 import org.apache.batik.extension.svg.FlowExtTextPainter;
-import org.apache.batik.gvt.TextNode;
 
 import org.apache.fop.fonts.FontInfo;
 
diff --git a/src/java/org/apache/fop/svg/PDFFlowTextPainter.java b/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
index 7b07ec297..beb97c539 100644
--- a/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
+++ b/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
@@ -22,8 +22,8 @@ package org.apache.fop.svg;
 import java.text.AttributedCharacterIterator;
 import java.util.List;
 
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.flow.FlowTextPainter;
+import org.apache.batik.bridge.FlowTextPainter;
+import org.apache.batik.bridge.TextNode;
 
 import org.apache.fop.fonts.FontInfo;
 
diff --git a/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java b/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
index 7d2b947e7..c65630819 100644
--- a/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
@@ -19,10 +19,10 @@
 
 package org.apache.fop.svg;
 
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
 import org.apache.batik.bridge.svg12.SVGFlowRootElementBridge;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
 
 import org.apache.fop.fonts.FontInfo;
 
diff --git a/src/java/org/apache/fop/svg/PDFTextElementBridge.java b/src/java/org/apache/fop/svg/PDFTextElementBridge.java
index 339bb36f3..e63b580f2 100644
--- a/src/java/org/apache/fop/svg/PDFTextElementBridge.java
+++ b/src/java/org/apache/fop/svg/PDFTextElementBridge.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.svg;
 
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextPainter;
 
 /**
  * <p>Bridge class for the &lt;text> element.
diff --git a/src/java/org/apache/fop/svg/SVGUserAgent.java b/src/java/org/apache/fop/svg/SVGUserAgent.java
index a265b4fef..6a4d9d0de 100644
--- a/src/java/org/apache/fop/svg/SVGUserAgent.java
+++ b/src/java/org/apache/fop/svg/SVGUserAgent.java
@@ -21,7 +21,7 @@ package org.apache.fop.svg;
 
 import java.awt.geom.AffineTransform;
 
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.FontFamilyResolver;
 
 import org.apache.fop.apps.FOUserAgent;
 
diff --git a/src/java/org/apache/fop/svg/SVGUtilities.java b/src/java/org/apache/fop/svg/SVGUtilities.java
index 3401307cf..d75aa2099 100644
--- a/src/java/org/apache/fop/svg/SVGUtilities.java
+++ b/src/java/org/apache/fop/svg/SVGUtilities.java
@@ -28,7 +28,7 @@ import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.util.XMLConstants;
 
 /**
diff --git a/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java b/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
index 03108f819..0267cb683 100644
--- a/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
+++ b/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
@@ -28,8 +28,8 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.xml.sax.SAXException;
 
+import org.apache.batik.bridge.FontFamilyResolver;
 import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.gvt.font.FontFamilyResolver;
 
 /**
  * A simple SVG user agent.
diff --git a/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java b/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
index a5a25c4ce..9ac0ccc47 100644
--- a/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
+++ b/src/java/org/apache/fop/svg/font/AggregatingFontFamilyResolver.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.batik.bridge.FontFace;
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.FontFamilyResolver;
 import org.apache.batik.gvt.font.GVTFontFamily;
 
 public class AggregatingFontFamilyResolver implements FontFamilyResolver {
diff --git a/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java b/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
index 7af5f0b4f..92911d0ee 100644
--- a/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
+++ b/src/java/org/apache/fop/svg/font/FOPFontFamilyResolver.java
@@ -19,7 +19,7 @@
 
 package org.apache.fop.svg.font;
 
-import org.apache.batik.gvt.font.FontFamilyResolver;
+import org.apache.batik.bridge.FontFamilyResolver;
 
 public interface FOPFontFamilyResolver extends FontFamilyResolver {
 
diff --git a/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java b/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
index 06a7188ff..b90e89b01 100644
--- a/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
+++ b/src/java/org/apache/fop/svg/text/ComplexGlyphLayout.java
@@ -23,10 +23,10 @@ import java.awt.font.FontRenderContext;
 import java.awt.geom.Point2D;
 import java.text.AttributedCharacterIterator;
 
+import org.apache.batik.bridge.GlyphLayout;
 import org.apache.batik.gvt.font.GVTFont;
 import org.apache.batik.gvt.font.GVTGlyphVector;
 import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.text.GlyphLayout;
 
 import org.apache.fop.fonts.Font;
 import org.apache.fop.svg.font.FOPGVTFont;
diff --git a/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java b/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
index 6e39733f5..371f5a768 100644
--- a/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
+++ b/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
@@ -30,7 +30,6 @@ import javax.xml.transform.sax.SAXResult;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
diff --git a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
index 57079bf03..9c571db97 100644
--- a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
+++ b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
@@ -26,7 +26,7 @@ import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGElement;
 import org.w3c.dom.svg.SVGSVGElement;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.apache.batik.dom.util.DOMUtilities;
 import org.apache.batik.dom.util.XMLSupport;