Merge remote-tracking branch 'origin/master'

springside · Oct 7, 2014 · 558cd3c · 558cd3c
2 parents e7b68e4 + 7ed5da0
commit 558cd3c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml b/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml
@@ -28,6 +28,8 @@
 
 	<!-- REST中根据URL后缀自动判定Content-Type及相应的View -->
 	<bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+	    <property name="ignoreAcceptHeader" value="true" />
+            <property name="defaultContentType" value="application/json" />
 	    <property name="mediaTypes" >
 	        <value>
 	            json=application/json