Commits

Anonymous committed 5a6a0fa

Synchronize with Stephen's changes 2011.03.02 3:48 PM EST

Comments (0)

Files changed (219)

config/messages/jhove2_messages.properties

 #   Message templates for class org.jhove2.module.format.wave.FormatChunk
 # ##############################################################################
 # 
+org.jhove2.module.format.wave.WaveModule.duplicateChunk=Duplicate chunk: {0}
+org.jhove2.module.format.wave.WaveModule.fileTruncated=File appears to be truncated: RIFF={0, number, integer}, file={1, number, integer}
 org.jhove2.module.format.wave.WaveModule.formatChunkNotBeforeDataChunk=Format chunk must appear before data chunk
 org.jhove2.module.format.wave.WaveModule.missingRequiredDataChunk=Required data chunk is missing
 org.jhove2.module.format.wave.WaveModule.missingRequiredDataChunk=Data chunk, required for non-PCM data, is missing
 org.jhove2.module.format.wave.WaveModule.missingRequiredDataChunk=Required format chunk is missing
+org.jhove2.module.format.wave.WaveModule.riffChunkSmallerThanFile=RIFF chunk smaller than file size: RIFF={0, number, integer}, file={1, number, integer}
 #
 # ##############################################################################
 #   Message templates for class org.jhove2.module.format.xml.XmlModule

config/properties/module/display/displayer/org/jhove2/core/reportable/AbstractReportable_displayer.properties

-# displayer.properties
-# The visibility directives control the display of the properties identified by URI
-# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
-# IfNonZero, IfPositive, IfTrue, IfZero, Never
-# A property is not displayed if its value is not consistent with the directive.
-# Negative means ...,-2,-1; NonNegative means 0,1,2...
-# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName Never

config/properties/module/display/displayer/org/jhove2/core/reportable/Reportable_displayer.properties

+# displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+# IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+
+http\://jhove2.org/terms/property/org/jhove2/core/reportable/Reportable/ReportableName Never

config/properties/module/display/displayer/org/jhove2/core/source/DirectorySource_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/source/DirectorySource/Path	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/DirectorySource/SourceName	Always

config/properties/module/display/displayer/org/jhove2/core/source/FileSource_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/source/FileSource/LastModified	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/FileSource/Path	Always
 http\://jhove2.org/terms/property/org/jhove2/core/source/FileSource/Size	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/FileSource/isHidden	IfTrue
-http\://jhove2.org/terms/property/org/jhove2/core/source/FileSource/isSpecial	IfTrue
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSource/SourceName	Always

config/properties/module/display/displayer/org/jhove2/core/source/FileSystemProperties_displayer.properties

+# displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+# IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemProperties/isExtant	IfFalse
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemProperties/isHidden	IfTrue
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemProperties/isReadable	IfFalse
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemProperties/isSpecial	IfTrue
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemProperties/LastModified	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemProperties/Path	Always

config/properties/module/display/displayer/org/jhove2/core/source/FileSystemSource_displayer.properties

-# displayer.properties
-# The visibility directives control the display of the properties identified by URI
-# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
-# IfNonZero, IfPositive, IfTrue, IfZero, Never
-# A property is not displayed if its value is not consistent with the directive.
-# Negative means ...,-2,-1; NonNegative means 0,1,2...
-# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemSource/isExtant   IfFalse
-http\://jhove2.org/terms/property/org/jhove2/core/source/FileSystemSource/isReadable IfFalse

config/properties/module/display/displayer/org/jhove2/core/source/MeasurableSource_displayer.properties

+# displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+# IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/core/source/MeasurableSource/EndingOffset	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/MeasurableSource/Size			Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/MeasurableSource/StartingOffset	Always

config/properties/module/display/displayer/org/jhove2/core/source/NamedSource_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/source/NamedSource/Name Never
+http\://jhove2.org/terms/property/org/jhove2/core/source/NamedSource/Name Always

config/properties/module/display/displayer/org/jhove2/core/source/Source_displayer.properties

 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
 http\://jhove2.org/terms/message/org/jhove2/core/source/Source/Messages	Always
 http\://jhove2.org/terms/property/org/jhove2/core/source/Source/ChildSources	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/Source/ExtraProperties	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/Source/FileSystemProperties	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/Source/hasChildSources	Always
+http\://jhove2.org/terms/property/org/jhove2/core/source/Source/isAggregate	Always
 http\://jhove2.org/terms/property/org/jhove2/core/source/Source/Modules	Always
 http\://jhove2.org/terms/property/org/jhove2/core/source/Source/NumChildSources	IfNonZero
 http\://jhove2.org/terms/property/org/jhove2/core/source/Source/PresumptiveFormats	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/Source/StartingOffset	Always
 http\://jhove2.org/terms/property/org/jhove2/core/source/Source/TimerInfo	Always

