Update to latest version of pdfbox and itextpdf libraries.

kjw · kjw · commit bd57a7dcc77d · 2011-12-06T16:15:42.000Z
diff --git a/.classpath b/.classpath
@@ -12,6 +12,7 @@
 	<classpathentry kind="lib" path="lib/commons-logging-adapters-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-api-1.1.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/pdfbox-0.8.0-incubating.jar"/>
+	<classpathentry kind="lib" path="lib/itextpdf-5.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/pdfbox-1.6.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
@@ -26,10 +26,10 @@
 			<fileset dir="${classes.dir}"/>
 			<zipfileset src="lib/jargs.jar" excludes="META-INF"/>
 			<zipfileset src="lib/commons-logging-adapters-1.1.1.jar" excludes="META-INF"/>
-			<zipfileset src="lib/pdfbox-0.8.0-incubating.jar" excludes="META-INF"/>
+			<zipfileset src="lib/pdfbox-1.6.0.jar" excludes="META-INF"/>
 			<zipfileset src="lib/httpclient-4.0.jar" excludes="META-INF"/>
 			<zipfileset src="lib/httpcore-nio-4.0.1.jar" excludes="META-INF"/>
-			<zipfileset src="lib/iText-2.1.7.jar" excludes="META-INF"/>
+			<zipfileset src="lib/itextpdf-5.1.3.jar" excludes="META-INF"/>
 			<zipfileset src="lib/commons-logging-api-1.1.1.jar" excludes="META-INF"/>
 			<zipfileset src="lib/commons-logging-1.1.1.jar" excludes="META-INF"/>
 			<zipfileset src="lib/httpmime-4.0.jar" excludes="META-INF"/>
@@ -42,4 +42,4 @@
 	</target>
 	
 	<target name="all" depends="package"/>
-</project>
+</project>
diff --git a/lib/iText-2.1.7.jar b/lib/iText-2.1.7.jar
diff --git a/lib/itextpdf-5.1.3.jar b/lib/itextpdf-5.1.3.jar
diff --git a/lib/pdfbox-0.8.0-incubating.jar b/lib/pdfbox-0.8.0-incubating.jar
diff --git a/lib/pdfbox-1.6.0.jar b/lib/pdfbox-1.6.0.jar
diff --git a/src/org/crossref/pdfmark/AnyXmpSchema.java b/src/org/crossref/pdfmark/AnyXmpSchema.java
@@ -17,7 +17,7 @@
  */
 package org.crossref.pdfmark;
 
