Author: gvanmatre
Date: Sun Dec 17 20:26:47 2006
New Revision: 488118
URL: http://svn.apache.org/viewvc?view=rev&rev=488118
Log:
Fix for the Tomahawk jscookmenu component not rendering (Shale364). The
problem was reported by Steve Olson. This patch adds the rendererType to the
Clay XML configuration files. The Clay full views now explicitly set the
content type of the response.
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_1-config.xml
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_3-config.xml
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java?view=diff&rev=488118&r1=488117&r2=488118
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java
Sun Dec 17 20:26:47 2006
@@ -381,8 +381,12 @@
//get the response
HttpServletResponse response = (HttpServletResponse)
context.getExternalContext().getResponse();
+ // TODO create a configurable method to set the content type
+ if (response.getContentType() == null) {
+ response.setContentType("text/html");
+ }
//set the locale
- (response).setLocale(context.getViewRoot().getLocale());
+ response.setLocale(context.getViewRoot().getLocale());
//builds a buffer to write the page to
StringWriter writer = new StringWriter();
Modified:
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_1-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_1-config.xml?view=diff&rev=488118&r1=488117&r2=488118
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_1-config.xml
(original)
+++
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_1-config.xml
Sun Dec 17 20:26:47 2006
@@ -699,6 +699,7 @@
<set name="styleLocation" bindingType="VB" />
<set name="layout" bindingType="VB" />
<set name="theme" bindingType="VB" />
+ <set name="rendererType" value="org.apache.myfaces.JSCookMenu"
bindingType="None" />
</attributes>
</component>
<component jsfid="t:message"
Modified:
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_3-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_3-config.xml?view=diff&rev=488118&r1=488117&r2=488118
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_3-config.xml
(original)
+++
shale/framework/trunk/shale-clay/src/main/resources/META-INF/tomahawk-1_1_3-config.xml
Sun Dec 17 20:26:47 2006
@@ -700,6 +700,7 @@
<set name="styleLocation" bindingType="VB" />
<set name="layout" bindingType="VB" />
<set name="theme" bindingType="VB" />
+ <set name="rendererType" value="org.apache.myfaces.JSCookMenu"
bindingType="None" />
</attributes>
</component>
<component jsfid="t:message"