config/properties/module/display/displayer/org/jhove2/core/source/ZIpDirectorySource_displayer.properties

-# _displayer.properties
-# The visibility directives control the display of the properties identified by URI
-# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
-#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
-# A property is not displayed if its value is not consistent with the directive.
-# Negative means ...,-2,-1; NonNegative means 0,1,2...
-# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipDirectorySource/Comment	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipDirectorySource/LastModified	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipDirectorySource/Path	Always

config/properties/module/display/displayer/org/jhove2/core/source/ZipFileSource_displayer.properties

-# _displayer.properties
-# The visibility directives control the display of the properties identified by URI
-# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
-#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
-# A property is not displayed if its value is not consistent with the directive.
-# Negative means ...,-2,-1; NonNegative means 0,1,2...
-# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipFileSource/CRC32MessageDigest	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipFileSource/Comment	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipFileSource/LastModified	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipFileSource/Path	Always
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipFileSource/Size	Always

config/properties/module/display/displayer/org/jhove2/module/format/riff/GenericChunk_displayer.properties

-# _displayer.properties
-# The visibility directives control the display of the properties identified by URI
-# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
-#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
-# A property is not displayed if its value is not consistent with the directive.
-# Negative means ...,-2,-1; NonNegative means 0,1,2...
-# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/ChildChunks	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Identifier	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Size	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/hasPadByte	IfTrue
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/isValid	Always

config/properties/module/display/displayer/org/jhove2/module/format/riff/LISTChunk_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/ChildChunks	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Identifier	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Size	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/hasPadByte	IfTrue
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/isValid	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/riff/LISTChunk/ListType	Always

config/properties/module/display/displayer/org/jhove2/module/format/riff/RIFFChunk_displayer.properties

 #                        IfNonZero, IfPositive, IfTrue, IfZero, Never
 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
-# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/ChildChunks	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Identifier	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Size	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/hasPadByte	IfTrue
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/isValid	Always
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/riff/RIFFChunk/InvalidFormTypeMessage	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/riff/RIFFChunk/FormType_descriptive	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/riff/RIFFChunk/FormType_raw	Always

config/properties/module/display/displayer/org/jhove2/module/format/riff/ZSTRChunk_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/ChildChunks	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Identifier	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/Size	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/hasPadByte	IfTrue
-http\://jhove2.org/terms/property/org/jhove2/module/format/riff/Chunk/isValid	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/riff/ZSTRChunk/Description	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/riff/ZSTRChunk/String	Always

config/properties/module/display/displayer/org/jhove2/module/format/tiff/IFDEntry_displayer.properties

-# _displayer.properties
-# The visibility directives control the display of the properties identified by URI
-# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
-#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
-# A property is not displayed if its value is not consistent with the directive.
-# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/ByteOffsetNotWordAlignedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/InvalidCountValueMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/InvalidDateTimeFormatMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/InvalidDateTimeMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/TagSortOrderErrorMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/TypeMismatchMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/UnknownTagMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/UnknownTypeMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/UnknownTypeMessages	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/ValueOffsetReferenceLocationFileMessage	Always 
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Compression_descriptive	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/ByteOffsetNotWordAlignedMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/InvalidCountValueMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/InvalidDateTimeFormatMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/InvalidDateTimeMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/TagSortOrderErrorMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/TileLengthNotMultipleOf16Message	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/TileWidthNotMultipleOf16Message	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/TypeMismatchMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/UnknownTagMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/UnknownTypeMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/UnknownTypeMessages	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFDEntry/ValueOffsetReferenceLocationFileMessage	Always
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Compression_descriptive	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Count	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Name	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Name	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Tag	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/TiffType	Always
 http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Type	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Value	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/ValueOffset	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/isValid	Always 
-
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/Value	Always
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/ValueOffset	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFDEntry/isValid	Always

