You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/02/06 15:04:51 UTC

svn commit: r1853083 - in /jackrabbit/oak/trunk/oak-http/src: main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java

Author: angela
Date: Wed Feb  6 15:04:51 2019
New Revision: 1853083

URL: http://svn.apache.org/viewvc?rev=1853083&view=rev
Log:
OAK-8024 : OAK-8024 (patch provided by Ruben Reusser)

Removed:
    jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
Modified:
    jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
    jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java

Modified: jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java?rev=1853083&r1=1853082&r2=1853083&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java (original)
+++ jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java Wed Feb  6 15:04:51 2019
@@ -30,6 +30,7 @@ import javax.xml.transform.stream.Stream
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.mime.MediaType;
 import org.apache.tika.sax.XHTMLContentHandler;
 import org.xml.sax.SAXException;
@@ -125,7 +126,7 @@ class HtmlRepresentation implements Repr
             handler.setResult(new StreamResult(response.getOutputStream()));
 
             Metadata metadata = new Metadata();
-            metadata.set(Metadata.TITLE, title);
+            metadata.set(TikaCoreProperties.TITLE, title);
             return new XHTMLContentHandler(handler, metadata);
         } catch (TransformerConfigurationException e) {
             throw new IOException(e);

Modified: jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java?rev=1853083&r1=1853082&r2=1853083&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java (original)
+++ jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java Wed Feb  6 15:04:51 2019
@@ -73,7 +73,7 @@ class JsonRepresentation implements Repr
     protected JsonGenerator startResponse(HttpServletResponse response)
             throws IOException {
         response.setContentType(type.toString());
-        return factory.createJsonGenerator(response.getOutputStream());
+        return factory.createGenerator(response.getOutputStream());
     }
 
     private static void render(Tree tree, JsonGenerator generator)