You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2012/06/30 15:23:00 UTC
svn commit: r1355733 - in
/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata: XMP.java
XMPIdq.java XMPMM.java XMPRights.java
Author: jukka
Date: Sat Jun 30 13:22:59 2012
New Revision: 1355733
URL: http://svn.apache.org/viewvc?rev=1355733&view=rev
Log:
TIKA-908: Adding XMP specification part one namespaces and properties
Merge the prefix and the colon delimiter to a PREFIX_ constant in order to reduce unnecessary verbosity
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMP.java
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPIdq.java
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPMM.java
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMP.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMP.java?rev=1355733&r1=1355732&r2=1355733&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMP.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMP.java Sat Jun 30 13:22:59 2012
@@ -22,7 +22,8 @@ public interface XMP {
String PREFIX = "xmp";
- String PREFIX_DELIMITER = ":";
+ /** The xmp prefix followed by the colon delimiter */
+ String PREFIX_ = PREFIX + ":";
/**
* The date and time the resource was created. For a digital file, this need not
@@ -30,14 +31,12 @@ public interface XMP {
* be close to that time, modulo the time taken to write the file. Later file
* transfer, copying, and so on, can make the file-system time arbitrarily different.
*/
- Property CREATE_DATE = Property.externalDate(
- PREFIX + PREFIX_DELIMITER + "CreateDate");
+ Property CREATE_DATE = Property.externalDate(PREFIX_ + "CreateDate");
/**
* The name of the first known tool used to create the resource.
*/
- Property CREATOR_TOOL = Property.externalText(
- PREFIX + PREFIX_DELIMITER + "CreatorTool");
+ Property CREATOR_TOOL = Property.externalText(PREFIX_ + "CreatorTool");
/**
* An unordered array of text strings that unambiguously identify the resource
@@ -45,34 +44,29 @@ public interface XMP {
* (see 8.7, âxmpidq namespaceâ) to denote the formal identification system to
* which that identifier conforms.
*/
- Property IDENTIFIER = Property.externalTextBag(
- PREFIX + PREFIX_DELIMITER + "Identifier");
+ Property IDENTIFIER = Property.externalTextBag(PREFIX_ + "Identifier");
/**
* A word or short phrase that identifies a resource as a member of a userdefined collection.
*/
- Property LABEL = Property.externalDate(
- PREFIX + PREFIX_DELIMITER + "Label");
+ Property LABEL = Property.externalDate(PREFIX_ + "Label");
/**
* The date and time that any metadata for this resource was last changed. It
* should be the same as or more recent than xmp:ModifyDate
*/
- Property METADATA_DATE = Property.externalDate(
- PREFIX + PREFIX_DELIMITER + "MetadataDate");
+ Property METADATA_DATE = Property.externalDate(PREFIX_ + "MetadataDate");
/**
* The date and time the resource was last modified.
*/
- Property MODIFY_DATE = Property.externalDate(
- PREFIX + PREFIX_DELIMITER + "ModifyDate");
+ Property MODIFY_DATE = Property.externalDate(PREFIX_ + "ModifyDate");
/**
* A user-assigned rating for this file. The value shall be -1 or in the range
* [0..5], where -1 indicates ârejectedâ and 0 indicates âunratedâ. If xmp:Rating
* is not present, a value of 0 should be assumed.
*/
- Property RATING = Property.externalReal(
- PREFIX + PREFIX_DELIMITER + "Rating");
+ Property RATING = Property.externalReal(PREFIX_ + "Rating");
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPIdq.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPIdq.java?rev=1355733&r1=1355732&r2=1355733&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPIdq.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPIdq.java Sat Jun 30 13:22:59 2012
@@ -22,13 +22,13 @@ public interface XMPIdq {
String PREFIX = "xmpidq";
- String PREFIX_DELIMITER = ":";
+ /** The xmpidq prefix followed by the colon delimiter */
+ String PREFIX_ = PREFIX + ":";
/**
* A qualifier providing the name of the formal identification
* scheme used for an item in the xmp:Identifier array.
*/
- Property SCHEME = Property.externalText(
- PREFIX + PREFIX_DELIMITER + "Scheme");
+ Property SCHEME = Property.externalText(PREFIX_ + "Scheme");
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPMM.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPMM.java?rev=1355733&r1=1355732&r2=1355733&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPMM.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPMM.java Sat Jun 30 13:22:59 2012
@@ -22,7 +22,8 @@ public interface XMPMM {
String PREFIX = "xmpMM";
- String PREFIX_DELIMITER = ":";
+ /** The xmpMM prefix followed by the colon delimiter */
+ String PREFIX_ = PREFIX + ":";
/**
* A reference to the resource from which this one is derived.
@@ -31,21 +32,18 @@ public interface XMPMM {
*
* TODO This property is of type RessourceRef which is a struct
*/
-// Property DERIVED_FROM = Property.externalText(
-// PREFIX + PREFIX_DELIMITER + "DerivedFrom");
+// Property DERIVED_FROM = Property.externalText(PREFIX_ + "DerivedFrom");
/**
* The common identifier for all versions and renditions of a resource.
*/
- Property DOCUMENTID = Property.externalText(
- PREFIX + PREFIX_DELIMITER + "DocumentID");
+ Property DOCUMENTID = Property.externalText(PREFIX_ + "DocumentID");
/**
* An identifier for a specific incarnation of a resource, updated
* each time a file is saved.
*/
- Property INSTANCEID = Property.externalText(
- PREFIX + PREFIX_DELIMITER + "InstanceID");
+ Property INSTANCEID = Property.externalText(PREFIX_ + "InstanceID");
/**
* The common identifier for the original resource from which
@@ -56,7 +54,7 @@ public interface XMPMM {
* that format, but should retain the ID of the source file here.
*/
Property ORIGINAL_DOCUMENTID = Property.externalText(
- PREFIX + PREFIX_DELIMITER + "OriginalDocumentID");
+ PREFIX_ + "OriginalDocumentID");
/**
* The rendition class name for this resource. This property
@@ -64,13 +62,14 @@ public interface XMPMM {
* a derived rendition
*/
Property RENDITION_CLASS = Property.externalOpenChoise(
- PREFIX + PREFIX_DELIMITER + "RenditionClass", "default", "draft", "low-res", "proof", "screen", "thumbnail");
+ PREFIX_ + "RenditionClass",
+ "default", "draft", "low-res", "proof", "screen", "thumbnail");
/**
* Can be used to provide additional rendition parameters that
* are too complex or verbose to encode in xmpMM:RenditionClass
*/
Property RENDITION_PARAMS = Property.externalText(
- PREFIX + PREFIX_DELIMITER + "RenditionParams");
+ PREFIX_ + "RenditionParams");
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java?rev=1355733&r1=1355732&r2=1355733&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java Sat Jun 30 13:22:59 2012
@@ -35,37 +35,35 @@ public interface XMPRights {
String NAMESPACE_URI_XMP_RIGHTS = "http://ns.adobe.com/xap/1.0/rights/";
String PREFIX_XMP_RIGHTS = "xmpRights";
+ /** The xmpRights prefix followed by the colon delimiter */
+ String PREFIX_ = PREFIX_XMP_RIGHTS + ":";
+
/**
* A Web URL for a rights management certificate.
*/
- Property CERTIFICATE = Property.internalText(
- PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "Certificate");
+ Property CERTIFICATE = Property.internalText(PREFIX_ + "Certificate");
/**
* When true, indicates that this is a rights-managed resource. When
* false, indicates that this is a public-domain resource. Omit if the
* state is unknown.
*/
- Property MARKED = Property.internalBoolean(
- PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "Marked");
+ Property MARKED = Property.internalBoolean(PREFIX_ + "Marked");
/**
* A list of legal owners of the resource.
*/
- Property OWNER = Property.internalTextBag(
- PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "Owner");
+ Property OWNER = Property.internalTextBag(PREFIX_ + "Owner");
/**
* A word or short phrase that identifies a resource as a member of a userdefined collection.
* TODO This is actually a language alternative property
*/
- Property USAGE_TERMS = Property.internalText(
- PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "UsageTerms");
+ Property USAGE_TERMS = Property.internalText(PREFIX_ + "UsageTerms");
/**
* A Web URL for a statement of the ownership and usage rights for this resource.
*/
- Property WEB_STATEMENT = Property.internalText(
- PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "WebStatement");
+ Property WEB_STATEMENT = Property.internalText(PREFIX_ + "WebStatement");
}