You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/20 19:59:51 UTC
svn commit: r1352239 - in /rave/branches/model_interfaces:
rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Author: mfranklin
Date: Wed Jun 20 17:59:50 2012
New Revision: 1352239
URL: http://svn.apache.org/viewvc?rev=1352239&view=rev
Log:
Fixed client messages that were broken by earlier update RAVE-625
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java?rev=1352239&r1=1352238&r2=1352239&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java Wed Jun 20 17:59:50 2012
@@ -26,6 +26,7 @@ import org.springframework.http.Response
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
import javax.servlet.http.HttpServletRequest;
@@ -68,6 +69,7 @@ public class MessageBundleController {
* @param request The incoming HttpServletRequest
* @return the JavaScript content to load from the client
*/
+ @ResponseBody
@RequestMapping(value = {"/rave_client_messages.js"}, method = RequestMethod.GET)
public ResponseEntity<String> getClientMessages(HttpServletRequest request) {
return new ResponseEntity<String>(getClientMessagesJSForLocale(acceptHeaderLocaleResolver.resolveLocale(request)), clientMessagesResponseHeaders, HttpStatus.OK);
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1352239&r1=1352238&r2=1352239&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml Wed Jun 20 17:59:50 2012
@@ -39,14 +39,30 @@
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven>
<mvc:message-converters>
+ <bean id="stringHttpMessageConverter" class="org.springframework.http.converter.StringHttpMessageConverter">
+ <property name="supportedMediaTypes">
+ <list>
+ <bean class="org.springframework.http.MediaType">
+ <constructor-arg index="0" value="text"/>
+ <constructor-arg index="1" value="plain"/>
+ <constructor-arg index="2" value="UTF-8"/>
+ </bean>
+ <bean class="org.springframework.http.MediaType">
+ <constructor-arg index="0" value="text"/>
+ <constructor-arg index="1" value="javascript"/>
+ <constructor-arg index="2" value="UTF-8"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
<bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
<property name="objectMapper">
<bean class="org.apache.rave.portal.web.model.MaterializedBeanObjectMapperFactory"/>
</property>
</bean>
<bean primary="true" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
- <property name="marshaller" ref="xmlMarshaller" />
- <property name="unmarshaller" ref="xmlMarshaller" />
+ <property name="marshaller" ref="xmlMarshaller"/>
+ <property name="unmarshaller" ref="xmlMarshaller"/>
</bean>
</mvc:message-converters>
</mvc:annotation-driven>
@@ -83,6 +99,30 @@
<oxm:class-to-be-bound name="org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper"/>
</oxm:jaxb2-marshaller>
+ <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
+ <property name="messageConverters">
+ <list>
+ <bean id="stringHttpMessageConverter" class="org.springframework.http.converter.StringHttpMessageConverter">
+ <property name="supportedMediaTypes">
+ <list>
+ <bean class="org.springframework.http.MediaType">
+ <constructor-arg index="0" value="text"/>
+ <constructor-arg index="1" value="plain"/>
+ <constructor-arg index="2" value="UTF-8"/>
+ </bean>
+ <bean class="org.springframework.http.MediaType">
+ <constructor-arg index="0" value="text"/>
+ <constructor-arg index="1" value="javascript"/>
+ <constructor-arg index="2" value="UTF-8"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+ <!-- <bean primary="true" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter"
+ p:marshaller-ref="xmlMarshaller" p:unmarshaller-ref="xmlMarshaller"/>-->
+ </list>
+ </property>
+ </bean>
<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
<property name="definitions">
<list>