Make the same as the 1.7 branch

openpreserve · Aug 23, 2012 · ee7e47b · ee7e47b
1 parent 049f2df
commit ee7e47b
Show file tree

Hide file tree

Showing 435 changed files with 2,386 additions and 881 deletions.
diff --git a/RELEASENOTES b/RELEASENOTES
@@ -4,6 +4,30 @@ Copyright 2003-2009 by JSTOR and the President and Fellows of Harvard College
 JHOVE is made available under the GNU Lesser General Public License (LGPL;
 see the file LICENSE for details)
 
+Versions 1.7 and beyond of JHOVE are no longer under the control of Harvard.
+
+RELEASE NOTES FOR JHOVE 1.7
+2012-08-12
+
+GENERAL
+
+1. JHOVE 1.7, as well as future releases unless noted otherwise, is 
+   released independently of Harvard under the GNU General Public License.
+
+2. JHOVE now will tell you where it was looking for the config file if it 
+   can't open it. This should help debug configuration problems.
+
+XML HANDLER
+
+1. Changes to XmlHandler.java and NisoImageMetadata.java to correct invalid MIX 
+   2.0 XML output in the value of grayResponseUnit. It was previously writing 
+   integers (as in 1.0) rather than the expected enumerated strings.
+
+PDF MODULE
+
+1. A situation that caused an infinite loop and eventual memory exhaustion 
+   processing in some PDF files with malformed literals has been fixed.
+
 RELEASE NOTES FOR JHOVE 1.6
 2011-01-03
 

diff --git a/classes/Jhove.java b/classes/Jhove.java
@@ -32,10 +32,10 @@ public class Jhove
     private static final String NAME = "Jhove";
 
     /** Application build date, YYYY, MM, DD. */
-    private static final int [] DATE = {2011, 1, 4};
+    private static final int [] DATE = {2012, 8, 12};
 
     /** Application release number. */
-    private static final String RELEASE = "1.6";
+    private static final String RELEASE = "1.7";
 
     /** Application invocation syntax. */
     private static final String USAGE = "java " + NAME + " [-c config] " +
@@ -45,7 +45,9 @@ public class Jhove
 
     /** Copyright information. */
     private static final String RIGHTS =
-	"Copyright 2004-2011 by the President and Fellows of Harvard College. " +
+	"Derived from software Copyright 2004-2011 " +
+    "by the President and Fellows of Harvard College. " +
+    "Version 1.7 independently released. " +
 	"Released under the GNU Lesser General Public License.";
 
     /******************************************************************

diff --git a/classes/JhoveView.java b/classes/JhoveView.java
@@ -37,21 +37,23 @@ public class JhoveView
     private static final String NAME = "JhoveView";
 
     /** Application build date, YYYY, MM, DD. */
-    private static final int [] DATE = {2011, 1, 4};
+    private static final int [] DATE = {2012, 8, 12};
 
     /** Usage string is meaningless here. */
     private static final String USAGE = null;
 
     /** Application release number. */
-    private static final String RELEASE = "1.6";
+    private static final String RELEASE = "1.7";
 
     /** Default character encoding */
     private static final String DEFAULT_ENCODING = "UTF-8";
 
     /** Copyright information. */
-    private static final String RIGHTS = "Copyright 2004-2011 by JSTOR and " +
-	"the President and Fellows of Harvard College. " +
-	"Released under the GNU Lesser General Public License.";
+    private static final String RIGHTS = 
+        "Derived from software Copyright 2004-2011 " +
+        "by the President and Fellows of Harvard College. " +
+        "Version 1.7 independently released. " +
+    	"Released under the GNU Lesser General Public License.";
 
     /******************************************************************
      * Configuration constants.

diff --git a/classes/edu/harvard/hul/ois/jhove/JhoveBase.java b/classes/edu/harvard/hul/ois/jhove/JhoveBase.java
@@ -38,10 +38,13 @@ public class JhoveBase
 
     private static Date _date;
     private static final String _name = "JhoveBase";
-    private static final String _release = "1.2";
-    private static final int [] DATE = {2007, 5, 10};
+    private static final String _release = "1.7";
+    private static final int [] DATE = {2012, 8, 12};
     private static final String _rights =
-	"Copyright 2005-2007 by the President and Fellows of Harvard College";
+    	"Derived from software Copyright 2004-2011 " +
+        "by the President and Fellows of Harvard College. " +
+    	"Version 1.7 independently released. " +
+    	"Released under the GNU Lesser General Public License.";
 
     /** JHOVE buffer size property. */
     private static final String BUFFER_PROPERTY = "edu.harvard.hul.ois." +

diff --git a/classes/edu/harvard/hul/ois/jhove/handler/META-INF/MANIFEST.MF b/classes/edu/harvard/hul/ois/jhove/handler/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.6.0_33-b03-424-10M3720 (Apple Inc.)
+Built-By: gmcgath
+Built-On: 2012-08-12T11:38:41
+
+Name: JHOVE
+Version: 1.0
+Package: Handlers
+Rights: Copyright 2004 by JSTOR and the President and Fellows of Harva
+ rd College
+
diff --git a/classes/edu/harvard/hul/ois/jhove/handler/XmlHandler.java b/classes/edu/harvard/hul/ois/jhove/handler/XmlHandler.java
@@ -41,10 +41,10 @@ public class XmlHandler
     private static final String NAME = "XML";
 
     /** Handler release identifier. */
