Merge pull request #127 from daveneiman/upgrade_to_JHOVE_1_16_5

Upgrade JHOVE to v.1.16.5
harvard-lts · Mar 22, 2017 · 3aa4bb9 · 3aa4bb9
2 parents 2ceb4e6 + 2d6daf7
commit 3aa4bb9
Show file tree

Hide file tree

Showing 26 changed files with 279 additions and 144 deletions.
diff --git a/.classpath b/.classpath
@@ -8,9 +8,8 @@
 	<classpathentry kind="lib" path="lib-ant/xmlunit-1.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/serializer.jar"/>
-	<classpathentry kind="lib" path="lib/jhove/jhove-handler.jar"/>
-	<classpathentry kind="lib" path="lib/jhove/jhove.jar"/>
-	<classpathentry kind="lib" path="lib/jhove/jhove-module.jar"/>
+	<classpathentry kind="lib" path="lib/jhove/jhove-core-1.16.5.jar"/>
+	<classpathentry kind="lib" path="lib/jhove/jhove-modules-1.16.5.jar"/>
 	<classpathentry kind="lib" path="lib/jdom.jar"/>
 	<classpathentry kind="lib" path="lib/saxpath.jar"/>
 	<classpathentry kind="lib" path="lib/fast-md5.jar"/>