config/properties/module/display/displayer/org/jhove2/module/format/tiff/IFD_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFD/ZeroIFDEntriesMessage	Always 
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/IFDEntries	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/NextIFD	Never 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/NumEntries	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/Offset	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFD/ZeroIFDEntriesMessage	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/IFDEntries	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/NextIFD	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/NumEntries	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/Offset	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/IFH_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/ByteOffset	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/ByteOrdering	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/FirstIFD	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/MagicNumber	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/ByteOffset	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/ByteOrdering	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/FirstIFD	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFH/MagicNumber	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/TiffIFD_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/IFD/ZeroIFDEntriesMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/BPSInvalidForTransparencyMaskMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/BpsValueInvalidforCIELabMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/CellLengthShouldNotBePresentMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/ColorMapNotDefinedForPalleteColorMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/ColorMapNotDefinedForPalletteColorMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/DotRangeOutofRangeMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/InsufficientColorMapValuesForPalleteColorMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/InvalidStripOffsetMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/MissingRequiredTagMessages	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/PhotometricInterpretationSppLT1InvalidMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/PhotometricInterpretationSppLT3InvalidMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/SppExtraSamplesValueInvalidMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/SppMustEqualOneForPalleteColorMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/StripByteCountsNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/StripOffsetsNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/StripsLengthInconsistentMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileByteCountsNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileByteCountsValuesInsufficientMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileLengthNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileOffsetValuesInsufficientMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileOffsetsNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileWidthNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TilesAndStripsDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TilesAndStripsNotDefinedMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TransparencyMaskValueInconsistentMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/XClipPathUnitsNotDefinedMessage	Always 
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/IFDEntries	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/NextIFD	Never 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/NumEntries	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/IFD/Offset	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/BPSInvalidForTransparencyMaskMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/BpsValueInvalidforCIELabMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/CellLengthShouldNotBePresentMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/ColorMapNotDefinedForPalleteColorMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/ColorMapNotDefinedForPalletteColorMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/DotRangeOutofRangeMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/InsufficientColorMapValuesForPalleteColorMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/InvalidStripOffsetMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/MissingRequiredTagMessages	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/PhotometricInterpretationSppLT1InvalidMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/PhotometricInterpretationSppLT3InvalidMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/SppExtraSamplesValueInvalidMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/SppMustEqualOneForPalleteColorMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/StripByteCountsNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/StripOffsetsNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/StripsLengthInconsistentMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileByteCountsNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileByteCountsValuesInsufficientMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileLengthNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileOffsetValuesInsufficientMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileOffsetsNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TileWidthNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TilesAndStripsDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TilesAndStripsNotDefinedMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/TransparencyMaskValueInconsistentMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffIFD/XClipPathUnitsNotDefinedMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/TiffModule_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/message/org/jhove2/module/format/BaseFormatModule/ModuleDoesNotImplementValidatorInterfaceMessage	Always
-http\://jhove2.org/terms/message/org/jhove2/module/format/BaseFormatModule/ModuleNotFormatModuleMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/BaseFormatModule/ModuleNotFoundMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffModule/FailFast	Always 
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Developers	Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Note	Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/ReleaseDate	Always
-http\://jhove2.org/terms/property/org/jhove2/module/Module/RightsStatement	 Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Scope	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/TimerInfo	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Version	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/WrappedProduct	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/FormatModule/Format	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/FormatModule/Profiles	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/Validator/Coverage	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/Validator/isValid	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/TiffModule/IFDs	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/TiffModule/IFH	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/TiffModule/TiffVersion	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/TiffModule/FailFast	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/TiffModule/IFDs	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/TiffModule/IFH	Always 
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/TiffModule/TiffVersion	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffClassBProfile_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffClassBProfile/InvalidBPSValueMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffClassBProfile/InvalidSPPValueMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidCompressionValueMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidResolutionUnitValueMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/MissingRequiredTagMessages	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/invalidPhotometricInterpretationValueMessage	Always 
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Developers	Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Note	Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/ReleaseDate	Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/RightsStatement	Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Scope	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/TimerInfo	Always
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Version	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/WrappedProduct	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/FormatProfile/Format	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/Validator/Coverage	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/format/Validator/isValid	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffClassBProfile/InvalidBPSValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffClassBProfile/InvalidSPPValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffDLFProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffDLFProfile/MinimumResolutionValueInvalidMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffEPProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffEPProfile/InvalidNewSubfileTypeMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffEPProfile/InvalidSensingMethodValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffEPProfile/MissingCFAPatternTagsMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffEPProfile/MissingRequiredYCbCrDataMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffEPProfile/MissingStripOrTileTags	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffGeoTIFFProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffGeoTIFFProfile/ModelTagsNotDefinedMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITCTP1Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITCTP1Profile/InvalidDotRangeMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITCTP2Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITCTP2Profile/InvalidDotRangeMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITHCP1Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITHCP1Profile/InvalidDotRangeMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITHCP1Profile/InvalidTransparencyIndicatorValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITHCP2Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITHCP2Profile/InvalidDotRangeMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITHCP2Profile/InvalidTransparencyIndicatorValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITHCProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITHCProfile/InvalidTransparencyIndicatorValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITLWP1Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITLWP1Profile/InvalidBitsPerExtendedRunLengthMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITLWP1Profile/InvalidBitsPerRunLengthMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITLWP1Profile/InvalidDotRangeMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITLWP2Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITLWP2Profile/InvalidBitsPerExtendedRunLengthMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITLWProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITLWProfile/InvalidBitsPerExtendedRunLengthMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITMPP1Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITMPP1Profile/InvalidDotRangeMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITMPP1Profile/InvalidPixelIntensityRangeValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITMPP2Profile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITMPP2Profile/InvalidDotRangeMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffITMPProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffITMPProfile/InvalidRasterPaddingValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffItProfile_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidBPSValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidBackgroundColorIndicatorMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidColorSequenceMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidImageColorIndicatorMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidInksetValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidNewSubfileTypeMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidNumberOfInksValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffItProfile/InvalidSPPValueMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/profile/TiffProfile_displayer.properties

 # A property is not displayed if its value is not consistent with the directive.
 # Negative means ...,-2,-1; NonNegative means 0,1,2...
 # Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidCompressionValueMessage	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidResolutionUnitValueMessage	Always
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/MissingRequiredTagMessages	Always 
-http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/invalidPhotometricInterpretationValueMessage	Always 
-http\://jhove2.org/terms/property/org/jhove2/core/reportable/AbstractReportable/ReportableName	Always
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Developers	 Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Note	 Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/ReleaseDate	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/RightsStatement	 Never
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Scope	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/TimerInfo	Always
-http\://jhove2.org/terms/property/org/jhove2/module/Module/Version	Always 
-http\://jhove2.org/terms/property/org/jhove2/module/Module/WrappedProduct	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/FormatProfile/Format	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/Validator/Coverage	Always
-http\://jhove2.org/terms/property/org/jhove2/module/format/Validator/isValid	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidBPSValueMessage	Always
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidCompressionValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidOrientationValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidPhotometricInterpretationValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidPlanarConfigurationValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidResolutionUnitValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/InvalidSPPValueMessage	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/MissingRequiredTagMessages	Always 
+http\://jhove2.org/terms/message/org/jhove2/module/format/tiff/profile/TiffProfile/TagShouldNotBePresentMessage	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/AsciiArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/AsciiArray/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/Ascii_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/Ascii/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/ByteArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/ByteArray/ValueArray	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/Byte_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/Byte/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/DoubleArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/DoubleArray/ValueArray	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/Double_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/Double/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/FloatObject_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/FloatObject/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/LongArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/LongArray/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/Long_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/Long/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/Rational_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/Rational/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/SByteArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/SByteArray/ValueArray	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/SByte_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/SByte/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/SLongArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/SLongArray/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/SLong_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/SLong/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/SShortArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/SShortArray/ValueArray	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/SShort_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/SShort/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/ShortArray_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/ShortArray/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/tiff/type/Short_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/tiff/type/Short/Value	Always 

