diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2006-04-05 18:37:22 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2006-04-05 18:37:22 +0000 |
| commit | 5df23e02bb496d66370b53465da4bc251e4e44cb (patch) | |
| tree | 64e7ea92464ed2fe653311e4bd07e12575e1d383 | |
| parent | d1c0afa0a3a277b02c7301c37fd6b9fb34f0d2ba (diff) | |
| download | xmlgraphics-fop-5df23e02bb496d66370b53465da4bc251e4e44cb.tar.gz xmlgraphics-fop-5df23e02bb496d66370b53465da4bc251e4e44cb.zip | |
Switching to the Commons variant for the base64 encoding/decoding.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@391698 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/apps/FOURIResolver.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/apps/FOURIResolver.java b/src/java/org/apache/fop/apps/FOURIResolver.java index 0d604f48c..182b49f1b 100644 --- a/src/java/org/apache/fop/apps/FOURIResolver.java +++ b/src/java/org/apache/fop/apps/FOURIResolver.java @@ -35,9 +35,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; // base64 support for "data" urls -// TODO Move Base64 support from Batik to XML Graphics Commons -import org.apache.batik.util.Base64DecodeStream; -import org.apache.batik.util.Base64EncoderStream; +import org.apache.xmlgraphics.util.io.Base64DecodeStream; +import org.apache.xmlgraphics.util.io.Base64EncodeStream; /** * Provides FOP specific URI resolution. @@ -180,7 +179,7 @@ public class FOURIResolver String combined = username + ":" + password; try { ByteArrayOutputStream baout = new ByteArrayOutputStream(combined.length() * 2); - Base64EncoderStream base64 = new Base64EncoderStream(baout); + Base64EncodeStream base64 = new Base64EncodeStream(baout); base64.write(combined.getBytes()); base64.close(); connection.setRequestProperty("Authorization", |