svn commit: r1339860 - in /tika/trunk/tika-core/src/main/java/org/apache/tika/metadata: MSOffice.java Office.java TikaCoreProperties.java

[nick]

Author: nick
Date: Thu May 17 20:56:05 2012
New Revision: 1339860

URL: http://svn.apache.org/viewvc?rev=1339860&view=rev
Log:
TIKA-929 Bring across MSOffice.AUTHOR in the same way as initial and last 
authors

Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/MSOffice.java
    tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Office.java
    
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java

Modified: 
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/MSOffice.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/MSOffice.java?rev=1339860&r1=1339859&r2=1339860&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/MSOffice.java 
(original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/MSOffice.java 
Thu May 17 20:56:05 2012
@@ -30,14 +30,14 @@ public interface MSOffice {
 
     @Deprecated String LAST_AUTHOR = "Last-Author";
 
+    @Deprecated String AUTHOR = "Author";
+
     String APPLICATION_NAME = "Application-Name";
 
     String REVISION_NUMBER = "Revision-Number";
 
     String TEMPLATE = "Template";
 
-    String AUTHOR = "Author";
-
     String TOTAL_TIME = "Total-Time";
 
     String PRESENTATION_FORMAT = "Presentation-Format";

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=1339860&r1=1339859&r2=1339860&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:56:05 2012
@@ -60,6 +60,12 @@ public interface Office {
    Property LAST_AUTHOR = Property.internalText(
          PREFIX_DOC_META + Metadata.NAMESPACE_PREFIX_DELIMITER + 
"last-author");
 
+   /**
+    * Name of the principal author of a document
+    */
+   Property AUTHOR = Property.internalText(
+         PREFIX_DOC_META + Metadata.NAMESPACE_PREFIX_DELIMITER + "author");
+
    
    /** When was the document created? */
    Property CREATION_DATE = Property.internalDate(

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=1339860&r1=1339859&r2=1339860&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:56:05 2012
@@ -72,6 +72,11 @@ public interface TikaCoreProperties {
     public static final Property INITIAL_AUTHOR = Office.INITIAL_AUTHOR;
 
     /**
+     * @see Office#AUTHOR
+     */
+    public static final Property AUTHOR = Office.AUTHOR;
+
+    /**
      * @see Office#LAST_AUTHOR
      */
     public static final Property LAST_AUTHOR = 
Property.composite(Office.LAST_AUTHOR,