config/properties/module/display/displayer/org/jhove2/module/format/zip/ZipEntryProperties_displayer.properties

+# _displayer.properties
+# The visibility directives control the display of the properties identified by URI
+# The directives can be: Always, IfFalse, IfNegative, IfNonNegative, IfNonPositive,
+#                        IfNonZero, IfPositive, IfTrue, IfZero, Never
+# A property is not displayed if its value is not consistent with the directive.
+# Negative means ...,-2,-1; NonNegative means 0,1,2...
+# Positive means 1,2,3,...; NonPositive means ...,-2,-1,0
+http\://jhove2.org/terms/property/org/jhove2/module/format/zip/ZipEntryProperties/Comment	Always
+http\://jhove2.org/terms/property/org/jhove2/module/format/zip/ZipEntryProperties/CompressedSize	IfNonNegative
+http\://jhove2.org/terms/property/org/jhove2/module/format/zip/ZipEntryProperties/CRC32	Always
+http\://jhove2.org/terms/property/org/jhove2/module/format/zip/ZipEntryProperties/LastModified	Always
+http\://jhove2.org/terms/property/org/jhove2/module/format/zip/ZipEntryProperties/Name	Always

config/properties/module/display/units/org/jhove2/core/source/MeasurableSource_unit.properties

+# Units of measure properties
+# Note: These unit of measure labels are descriptive only; changing the label
+# does NOT change the determination of the underlying property value.
+
+http\://jhove2.org/terms/property/org/jhove2/core/source/MeasurableSource/EndingOffset   byte
+http\://jhove2.org/terms/property/org/jhove2/core/source/MeasurableSource/Size           byte
+http\://jhove2.org/terms/property/org/jhove2/core/source/MeasurableSource/StartingOffset byte

config/properties/module/display/units/org/jhove2/core/source/Source_unit.properties

