Index: src/main/java/org/apache/tika/metadata/Metadata.java =================================================================== --- src/main/java/org/apache/tika/metadata/Metadata.java (revision 1339236) +++ src/main/java/org/apache/tika/metadata/Metadata.java (working copy) @@ -34,7 +34,7 @@ /** * A multi-valued metadata container. */ -public class Metadata implements CreativeCommons, DublinCore, Geographic, HttpHeaders, +public class Metadata implements CreativeCommons, Geographic, HttpHeaders, IPTC, Message, MSOffice, ClimateForcast, TIFF, TikaMetadataKeys, TikaMimeKeys, Serializable { @@ -47,6 +47,29 @@ private Map metadata = null; /** + * The common delimiter used between the namespace abbreviation and the property name + */ + public static final String NAMESPACE_PREFIX_DELIMITER = ":"; + + // These properties are being moved to a new Tika core properties definition, javadocs will be added once it's available + @Deprecated public static final String FORMAT = "format"; + @Deprecated public static final String IDENTIFIER = "identifier"; + @Deprecated public static final String MODIFIED = "modified"; + @Deprecated public static final String CONTRIBUTOR = "contributor"; + @Deprecated public static final String COVERAGE = "coverage"; + @Deprecated public static final String CREATOR = "creator"; + @Deprecated public static final Property DATE = Property.internalDate("date"); + @Deprecated public static final String DESCRIPTION = "description"; + @Deprecated public static final String LANGUAGE = "language"; + @Deprecated public static final String PUBLISHER = "publisher"; + @Deprecated public static final String RELATION = "relation"; + @Deprecated public static final String RIGHTS = "rights"; + @Deprecated public static final String SOURCE = "source"; + @Deprecated public static final String SUBJECT = "subject"; + @Deprecated public static final String TITLE = "title"; + @Deprecated public static final String TYPE = "type"; + + /** * The UTC time zone. Not sure if {@link TimeZone#getTimeZone(String)} * understands "UTC" in all environments, but it'll fall back to GMT * in such cases, which is in practice equivalent to UTC. Index: src/main/java/org/apache/tika/metadata/DublinCore.java =================================================================== --- src/main/java/org/apache/tika/metadata/DublinCore.java (revision 1339236) +++ src/main/java/org/apache/tika/metadata/DublinCore.java (working copy) @@ -18,13 +18,14 @@ /** * A collection of Dublin Core metadata names. - * - * TODO Prefix these keys with the dc: prefix - * + * * @see dublincore.org */ public interface DublinCore { + public static final String NAMESPACE_URI_DC = "http://purl.org/dc/elements/1.1/"; + public static final String PREFIX_DC = "dc"; + /** * Typically, Format may include the media-type or dimensions of the * resource. Format may be used to determine the software, hardware or @@ -33,7 +34,8 @@ * to select a value from a controlled vocabulary (for example, the list * of Internet Media Types [MIME] defining computer media formats). */ - String FORMAT = "format"; + Property FORMAT = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "format"); /** * Recommended best practice is to identify the resource by means of @@ -43,13 +45,14 @@ * the Digital Object Identifier (DOI) and the International Standard * Book Number (ISBN). */ - String IDENTIFIER = "identifier"; + Property IDENTIFIER = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "identifier"); /** * Date on which the resource was changed. - * TODO Make me a Date Property */ - String MODIFIED = "modified"; + Property MODIFIED = Property.internalDate( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "modified"); /** * An entity responsible for making contributions to the content of the @@ -57,7 +60,8 @@ * or a service. Typically, the name of a Contributor should be used to * indicate the entity. */ - String CONTRIBUTOR = "contributor"; + Property CONTRIBUTOR = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "contributor"); /** * The extent or scope of the content of the resource. Coverage will @@ -69,14 +73,16 @@ * appropriate, named places or time periods be used in preference to * numeric identifiers such as sets of coordinates or date ranges. */ - String COVERAGE = "coverage"; + Property COVERAGE = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "coverage"); /** * An entity primarily responsible for making the content of the resource. * Examples of a Creator include a person, an organisation, or a service. * Typically, the name of a Creator should be used to indicate the entity. */ - String CREATOR = "creator"; + Property CREATOR = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "creator"); /** * A date associated with an event in the life cycle of the resource. @@ -85,7 +91,8 @@ * defined in a profile of ISO 8601 [W3CDTF] and follows the YYYY-MM-DD * format. */ - Property DATE = Property.internalDate("date"); + Property DATE = Property.internalDate( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "date"); /** * An account of the content of the resource. Description may include @@ -93,7 +100,8 @@ * a graphical representation of content or a free-text account of * the content. */ - String DESCRIPTION = "description"; + Property DESCRIPTION = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "description"); /** * A language of the intellectual content of the resource. Recommended @@ -102,21 +110,24 @@ * tags with optional subtags. Examples include "en" or "eng" for English, * "akk" for Akkadian, and "en-GB" for English used in the United Kingdom. */ - String LANGUAGE = "language"; + Property LANGUAGE = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "language"); /** * An entity responsible for making the resource available. Examples of * a Publisher include a person, an organisation, or a service. Typically, * the name of a Publisher should be used to indicate the entity. */ - String PUBLISHER = "publisher"; + Property PUBLISHER = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "publisher"); /** * A reference to a related resource. Recommended best practice is to * reference the resource by means of a string or number conforming to * a formal identification system. */ - String RELATION = "relation"; + Property RELATION = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "relation"); /** * Information about rights held in and over the resource. Typically, @@ -127,7 +138,8 @@ * is absent, no assumptions can be made about the status of these and * other rights with respect to the resource. */ - String RIGHTS = "rights"; + Property RIGHTS = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "rights"); /** * A reference to a resource from which the present resource is derived. @@ -136,7 +148,8 @@ * means of a string or number conforming to a formal identification * system. */ - String SOURCE = "source"; + Property SOURCE = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "source"); /** * The topic of the content of the resource. Typically, a Subject will @@ -145,13 +158,15 @@ * select a value from a controlled vocabulary or formal classification * scheme. */ - String SUBJECT = "subject"; + Property SUBJECT = Property.internalTextBag( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "subject"); /** * A name given to the resource. Typically, a Title will be a name by * which the resource is formally known. */ - String TITLE = "title"; + Property TITLE = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "title"); /** * The nature or genre of the content of the resource. Type includes terms @@ -161,6 +176,7 @@ * [DCMITYPE]). To describe the physical or digital manifestation of * the resource, use the Format element. */ - String TYPE = "type"; + Property TYPE = Property.internalText( + PREFIX_DC + Metadata.NAMESPACE_PREFIX_DELIMITER + "type"); }