-    private static final String RELEASE = "1.6";
+    private static final String RELEASE = "1.7";
 
     /** Handler release date. */
-    private static final int [] DATE = {2009, 10, 14};
+    private static final int [] DATE = {2012, 8, 12};
 
     /** Handler informative note. */
     private static final String NOTE =
@@ -53,9 +53,10 @@ public class XmlHandler
 
     /** Handler rights statement. */
     private static final String RIGHTS =
-        "Copyright 2003-2011 by JSTOR and the President and Fellows of " +
-        "Harvard College. " +
-        "Released under the GNU Lesser General Public License.";
+            "Derived from software Copyright 2004-2011 " +
+                    "by the President and Fellows of Harvard College. " +
+                    "Version 1.7 independently released. " +
+                    "Released under the GNU Lesser General Public License.";
 
     /** Localized line separator character. */
     private final static String EOL = System.getProperty ("line.separator");
@@ -3634,12 +3635,12 @@ protected void showNisoImageCaptureMetadata20 (NisoImageMetadata niso,
              final String[] orient = { "unknown", 
                      "normal*",
                      "normal, image flipped",
-                     "normal, rotated 180¡",
-                     "normal, image flipped, rotated 180¡",
-                     "normal, image flipped, rotated cw 90¡",
-                     "normal, rotated ccw 90¡",
-                     "normal, image flipped, rotated ccw 90¡",
-                     "normal, rotated cw 90¡" };
+                     "normal, rotated 180\u00B0",
+                     "normal, image flipped, rotated 180\u00B0",
+                     "normal, image flipped, rotated cw 90\u00B0",
+                     "normal, rotated ccw 90\u00B0",
+                     "normal, image flipped, rotated ccw 90\u00B0",
+                     "normal, rotated cw 90\u00B0" };
              if (n > 8 || n < 0) {
                  n = 0;   // force "unknown" for bad value
              }

diff --git a/classes/edu/harvard/hul/ois/jhove/module/PdfModule.java b/classes/edu/harvard/hul/ois/jhove/module/PdfModule.java
@@ -41,8 +41,8 @@ public class PdfModule
      ******************************************************************/
 
     private static final String NAME = "PDF-hul";
-    private static final String RELEASE = "1.8";
-    private static final int [] DATE = {2009, 5, 22};
+    private static final String RELEASE = "1.7";
+    private static final int [] DATE = {2012, 8, 12};
     private static final String [] FORMAT = {
         "PDF", "Portable Document Format"
     };

diff --git a/classes/edu/harvard/hul/ois/jhove/module/TiffModule.java b/classes/edu/harvard/hul/ois/jhove/module/TiffModule.java
@@ -36,8 +36,8 @@ public class TiffModule
      ******************************************************************/
 
     private static final String NAME = "TIFF-hul";
-    private static final String RELEASE = "1.5";
-    private static final int [] DATE = {2007, 10, 2};
+    private static final String RELEASE = "1.7";
+    private static final int [] DATE = {2012, 8, 12};
     private static final String [] FORMAT = {
         "TIFF", "Tagged Image File Format"
     };

diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:37:11 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:48 EDT 2012 -->
 <TITLE>
 All Classes (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:37:11 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:48 EDT 2012 -->
 <TITLE>
 All Classes (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/doc/constant-values.html b/doc/constant-values.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:37:10 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:47 EDT 2012 -->
 <TITLE>
 Constant Field Values (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:37:11 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:48 EDT 2012 -->
 <TITLE>
 Deprecated List (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.Face.html b/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.Face.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 AESAudioMetadata.Face (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.FaceRegion.html b/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.FaceRegion.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 AESAudioMetadata.FaceRegion (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.FormatRegion.html b/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.FormatRegion.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 AESAudioMetadata.FormatRegion (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.TimeDesc.html b/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.TimeDesc.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 AESAudioMetadata.TimeDesc (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.html b/doc/edu/harvard/hul/ois/jhove/AESAudioMetadata.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:38 EDT 2012 -->
 <TITLE>
 AESAudioMetadata (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/Agent.html b/doc/edu/harvard/hul/ois/jhove/Agent.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 Agent (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AgentType.html b/doc/edu/harvard/hul/ois/jhove/AgentType.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 AgentType (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/AnalogDigitalFlagType.html b/doc/edu/harvard/hul/ois/jhove/AnalogDigitalFlagType.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:56 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 AnalogDigitalFlagType (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/App.html b/doc/edu/harvard/hul/ois/jhove/App.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:57 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 App (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 

diff --git a/doc/edu/harvard/hul/ois/jhove/ByteArrayXMPSource.html b/doc/edu/harvard/hul/ois/jhove/ByteArrayXMPSource.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Tue Jan 04 15:36:57 EST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_33) on Sun Aug 12 09:39:39 EDT 2012 -->
 <TITLE>
 ByteArrayXMPSource (JHOVE Documentation)
 </TITLE>
 
-<META NAME="date" CONTENT="2011-01-04">
+<META NAME="date" CONTENT="2012-08-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">