-# Units of measure properties
-# Note: These unit of measure labels are descriptive only; changing the label
-# does NOT change the determination of the underlying property value.
-
-http\://jhove2.org/terms/property/org/jhove2/core/source/Source/StartingOffset byte

config/properties/module/display/units/org/jhove2/core/source/ZipFileSource_unit.properties

-# Units of measure properties
-# Note: These unit of measure labels are descriptive only; changing the label
-# does NOT change the determination of the underlying property value.
-http\://jhove2.org/terms/property/org/jhove2/core/source/ZipFileSource/Size        byte

config/properties/module/display/units/org/jhove2/module/format/zip/ZipEntryProperties_unit.properties

+# Units of measure properties
+# Note: These unit of measure labels are descriptive only; changing the label
+# does NOT change the determination of the underlying property value.
+
+http\://jhove2.org/terms/property/org/jhove2/module/format/zip/ZipEntryProperties/CompressedSize   byte

config/spring/module/aggrefy/jhove2-aggrefy-config.xml

 			</list>
 		</property>
 	 	<property name="formatIdentifier" ref="ShapefileIdentifier"/>
-	 	<property name="fileGroupingExpr" value="(.*)\.((?i:shp\.)?\w{3})$"/>
+	 	<property name="fileGroupingExpr" value="(.*?)\.((?i:shp\.)?\w{3})$"/>
 	 	<property name="mustHaveExpr" value="^((?i:shp)|(?i:shx)|(?i:dbf))$"/>
 	 	<property name="mayHaveExpr" 
 	 	          value="^((?i:shp.xml)|(?i:prj)|(?i:sbn)|(?i:sbx)|(?i:atx)|(?i:qix)|(?i:fix)|(?i:grx))$"/>

config/spring/module/assess/jhove2-ruleset-tiff-config.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+         http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+         http://www.springframework.org/schema/context
+         http://www.springframework.org/schema/context/spring-context-2.5.xsd
+         http://www.springframework.org/schema/util
+         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+    <bean id="TiffRuleSet" class="org.jhove2.module.assess.RuleSet" scope="singleton">
+        <property name="name" value="TiffRuleSet"/>
+        <property name="description" value="Ruleset for Tiff module"/>
+        <property name="objectFilter" value="org.jhove2.module.format.tiff.TiffModule"/>
+        <property name="rules">
+            <list value-type="org.jhove2.module.assess.Rule">
+                <ref local="TiffAcceptable"/>
+            </list>
+        </property>
+        <property name="enabled" value="true"/>
+    </bean>
+    <bean id="TiffAcceptable" class="org.jhove2.module.assess.Rule" scope="singleton">
+      <property name="name" value="TiffAcceptable"/>
+      <property name="description" value="Is the Tiff file valid or is there only ByteOffsetNotWordAligned or date format error messages?"/>
+      <property name="consequent" value="Acceptable"/>
+      <property name="alternative" value="Not Acceptable"/>
+      <property name="quantifier" value="ANY_OF"/>
+        <property name="predicates">
+            <list value-type="java.lang.String">
+                <value><![CDATA[valid.toString() == 'true']]></value>
+                <value><![CDATA[ 
+				 // if (invalidFirstTwoBytesMessage.size() == 0) { return false }
+				 // if (invalidMagicNumberMessage.size() == 0) { return false }
+				 // if (prematureEOFMessage.size() == 0) { return false }
+				 // if (invalidFieldMessage.size() == 0) { return false }
+				    foreach (ifd: getIFDs()) { 
+				        if (ifd.zeroIFDEntriesMessage != null)  { return false }
+				        if (ifd instanceof org.jhove2.module.format.tiff.TiffIFD) {
+				            if (ifd.missingRequiredTagMessages.size() > 0) { return false }
+				            if (ifd.stripByteCountsNotDefinedMessage != null ) { return false }
+				            if (ifd.stripOffsetsNotDefinedMessage != null ) { return false }
+				            if (ifd.StripsLengthInconsistentMessage != null ) { return false }
+				            if (ifd.invalidStripOffsetMessage != null ) { return false }
+				            if (ifd.tileWidthNotDefinedMessage != null ) { return false }
+				            if (ifd.tileLengthNotDefinedMessage != null ) { return false }
+				            if (ifd.tileByteCountsNotDefinedMessage != null ) { return false }
+				            if (ifd.tileOffsetsNotDefinedMessage != null ) { return false }
+				            if (ifd.tilesAndStripsDefinedMessage != null ) { return false }
+				            if (ifd.tileOffsetValuesInsufficientMessage != null ) { return false }
+				            if (ifd.tileByteCountsValuesInsufficientMessage != null ) { return false }
+				            if (ifd.transparencyMaskValueInconsistentMessage != null ) { return false }
+				            if (ifd.BPSInvalidForTransparencyMaskMessage != null ) { return false }
+				            if (ifd.photometricInterpretationSppLT1InvalidMessage != null ) { return false }
+				            if (ifd.photometricInterpretationSppLT3InvalidMessage != null ) { return false }
+				            if (ifd.colorMapNotDefinedForPalletteColorMessage != null ) { return false }
+				            if (ifd.sppMustEqualOneForPalleteColorMessage != null ) { return false }
+				            if (ifd.insufficientColorMapValuesForPalleteColorMessage != null ) { return false }
+				            if (ifd.sppExtraSamplesValueInvalidMessage != null ) { return false }
+				            if (ifd.bpsValueInvalidforCIELabMessage != null ) { return false }
+				            if (ifd.insufficientColorMapValuesForPalleteColorMessage != null ) { return false }
+				            if (ifd.cellLengthShouldNotBePresentMessage != null ) { return false }
+				            if (ifd.dotRangeOutofRangeMessage != null ) { return false }
+				            if (ifd.xClipPathUnitsNotDefinedMessage != null ) { return false }
+				        }
+				        foreach (ifdEntry : ifd.getIFDEntries()) { 
+				            if (ifdEntry.InvalidCountValueMessage != null ) { return false }
+				            if (ifdEntry.TypeMismatchMessage != null ) { return false }
+				            if (ifdEntry.UnknownTagMessage != null ) { return false }
+				            if (ifdEntry.TagSortOrderErrorMessage != null ) { return false }
+				            if (ifdEntry.ValueOffsetReferenceLocationFileMessage != null ) { return false }
+				            if (ifdEntry.getTileLengthNotMultipleOf16Message() != null ) { return false }
+				            if (ifdEntry.getTileWidthNotMultipleOf16Message() != null ) { return false }
+				        }
+				    }
+				    return true;
+              ]]></value>
+           </list></property>
+        <property name="enabled" value="true"/>
+    </bean>
+</beans>

