You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/24 17:35:46 UTC
svn commit: r239696 -
/myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Author: mmarinschek
Date: Wed Aug 24 08:35:42 2005
New Revision: 239696
URL: http://svn.apache.org/viewcvs?rev=239696&view=rev
Log:
MyFaces doesn't support text/xml in its current version. Dooh! text/html is the only thing that should be delivered
Modified:
myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=239696&r1=239695&r2=239696&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Wed Aug 24 08:35:42 2005
@@ -38,12 +38,14 @@
{
private static final Log log = LogFactory.getLog(HtmlRenderKitImpl.class);
private static String HTML_CONTENT_TYPE = "text/html";
- private static String XHTML_CONTENT_TYPE = "application/xhtml+xml";
- private static String APPLICATION_XML_CONTENT_TYPE = "application/xml";
- private static String TEXT_XML_CONTENT_TYPE = "text/xml";
private static String APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE ="application/x-www-form-urlencoded";
private static String ANY_CONTENT_TYPE ="*/*";
+ //todo: enable these as soon as myfaces supports proper text/xml
+ /*private static String XHTML_CONTENT_TYPE = "application/xhtml+xml";
+ private static String APPLICATION_XML_CONTENT_TYPE = "application/xml";
+ private static String TEXT_XML_CONTENT_TYPE = "text/xml";*/
+
private static String DEFAULT_CHAR_ENCODING = "ISO-8859-1";
//~ Instance fields ----------------------------------------------------------------------------
@@ -108,7 +110,8 @@
List contentTypeList = splitContentTypeListString(contentTypeListString);
String[] supportedContentTypeArray = new String[]{HTML_CONTENT_TYPE,
- XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE,
+ /*todo: enable these as soon as MyFaces supports proper text/xml markup
+ XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE,*/
APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE,ANY_CONTENT_TYPE};
String selectedContentType = null;
@@ -128,11 +131,12 @@
contentType.indexOf(ANY_CONTENT_TYPE)!=-1) {
selectedContentType = HTML_CONTENT_TYPE;
}
+ /* todo: enable this as soon as MyFaces supports proper text/xml markup
else if (contentType.indexOf(XHTML_CONTENT_TYPE) != -1 ||
contentType.indexOf(APPLICATION_XML_CONTENT_TYPE) != -1 ||
contentType.indexOf(TEXT_XML_CONTENT_TYPE) != -1) {
selectedContentType = XHTML_CONTENT_TYPE;
- }
+ }*/
break;
}
}