-import com.lowagie.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.XmpSchema;
 
 public class AnyXmpSchema extends XmpSchema {
 	
diff --git a/src/org/crossref/pdfmark/DcPrismSet.java b/src/org/crossref/pdfmark/DcPrismSet.java
@@ -2,8 +2,8 @@
 
 import org.crossref.pdfmark.prism.Prism21Schema;
 
-import com.lowagie.text.xml.xmp.DublinCoreSchema;
-import com.lowagie.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.DublinCoreSchema;
+import com.itextpdf.text.xml.xmp.XmpSchema;
 
 public class DcPrismSet {
     
diff --git a/src/org/crossref/pdfmark/DumperMain.java b/src/org/crossref/pdfmark/DumperMain.java
@@ -2,13 +2,12 @@
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import com.lowagie.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfReader;
 
 /**
  * Utility that dumps XMP data of a PDF to standard out.
diff --git a/src/org/crossref/pdfmark/Main.java b/src/org/crossref/pdfmark/Main.java
@@ -29,9 +29,9 @@
 import org.apache.pdfbox.cos.COSObject;
 import org.apache.pdfbox.pdfparser.PDFParser;
 
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfStamper;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfStamper;
 
 import static jargs.gnu.CmdLineParser.Option;
 
@@ -204,7 +204,12 @@ public Main(String[] args) {
 				}
 				
 				if (resolvedXmpData != null) {
+				    System.out.println("Merging resolved.");
+				    System.out.println(resolvedXmpData);
+				    System.out.println(merged);
+				    System.out.println(resolvedXmpData.length);
 					merged = XmpUtils.mergeXmp(merged, resolvedXmpData);
+					System.out.println(merged.length);
 				}
 				
 				stamper.setXmpMetadata(merged);
diff --git a/src/org/crossref/pdfmark/MarkBuilder.java b/src/org/crossref/pdfmark/MarkBuilder.java
@@ -29,8 +29,8 @@
 import org.crossref.pdfmark.unixref.Unixref;
 import org.crossref.pdfmark.unixref.Work;
 
-import com.lowagie.text.xml.xmp.DublinCoreSchema;
-import com.lowagie.text.xml.xmp.XmpWriter;
+import com.itextpdf.text.xml.xmp.DublinCoreSchema;
+import com.itextpdf.text.xml.xmp.XmpWriter;
 
 public abstract class MarkBuilder implements MetadataGrabber.Handler {
 
diff --git a/src/org/crossref/pdfmark/XmpUtils.java b/src/org/crossref/pdfmark/XmpUtils.java
@@ -21,6 +21,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import javax.sql.rowset.spi.XmlWriter;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -35,10 +36,10 @@
 import org.w3c.dom.Text;
 import org.xml.sax.SAXException;
 
-import com.lowagie.text.xml.xmp.XmpArray;
-import com.lowagie.text.xml.xmp.XmpReader;
-import com.lowagie.text.xml.xmp.XmpSchema;
-import com.lowagie.text.xml.xmp.XmpWriter;
+import com.itextpdf.text.xml.xmp.XmpArray;
+import com.itextpdf.text.xml.xmp.XmpReader;
+import com.itextpdf.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.XmpWriter;
 
 public class XmpUtils {
 	
@@ -136,33 +137,68 @@ private static XmpArray parseRdfList(Element list) {
 	 * contain description blocks with the same namespace.
 	 */
 	public static byte[] mergeXmp(byte[] left, byte[] right) throws XmpException {
-		if (left == null || left.length == 0) return right;
-		if (right == null || right.length == 0) return left;
+		if (left == null || left.length == 0) {
+		    ByteArrayOutputStream bout = new ByteArrayOutputStream();
+		    try {
+    		    XmpWriter writer = new XmpWriter(bout);
+    		    for (XmpSchema schema : parseSchemata(right)) {
+    		        writer.addRdfDescription(schema);
+    		    }
+    		    writer.close();
+		    } catch (IOException e) {
+		        throw new XmpException(e);
+		    }
+		    return bout.toByteArray();
+		}
+		
+		if (right == null || right.length == 0) {
+		    ByteArrayOutputStream bout = new ByteArrayOutputStream();
+            try {
+                XmpWriter writer = new XmpWriter(bout);
+                for (XmpSchema schema : parseSchemata(left)) {
+                    writer.addRdfDescription(schema);
+                }
+                writer.close();
+            } catch (IOException e) {
+                throw new XmpException(e);
+            }
+            return bout.toByteArray();
+		}
 		
 		XmpSchema[] leftSchemata = parseSchemata(left);
 		XmpSchema[] rightSchemata = parseSchemata(right);
 		ByteArrayOutputStream bout = new ByteArrayOutputStream();
 		
 		String[] noWriteList = new String[rightSchemata.length];
+		System.out.println(rightSchemata.length);
 		for (int i=0; i<noWriteList.length; i++) {
 			noWriteList[i] = rightSchemata[i].getXmlns();
+			System.out.println(rightSchemata[i].getXmlns());
 		}
 		
+		System.out.println("----");
+		
 		try {
 			XmpWriter writer = new XmpWriter(bout);
 			for (XmpSchema schema : leftSchemata) {
+			    System.out.println(schema.getXmlns());
 				boolean found = false;
 				for (String checkAgainst : noWriteList) {
-					if (schema.getXmlns().equals(checkAgainst)) {
-						found = true;
-						break;
-					}
-				}
+			        if (schema.getXmlns().equals(checkAgainst)) {
+			            found = true;
+			            break;
+			        }
+			    }
+				
 				if (!found) {
+				    System.out.println("Adding exisitng");
 					writer.addRdfDescription(schema);
+				} else {
+				    System.out.println("Ignoring existing");
 				}
 			}
 			for (XmpSchema schema : rightSchemata) {
+			    System.out.println("Adding new " + schema.getXmlns());
 				writer.addRdfDescription(schema);
 			}
 			writer.close();
diff --git a/src/org/crossref/pdfmark/prism/Prism11Schema.java b/src/org/crossref/pdfmark/prism/Prism11Schema.java
@@ -17,7 +17,7 @@
  */
 package org.crossref.pdfmark.prism;
 
-import com.lowagie.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.XmpSchema;
 
 public class Prism11Schema extends XmpSchema {
 	
diff --git a/src/org/crossref/pdfmark/prism/Prism21Schema.java b/src/org/crossref/pdfmark/prism/Prism21Schema.java
@@ -17,7 +17,7 @@
  */
 package org.crossref.pdfmark.prism;
 
-import com.lowagie.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.XmpSchema;
 
 public class Prism21Schema extends XmpSchema {
 	
diff --git a/src/org/crossref/pdfmark/test/MarkBuilderTest.java b/src/org/crossref/pdfmark/test/MarkBuilderTest.java
@@ -11,7 +11,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.lowagie.text.pdf.PdfStamper;
+import com.itextpdf.text.pdf.PdfStamper;
 import static org.junit.Assert.*;
 
 /**
diff --git a/src/org/crossref/pdfmark/test/PdfInfoDirectory.java b/src/org/crossref/pdfmark/test/PdfInfoDirectory.java
@@ -6,9 +6,9 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfStamper;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfStamper;
 
 public class PdfInfoDirectory {
 	
diff --git a/src/org/crossref/pdfmark/unixref/Book.java b/src/org/crossref/pdfmark/unixref/Book.java
@@ -11,8 +11,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.lowagie.text.xml.xmp.DublinCoreSchema;
-import com.lowagie.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.DublinCoreSchema;
+import com.itextpdf.text.xml.xmp.XmpSchema;
 
 public class Book extends Work {
     
diff --git a/src/org/crossref/pdfmark/unixref/Journal.java b/src/org/crossref/pdfmark/unixref/Journal.java
@@ -29,9 +29,9 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.lowagie.text.xml.xmp.DublinCoreSchema;
-import com.lowagie.text.xml.xmp.XmpSchema;
-import com.lowagie.text.xml.xmp.XmpWriter;
+import com.itextpdf.text.xml.xmp.DublinCoreSchema;
+import com.itextpdf.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.XmpWriter;
 
 public class Journal extends Work {
 	
diff --git a/src/org/crossref/pdfmark/unixref/Work.java b/src/org/crossref/pdfmark/unixref/Work.java
@@ -3,10 +3,9 @@
 import javax.xml.xpath.XPathExpressionException;
 
 import org.crossref.pdfmark.DcPrismSet;
-import org.w3c.dom.Node;
 
-import com.lowagie.text.xml.xmp.XmpArray;
-import com.lowagie.text.xml.xmp.XmpSchema;
+import com.itextpdf.text.xml.xmp.XmpArray;
+import com.itextpdf.text.xml.xmp.XmpSchema;
 
 public abstract class Work {
     