config/spring/module/format/jhove2-otherFormats-config.xml

     <constructor-arg type="org.jhove2.core.I8R$Namespace"
                      value="PUID"/>
   </bean>
-
+  
+  <bean id="JPEG2000" class="org.jhove2.core.format.Format"
+        scope="singleton">
+		<constructor-arg type="java.lang.String" value="JPEG 2000"/>
+		<constructor-arg ref="JPEG2000Identifier"/>
+    <constructor-arg type="org.jhove2.core.format.Format$Type"
+                     value="Format"/>
+    <constructor-arg type="org.jhove2.core.format.Format$Ambiguity"
+                     value="Unambiguous"/>
+		<property name="aliasIdentifiers">
+			<set value-type="org.jhove2.core.I8R">
+				<ref bean="JPEG2000Identifier"/>
+				<ref bean="JPEG2000PUID1"/>
+			</set>
+		</property>
+	</bean>
+	<!-- JPEG2000 JHOVE2 identifier bean -->
+	<bean id="JPEG2000Identifier" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="http://jhove2.org/terms/format/jpeg-2000"/>
+	</bean>
+	<!-- JPEG2000 PUID identifier bean -->
+	<bean id="JPEG2000PUID1" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="x-fmt/392"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+  </bean>
+  
   <bean id="JustWriteTextDocumentFormat" class="org.jhove2.core.format.Format"
         scope="singleton">
 		<constructor-arg type="java.lang.String" value="JustWrite Text Document"/>
     <constructor-arg type="org.jhove2.core.I8R$Namespace"
                      value="PUID"/>
   </bean>
