Author: reschke
Date: Fri Apr 26 04:16:12 2019
New Revision: 1858172
URL: http://svn.apache.org/viewvc?rev=1858172&view=rev
Log:
OAK-8024: oak-http generates invalid html (patch provided by Ruben Reusser)
(ported to 1.10)
Removed:
jackrabbit/oak/branches/1.10/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 26 04:16:12 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858123
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858123
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java?rev=1858172&r1=1858171&r2=1858172&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
Fri Apr 26 04:16:12 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/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java?rev=1858172&r1=1858171&r2=1858172&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
Fri Apr 26 04:16:12 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)
