You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2012/05/17 22:31:59 UTC

svn commit: r1339850 [3/3] - in /tika/trunk/tika-core/src/main/java/org/apache/tika/metadata: IPTC.java Office.java Photoshop.java TikaCoreProperties.java XMPRights.java

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Office.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Office.java?rev=1339850&r1=1339849&r2=1339850&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Office.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Office.java Thu May 17 20:31:58 2012
@@ -25,6 +25,8 @@ package org.apache.tika.metadata;
  * 
  * Note that some of the legacy properties from the {@link MSOffice}
  *  collection still need to be migrated over
+ *  
+ * @since Apache Tika 1.2
  */
 public interface Office {
    // These are taken from the OpenDocumentFormat specification

Added: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Photoshop.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Photoshop.java?rev=1339850&view=auto
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Photoshop.java (added)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Photoshop.java Thu May 17 20:31:58 2012
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IPTC Metadata Descriptions taken from the IPTC Photo Metadata (July 2010) 
+ * standard. These parts Copyright 2010 International Press Telecommunications 
+ * Council.
+ */
+package org.apache.tika.metadata;
+
+/**
+ * XMP Photoshop metadata schema. 
+ * 
+ * A collection of property constants for the 
+ * Photo Metadata properties defined in the XMP Photoshop
+ * standard.
+ * 
+ * @since Apache Tika 1.2
+ * @see <a href="http://partners.adobe.com/public/developer/en/xmp/sdk/XMPspecification.pdf">XMP Photoshop</a>
+ */
+public interface Photoshop {
+
+    String NAMESPACE_URI_PHOTOSHOP = "http://ns.adobe.com/photoshop/1.0/";
+    String PREFIX_PHOTOSHOP = "photoshop";
+
+    Property AUTHORS_POSITION = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "AuthorsPosition");
+
+    Property CAPTION_WRITER = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "CaptionWriter");
+
+    Property CATEGORY = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Category");
+
+    Property CITY = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "City");
+
+    Property COUNTRY = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Country");
+
+    Property CREDIT = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Credit");
+
+    Property DATE_CREATED = Property.internalDate(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "DateCreated");
+
+    Property HEADLINE = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Headline");
+
+    Property INSTRUCTIONS = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Instructions");
+
+    Property SOURCE = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Source");
+
+    Property STATE = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "State");
+
+    Property SUPPLEMENTAL_CATEGORIES = Property.internalTextBag(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "SupplementalCategories");
+
+    Property TRANSMISSION_REFERENCE = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "TransmissionReference");
+
+    Property URGENCY = Property.internalText(
+            PREFIX_PHOTOSHOP + Metadata.NAMESPACE_PREFIX_DELIMITER + "Urgency");
+
+}
\ No newline at end of file

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java?rev=1339850&r1=1339849&r2=1339850&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java Thu May 17 20:31:58 2012
@@ -31,6 +31,8 @@ package org.apache.tika.metadata;
  * For now, most of these properties are composite ones including the deprecated
  *  non-prefixed String properties from the Metadata class. In Tika 2.0, most
  *  of these will revert back to simple assignments.
+ * 
+ * @since Apache Tika 1.2
  */
 @SuppressWarnings("deprecation")
 public interface TikaCoreProperties {

Added: 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=1339850&view=auto
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java (added)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPRights.java Thu May 17 20:31:58 2012
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IPTC Metadata Descriptions taken from the IPTC Photo Metadata (July 2010) 
+ * standard. These parts Copyright 2010 International Press Telecommunications 
+ * Council.
+ */
+package org.apache.tika.metadata;
+
+/**
+ * XMP Rights management schema. 
+ * 
+ * A collection of property constants for the 
+ * rights management properties defined in the XMP 
+ * standard.
+ * 
+ * @since Apache Tika 1.2
+ * @see <a href="http://partners.adobe.com/public/developer/en/xmp/sdk/XMPspecification.pdf">XMP Photoshop</a>
+ */
+public interface XMPRights {
+
+    String NAMESPACE_URI_XMP_RIGHTS = "http://ns.adobe.com/xap/1.0/rights/";
+    String PREFIX_XMP_RIGHTS = "xmpRights";
+    
+    Property CERTIFICATE = Property.internalText(
+            PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "Certificate");
+    
+    Property MARKED = Property.internalBoolean(
+            PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "Marked");
+    
+    Property OWNER = Property.internalTextBag(
+            PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "Owner");
+    
+    Property USAGE_TERMS = Property.internalText(
+            PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "UsageTerms");
+    
+    Property WEB_STATEMENT = Property.internalText(
+            PREFIX_XMP_RIGHTS + Metadata.NAMESPACE_PREFIX_DELIMITER + "WebStatement");
+
+}
\ No newline at end of file