-
+    
+  <bean id="PortableDocumentFormat" class="org.jhove2.core.format.Format"
+        scope="singleton">
+		<constructor-arg type="java.lang.String" value="PostScript"/>
+		<constructor-arg ref="PortableDocumentFormatIdentifier"/>
+    <constructor-arg type="org.jhove2.core.format.Format$Type"
+                     value="Format"/>
+    <constructor-arg type="org.jhove2.core.format.Format$Ambiguity"
+                     value="Unambiguous"/>
+		<property name="aliasIdentifiers">
+			<set value-type="org.jhove2.core.I8R">
+				<ref bean="PortableDocumentFormatIdentifier"/>
+				<ref bean="PortableDocumentFormatPUID1"/>
+				<ref bean="PortableDocumentFormatPUID2"/>
+				<ref bean="PortableDocumentFormatPUID3"/>
+				<ref bean="PortableDocumentFormatPUID4"/>
+				<ref bean="PortableDocumentFormatPUID5"/>
+				<ref bean="PortableDocumentFormatPUID6"/>
+				<ref bean="PortableDocumentFormatPUID7"/>
+				<ref bean="PortableDocumentFormatPUID8"/>
+			</set>
+		</property>
+	</bean>
+	<!-- Portable Document Format JHOVE2 identifier bean -->
+	<bean id="PortableDocumentFormatIdentifier" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="http://jhove2.org/terms/format/pdf"/>
+	</bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID1" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/14"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+	</bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID2" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/15"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+	</bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID3" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/16"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+	</bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID4" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/17"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+    </bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID5" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/18"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+    </bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID6" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/19"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+    </bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID7" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/20"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+    </bean>
+	<!-- Portable Document Format PUID identifier bean -->
+	<bean id="PortableDocumentFormatPUID8" class="org.jhove2.core.I8R" scope="singleton">
+    <constructor-arg type="java.lang.String"
+                     value="fmt/95"/>
+    <constructor-arg type="org.jhove2.core.I8R$Namespace"
+                     value="PUID"/>
+  </bean>
+  
   <bean id="PortableNetworkGraphicsFormat" class="org.jhove2.core.format.Format"
         scope="singleton">
 		<constructor-arg type="java.lang.String" value="Portable Network Graphics"/>

config/spring/module/format/wave/jhove2-wave-config.xml

 
 	<!-- Broadcast Wave format link chunk bean -->
 	<bean id="LinkChunk" class="org.jhove2.module.format.wave.bwf.LinkChunk" scope="prototype">
+	    <constructor-arg ref="XmlFormat"/>
 	    <property name="identifier" value="link"/>
 	</bean>
 

config/spring/persist/jhove2-persist-config.xml

 	     scope="singleton"/>
 	     
 	<!--  Beans for in-memory persistence -->
-	
-<!--	<bean id="SourceFactory"             class="org.jhove2.persist.inmemory.InMemorySourceFactory" scope="prototype"/>-->
-<!--	<bean id="ApplicationModuleAccessor" class="org.jhove2.persist.inmemory.InMemoryApplicationModuleAccessor"/>-->
-<!--	<bean id="FrameworkAccessor"         class="org.jhove2.persist.inmemory.InMemoryFrameworkAccessor" scope="prototype"/>-->
-<!--	<bean id="FormatModuleAccessor"      class="org.jhove2.persist.inmemory.InMemoryFormatModuleAccessor" scope="prototype"/>-->
-<!--	<bean id="FormatProfileAccessor"     class="org.jhove2.persist.inmemory.InMemoryFormatProfileAccessor" scope="prototype"/>-->
-<!--	<bean id="AggrefierAccessor"         class="org.jhove2.persist.inmemory.InMemoryAggrefierAccessor" scope="prototype"/>-->
-<!--	<bean id="IdentifierAccessor"        class="org.jhove2.persist.inmemory.InMemoryIdentifierAccessor" scope="prototype"/>-->
-<!--	<bean id="BaseModuleAccessor"        class="org.jhove2.persist.inmemory.InMemoryBaseModuleAccessor" scope="prototype"/>-->
-	
-	
-	
-	
-			
+    <!--
+	<bean id="SourceFactory"             class="org.jhove2.persist.inmemory.InMemorySourceFactory" scope="prototype"/>
+	<bean id="ApplicationModuleAccessor" class="org.jhove2.persist.inmemory.InMemoryApplicationModuleAccessor"/>
+	<bean id="FrameworkAccessor"         class="org.jhove2.persist.inmemory.InMemoryFrameworkAccessor" scope="prototype"/>
+	<bean id="FormatModuleAccessor"      class="org.jhove2.persist.inmemory.InMemoryFormatModuleAccessor" scope="prototype"/>
+	<bean id="FormatProfileAccessor"     class="org.jhove2.persist.inmemory.InMemoryFormatProfileAccessor" scope="prototype"/>
+	<bean id="AggrefierAccessor"         class="org.jhove2.persist.inmemory.InMemoryAggrefierAccessor" scope="prototype"/>
+	<bean id="IdentifierAccessor"        class="org.jhove2.persist.inmemory.InMemoryIdentifierAccessor" scope="prototype"/>
+	<bean id="BaseModuleAccessor"        class="org.jhove2.persist.inmemory.InMemoryBaseModuleAccessor" scope="prototype"/>
+    -->
+    
 	<!--  Beans for BerkeleyDB persistence -->
 	