diff --git a/lib/jhove/jhove-core-1.16.5.jar b/lib/jhove/jhove-core-1.16.5.jar
diff --git a/lib/jhove/jhove-handler.jar b/lib/jhove/jhove-handler.jar
diff --git a/lib/jhove/jhove-module.jar b/lib/jhove/jhove-module.jar
diff --git a/lib/jhove/jhove-modules-1.16.5.jar b/lib/jhove/jhove-modules-1.16.5.jar
diff --git a/lib/jhove/jhove.jar b/lib/jhove/jhove.jar
diff --git a/src/edu/harvard/hul/ois/fits/exceptions/FitsException.java b/src/edu/harvard/hul/ois/fits/exceptions/FitsException.java
@@ -16,7 +16,7 @@ public class FitsException extends Exception {
 	 * generated serial id
 	 */
 	private static final long serialVersionUID = 1266363844796336485L;
-	private Exception embeddedException = null;
+	private Throwable embeddedException = null;
 	private String message;
 
 	public FitsException() {
@@ -26,7 +26,7 @@ public FitsException(String message) {
         this();
         this.message = message;
     }
-    public FitsException(String message, Exception e) {
+    public FitsException(String message, Throwable e) {
         this();
         this.embeddedException = e;
         this.message = message;
@@ -39,7 +39,7 @@ public String getMessage() {
     	return message;
     }
 
-    public Exception getEmbeddedException() {
+    public Throwable getEmbeddedException() {
     	return embeddedException;
     }
 }
diff --git a/src/edu/harvard/hul/ois/fits/exceptions/FitsToolException.java b/src/edu/harvard/hul/ois/fits/exceptions/FitsToolException.java
@@ -22,7 +22,7 @@ public FitsToolException() {
     public FitsToolException(String message) {
         super(message);
     }
-    public FitsToolException(String message, Exception e) {
+    public FitsToolException(String message, Throwable e) {
     	super(message,e);
     }
 

diff --git a/src/edu/harvard/hul/ois/fits/tools/jhove/Jhove.java b/src/edu/harvard/hul/ois/fits/tools/jhove/Jhove.java
@@ -66,7 +66,7 @@ public Jhove() throws FitsException {
             jhove.setSignatureFlag(false);
             jhove.setShowRawFlag(false);
       	    xh = new XmlHandler();
-      	    jhoveApp = new App ("Jhove","1.11", new int[] {2015, 05, 25}, "","");
+      	    jhoveApp = new App ("Jhove","1.16", new int[] {2017, 03, 15}, "","");
             xh.setApp(jhoveApp);
             xh.setBase(jhove);
 		}
@@ -135,7 +135,7 @@ public ToolOutput extractInfo(File file) throws FitsToolException {
 		}
 		catch (OutOfMemoryError e) {
             logger.error("Jhove OutOfMemoryError while processing "+file.getName());
-			throw new FitsToolException("Jhove OutOfMemoryError while processing "+file.getName());
+			throw new FitsToolException("Jhove OutOfMemoryError while processing "+file.getName(), e);
 		}
 		String format = XmlUtils.getDomValue(dom,"format");
 		String xsltTransform = (String)transformMap.get(format.toUpperCase());

diff --git a/testfiles/32044020597662.zip b/testfiles/32044020597662.zip
diff --git a/testfiles/output/32044020597662.zip_XmlUnitExpectedOutput.xml b/testfiles/output/32044020597662.zip_XmlUnitExpectedOutput.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.0.7" timestamp="3/21/17 5:59 PM">
+  <identification>
+    <identity format="ZIP Format" mimetype="application/zip" toolname="FITS" toolversion="1.0.7">
+      <tool toolname="Droid" toolversion="6.1.5" />
+      <tool toolname="file utility" toolversion="5.04" />
+      <tool toolname="Exiftool" toolversion="10.00" />
+      <tool toolname="ffident" toolversion="0.2" />
+      <tool toolname="Tika" toolversion="1.10" />
+      <version toolname="file utility" toolversion="5.04">1.0</version>
+      <externalIdentifier toolname="Droid" toolversion="6.1.5" type="puid">x-fmt/263</externalIdentifier>
+    </identity>
+  </identification>
+  <fileinfo>
+    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/32044020597662.zip</filepath>
+    <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">32044020597662.zip</filename>
+    <size toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">95270</size>
+    <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">7c64750915af83a39c35f0e836d3690f</md5checksum>
+    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1490192287000</fslastmodified>
+  </fileinfo>
+  <filestatus />
+  <metadata />
+  <statistics fitsExecutionTime="1010">
+    <tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
+    <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
+    <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
+    <tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
+    <tool toolname="Droid" toolversion="6.1.5" executionTime="128" />
+    <tool toolname="Jhove" toolversion="1.16" status="did not run" />
+    <tool toolname="file utility" toolversion="5.04" executionTime="525" />
+    <tool toolname="Exiftool" toolversion="10.00" executionTime="512" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="did not run" />
+    <tool toolname="OIS File Information" toolversion="0.2" executionTime="80" />
+    <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
+    <tool toolname="ffident" toolversion="0.2" executionTime="578" />
+    <tool toolname="Tika" toolversion="1.10" executionTime="1042" />
+  </statistics>
+</fits>
+
diff --git a/testfiles/output/FITS-SAMPLE-44_1_1_4_4_4_6_1_1_2_3_1_mp4_FITS_NO_MD5.xml b/testfiles/output/FITS-SAMPLE-44_1_1_4_4_4_6_1_1_2_3_1_mp4_FITS_NO_MD5.xml
@@ -72,7 +72,7 @@
     <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
     <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
     <tool toolname="Droid" toolversion="6.1.3" executionTime="432" />    
-    <tool toolname="Jhove" toolversion="1.5" executionTime="4659" />
+    <tool toolname="Jhove" toolversion="1.16" status="did not run" />
     <tool toolname="file utility" toolversion="5.04" executionTime="1001" />
     <tool toolname="Exiftool" toolversion="9.13" status="did not run" />
     <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" executionTime="745" />

diff --git a/testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml b/testfiles/output/HasAnnotations.pdf_XmlUnitExpectedOutput.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="0.11.0" timestamp="2/26/16 9:28 AM">
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.0.6" timestamp="3/21/17 9:15 AM">
   <identification>
-    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="0.11.0">
+    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="1.0.6">
       <tool toolname="Droid" toolversion="6.1.5" />
-      <tool toolname="Jhove" toolversion="1.11" />
+      <tool toolname="Jhove" toolversion="1.16" />
       <tool toolname="file utility" toolversion="5.04" />
       <tool toolname="Exiftool" toolversion="10.00" />
       <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
@@ -14,20 +14,19 @@
     </identity>
   </identification>
   <fileinfo>
-    <size toolname="Jhove" toolversion="1.11">103323</size>
+    <size toolname="Jhove" toolversion="1.16">103323</size>
     <creatingApplicationName toolname="Exiftool" toolversion="10.00">Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word</creatingApplicationName>
     <lastmodified toolname="Exiftool" toolversion="10.00" status="CONFLICT">2015:08:19 17:12:03-04:00</lastmodified>
     <lastmodified toolname="Tika" toolversion="1.10" status="CONFLICT">2015-08-19T21:12:03Z</lastmodified>
     <created toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">2015:08:19 17:10:14-04:00</created>
-    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/fits-daveneiman/fits/testfiles/HasAnnotations.pdf</filepath>
+    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/HasAnnotations.pdf</filepath>
     <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">HasAnnotations.pdf</filename>
     <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">4475c0c78050f41718837eb3f8069cbd</md5checksum>
-    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1456424437000</fslastmodified>
+    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1464898750000</fslastmodified>
   </fileinfo>
   <filestatus>
-    <well-formed toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">false</well-formed>
-    <valid toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">false</valid>
-    <message toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">Invalid object number in cross-reference stream offset=103289</message>
+    <well-formed toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</well-formed>
+    <valid toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</valid>
   </filestatus>
   <metadata>
     <document>
@@ -37,8 +36,8 @@
       <pageCount toolname="Exiftool" toolversion="10.00">6</pageCount>
       <isTagged toolname="Exiftool" toolversion="10.00" status="CONFLICT">yes</isTagged>
       <isTagged toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">no</isTagged>
-      <hasOutline toolname="Jhove" toolversion="1.11">no</hasOutline>
-      <hasAnnotations toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">no</hasAnnotations>
+      <hasOutline toolname="Jhove" toolversion="1.16">no</hasOutline>
+      <hasAnnotations toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">no</hasAnnotations>
       <hasForms toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">no</hasForms>
       <standard>
         <docmd:document xmlns:docmd="http://www.fcla.edu/docmd">
@@ -49,20 +48,20 @@
       </standard>
     </document>
   </metadata>
-  <statistics fitsExecutionTime="217">
+  <statistics fitsExecutionTime="261">
     <tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
     <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
     <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
     <tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
-    <tool toolname="Droid" toolversion="6.1.5" executionTime="4" />
-    <tool toolname="Jhove" toolversion="1.11" executionTime="22" />
-    <tool toolname="file utility" toolversion="5.04" executionTime="31" />
-    <tool toolname="Exiftool" toolversion="10.00" executionTime="205" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="15" />
-    <tool toolname="OIS File Information" toolversion="0.2" executionTime="2" />
+    <tool toolname="Droid" toolversion="6.1.5" executionTime="13" />
+    <tool toolname="Jhove" toolversion="1.16" executionTime="34" />
+    <tool toolname="file utility" toolversion="5.04" executionTime="61" />
+    <tool toolname="Exiftool" toolversion="10.00" executionTime="254" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="28" />
+    <tool toolname="OIS File Information" toolversion="0.2" executionTime="9" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
-    <tool toolname="ffident" toolversion="0.2" executionTime="4" />
-    <tool toolname="Tika" toolversion="1.10" executionTime="65" />
+    <tool toolname="ffident" toolversion="0.2" executionTime="11" />
+    <tool toolname="Tika" toolversion="1.10" executionTime="66" />
   </statistics>
 </fits>
 
diff --git a/testfiles/output/HasChangeHistory.pdf_XmlUnitExpectedOutput.xml b/testfiles/output/HasChangeHistory.pdf_XmlUnitExpectedOutput.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="0.11.0" timestamp="2/26/16 9:28 AM">
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.0.6" timestamp="3/20/17 2:39 PM">
   <identification>
-    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="0.11.0">
+    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="1.0.6">
       <tool toolname="Droid" toolversion="6.1.5" />
-      <tool toolname="Jhove" toolversion="1.11" />
+      <tool toolname="Jhove" toolversion="1.16" />
       <tool toolname="file utility" toolversion="5.04" />
       <tool toolname="Exiftool" toolversion="10.00" />
       <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
@@ -14,20 +14,19 @@
     </identity>
   </identification>
   <fileinfo>
-    <size toolname="Jhove" toolversion="1.11">101002</size>
+    <size toolname="Jhove" toolversion="1.16">101002</size>
     <creatingApplicationName toolname="Exiftool" toolversion="10.00">Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word</creatingApplicationName>
     <lastmodified toolname="Exiftool" toolversion="10.00" status="CONFLICT">2015:08:19 17:10:57-04:00</lastmodified>
     <lastmodified toolname="Tika" toolversion="1.10" status="CONFLICT">2015-08-19T21:10:57Z</lastmodified>
     <created toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">2015:08:19 17:10:14-04:00</created>
-    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/fits-daveneiman/fits/testfiles/HasChangeHistory.pdf</filepath>
+    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dan179/git/git-daveneiman/fits/testfiles/HasChangeHistory.pdf</filepath>
     <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">HasChangeHistory.pdf</filename>
     <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">ad18d1a191b7ab53614f3d003fa60472</md5checksum>
-    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1456425107000</fslastmodified>
+    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1464898750000</fslastmodified>
   </fileinfo>
   <filestatus>
-    <well-formed toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">false</well-formed>
-    <valid toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">false</valid>
-    <message toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">Invalid object number in cross-reference stream offset=100968</message>
+    <well-formed toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</well-formed>
+    <valid toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</valid>
   </filestatus>
   <metadata>
     <document>
@@ -37,8 +36,8 @@
       <pageCount toolname="Exiftool" toolversion="10.00">6</pageCount>
       <isTagged toolname="Exiftool" toolversion="10.00" status="CONFLICT">yes</isTagged>
       <isTagged toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">no</isTagged>
-      <hasOutline toolname="Jhove" toolversion="1.11">no</hasOutline>
-      <hasAnnotations toolname="Jhove" toolversion="1.11" status="SINGLE_RESULT">no</hasAnnotations>
+      <hasOutline toolname="Jhove" toolversion="1.16">no</hasOutline>
+      <hasAnnotations toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">no</hasAnnotations>
       <hasForms toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">no</hasForms>
       <standard>
         <docmd:document xmlns:docmd="http://www.fcla.edu/docmd">
@@ -49,20 +48,20 @@
       </standard>
     </document>
   </metadata>
-  <statistics fitsExecutionTime="197">
+  <statistics fitsExecutionTime="907">
     <tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
     <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
     <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
     <tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
-    <tool toolname="Droid" toolversion="6.1.5" executionTime="5" />
-    <tool toolname="Jhove" toolversion="1.11" executionTime="23" />
-    <tool toolname="file utility" toolversion="5.04" executionTime="33" />
-    <tool toolname="Exiftool" toolversion="10.00" executionTime="185" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="15" />
+    <tool toolname="Droid" toolversion="6.1.5" executionTime="9" />
+    <tool toolname="Jhove" toolversion="1.16" executionTime="121" />
+    <tool toolname="file utility" toolversion="5.04" executionTime="87" />
+    <tool toolname="Exiftool" toolversion="10.00" executionTime="281" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="71" />
     <tool toolname="OIS File Information" toolversion="0.2" executionTime="2" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
-    <tool toolname="ffident" toolversion="0.2" executionTime="4" />
-    <tool toolname="Tika" toolversion="1.10" executionTime="64" />
+    <tool toolname="ffident" toolversion="0.2" executionTime="11" />
+    <tool toolname="Tika" toolversion="1.10" executionTime="879" />
   </statistics>
 </fits>