Author: reto
Date: Mon Sep 6 14:26:12 2010
New Revision: 993040
URL: http://svn.apache.org/viewvc?rev=993040&view=rev
Log:
CLEREZZA-296: Added encoding argument in genericGraphNodeMBW and supporting
arguments in XHTML 2 HTML conversion
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/src/main/java/org/apache/clerezza/platform/xhtml2html/WrappedResponse.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java?rev=993040&r1=993039&r2=993040&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
Mon Sep 6 14:26:12 2010
@@ -143,10 +143,13 @@ public class GenericGraphNodeMBW impleme
throw new WebApplicationException(
Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("No suitable
renderer found").build());
}
- httpHeaders.add(HttpHeaders.CONTENT_TYPE,
renderer.getMediaType());
- if
(!renderer.getMediaType().equals(MediaType.APPLICATION_XHTML_XML_TYPE)) {
+ final MediaType rendererMediaType = renderer.getMediaType();
+ if
(!rendererMediaType.equals(MediaType.APPLICATION_XHTML_XML_TYPE)) {
+ httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE,
rendererMediaType);
renderer.render(node, getUserContext(), uriInfo,
httpHeaders, entityStream);
} else {
+ final MediaType mediaTypeWithCharset =
MediaType.valueOf(MediaType.APPLICATION_XHTML_XML+";charset=UTF-8");
+ httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE,
mediaTypeWithCharset);
ResultDocModifier.init();
try {
ByteArrayOutputStream baos = new
ByteArrayOutputStream();
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/src/main/java/org/apache/clerezza/platform/xhtml2html/WrappedResponse.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/src/main/java/org/apache/clerezza/platform/xhtml2html/WrappedResponse.java?rev=993040&r1=993039&r2=993040&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/src/main/java/org/apache/clerezza/platform/xhtml2html/WrappedResponse.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/src/main/java/org/apache/clerezza/platform/xhtml2html/WrappedResponse.java
Mon Sep 6 14:26:12 2010
@@ -50,8 +50,9 @@ class WrappedResponse extends ResponseWr
}
return;
}
- if (headerName.equals(HeaderName.CONTENT_TYPE) &&
XHTML_TYPE.equals(value)) {
- super.addHeader(headerName, HTML_TYPE);
+ String stringValue = value.toString();
+ if (headerName.equals(HeaderName.CONTENT_TYPE) &&
value.toString().startsWith(XHTML_TYPE)) {
+ super.addHeader(headerName,
HTML_TYPE+stringValue.substring(XHTML_TYPE.length()));
convertXhtml2Html = true;
} else {
super.addHeader(headerName, value);
@@ -69,8 +70,9 @@ class WrappedResponse extends ResponseWr
}
return;
}
- if (headerName.equals(HeaderName.CONTENT_TYPE) &&
XHTML_TYPE.equals(value)) {
- super.setHeader(headerName, HTML_TYPE);
+ String stringValue = value.toString();
+ if (headerName.equals(HeaderName.CONTENT_TYPE) &&
stringValue.startsWith(XHTML_TYPE)) {
+ super.setHeader(headerName,
HTML_TYPE+stringValue.substring(XHTML_TYPE.length()));
convertXhtml2Html = true;
} else {
super.setHeader(headerName, value);