-	<bean id="SourceFactory"             class="org.jhove2.persist.berkeleydpl.BerkeleyDbSourceFactory" scope="prototype"/>
+    <bean id="SourceFactory"             class="org.jhove2.persist.berkeleydpl.BerkeleyDbSourceFactory" scope="prototype"/>
 	<bean id="ApplicationModuleAccessor" class="org.jhove2.persist.berkeleydpl.BerkeleyDbApplicationModuleAccessor"/>
 	<bean id="FrameworkAccessor"         class="org.jhove2.persist.berkeleydpl.BerkeleyDbFrameworkAccessor" scope="prototype"/>
 	<bean id="FormatModuleAccessor"      class="org.jhove2.persist.berkeleydpl.BerkeleyDbFormatModuleAccessor" scope="prototype"/>

src/main/assembly/jhove2_release.xml

 		<format>zip</format>
 	</formats>
 	<fileSets>
+		<!--  move scripts and transforms dir into assembly -->
 		<fileSet>
 			<directory>${project.basedir}/src/main/scripts</directory>
 			<includes>
 			<outputDirectory>/</outputDirectory>
 			<fileMode>0755</fileMode>
 		</fileSet>
+		<!--  move licenses into assembly -->
 		<fileSet>
 			<directory>${project.basedir}/src/main/resources</directory>
 			<includes>
 				<include>*.txt</include>
 			</includes>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>/licenses/</outputDirectory>
 		</fileSet>
+		<!--  move src dir, config dir and pom.xml into assembly -->
 		<fileSet>
 			<!--  move src dir and all top level files into assembly -->
 			<directory>${project.basedir}</directory>
+			<includes>
+				<include>${project.basedir}/src/**</include>
+				<include>${project.basedir}/config/**</include>
+				<include>pom.xml</include>
+			</includes>
 			<!-- exclude SVN files -->
 			<useDefaultExcludes>true</useDefaultExcludes>
-			<excludes>
-				<exclude>${project.build.directory}/**</exclude>
-				<exclude>${project.basedir}/src/main/assembly/</exclude>
-				<exclude>${project.basedir}/src/main/scripts/</exclude>
-				<exclude>.classpath</exclude>
-				<exclude>.project</exclude>
-				<exclude>.settings/**</exclude>
-				<exclude>.hgtags</exclude>
-			</excludes>
 		</fileSet>
 		<!-- add the javadoc -->
 		<fileSet>

src/main/java/org/geotools/data/shapefile/ShapefileFeatureExtractor.java

  * POSSIBILITY OF SUCH DAMAGE.
  * </p>
  */
+
 package org.geotools.data.shapefile;
 
 import com.vividsolutions.jts.geom.GeometryFactory;
-import org.geotools.data.FileDataStore;
-import org.geotools.data.FileDataStoreFinder;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+
 import org.geotools.data.shapefile.dbf.DbaseFileHeader;
 import org.geotools.data.shapefile.dbf.DbaseFileReader;
-import org.geotools.data.shapefile.indexed.IndexType;
-import org.geotools.data.shapefile.indexed.IndexedShapefileDataStore;
 import org.geotools.data.shapefile.prj.PrjFileReader;
 import org.geotools.data.shapefile.shp.ShapefileHeader;
 import org.geotools.data.shapefile.shp.ShapefileReader;
+
 import org.jhove2.module.format.shapefile.DbfHeader;
 import org.jhove2.module.format.shapefile.ShapefileRecord;
 import org.jhove2.module.format.shapefile.ShapefileFeatures;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.List;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
 /**
  * Provides an interface to the geotools shapefile readers that are used to
  * extract properties of the shapefile.<br />
         URL url = shpFile.toURI().toURL();
         URI namespace = null;
         boolean useMemoryMappedBuffer = false;
-        shapefileDS = new ShapefileDataStore(url, namespace,
-           useMemoryMappedBuffer);
-        
+        this.shapefileDS = new ShapefileDataStore(url, namespace,
+                                                  useMemoryMappedBuffer);
     }
 
     /**
      *             Signals that an I/O exception has occurred.
      */
     public void extractFeatures(ShapefileFeatures reportables)
-            throws IOException {
+        throws IOException
+    {
         try {
             shpReader = shapefileDS.openShapeReader(new GeometryFactory());
             reportables.dbfCharsetName = shapefileDS.getStringCharset().name();
      *             Signals that an I/O exception has occurred.
      */
     private void extractRecords(ShapefileFeatures features)
-            throws IOException {
+        throws IOException
+    {
         List<ShapefileRecord> srecs = features.shapefileRecords;
         while (shpReader.hasNext()) {
             ShapefileReader.Record record = shpReader.nextRecord();
      *             Signals that an I/O exception has occurred.
      */
     private void extractDbfHeader(ShapefileFeatures features)
-            throws IOException {
+        throws IOException
+    {
         DbaseFileReader dbfReader = null;
         try {
             dbfReader = shapefileDS.openDbfReader();
             }
         }
     }
-
 }