Author: marijan
Date: Thu Aug 30 20:35:18 2012
New Revision: 1379127
URL: http://svn.apache.org/viewvc?rev=1379127&view=rev
Log:
- merge changes
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml?rev=1379127&r1=1379126&r2=1379127&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Thu Aug 30 20:35:18 2012
@@ -28,61 +28,8 @@
org.apache.rave.portal.web.<packages> are scanned in
web-applicationContext.xml. This is to prevent duplicate
bean scanning of o.a.r.p.web.* components which can cause problems.
-->
- <context:component-scan
base-package="org.apache.rave.portal.web.controller"/>
- <context:component-scan base-package="org.apache.rave.portal.web.api"/>
- <context:component-scan base-package="org.apache.rave.portal.web.hmvc"/>
-
- <!-- Configures the @Controller programming model -->
-
- <!-- Inline replacement of Spring <mvc:annotation-driven/> to be able to
override/extend its behavior.
- This inline replacement has as downside that next versions of Spring
might require alignment, but the
- alternative is writing custom BeanPostProcessor(s) which are difficult
to support customizations of our own (through XML).
-
- Derived/reverse-enginered from
org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport and
-
org.springframework.web.servlet.config.DefaultServletHandlerBeanDefinitionParser
- -->
- <!-- register-defaults
-
- <bean
class="org.springframework.http.converter.ByteArrayHttpMessageConverter" />
- <bean class="org.springframework.http.converter.StringHttpMessageConverter">
- <property name="writeAcceptCharset" value="false"/>
- </bean>
- <bean
class="org.springframework.http.converter.ResourceHttpMessageConverter" />
- <bean
class="org.springframework.http.converter.xml.SourceHttpMessageConverter" />
- <bean
class="org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter"
/>
- -->
-
- <!-- if class javax.xml.bind.Binder present
- <bean
class="org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter"
/>
- -->
-
- <!-- if class com.fasterxml.jackson.databind.ObjectMapper present
- <bean
class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"
/>
- -->
-
- <!-- else if class org.codehaus.jackson.map.ObjectMapper present
- <bean
class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter"
/>
- -->
-
- <!-- if class com.sun.syndication.feed.WireFeed present
- <bean
class="org.springframework.http.converter.feed.AtomFeedHttpMessageConverter" />
- <bean
class="org.springframework.http.converter.feed.RssChannelHttpMessageConverter"
/>
- -->
-
- <!-- end register-defaults -->
-
- <!-- FILE BASED LOADING-->
- <!--
- <bean name="hmvcHandlerMappingByConfig"
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMappingByConfig">
- <property name="order" value="-1"/>
- <property name="interceptors" ref="interceptors"/>
- <property name="configurationName" value="myConfiguration"/>
- <property name="configurationPath"
value="classpath:page-configuration.xml"/>
- <property name="urlMappingsPath"
value="classpath:url-configuration.xml"/>
- <property name="configManager" ref="fileConfigurationManager"/>
- </bean>
- -->
+ <context:component-scan base-package="org.apache.rave.portal.web.hmvc"/>
<!--
//*************************************************************************************
@@ -170,15 +117,12 @@
<property name="order" value="0"/>
</bean>
- <!-- Default replaced by HmvcHandlerMethodMapping which has build-in
fallback to the default RequestMappingHandlerMapping
- The default cannot be enabled as it cannot be configured to *exclude*
certain @RequestMapping methods, e.g. @hmvc ones
- <bean id="requestMappingHandlerMapping"
class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping">
- <property name="order" value="0" />
- <property name="interceptors" ref="interceptors"/>
- </bean>
- -->
- <!-- Inline replacement of Spring <mvc:view-controller/> -->
+ <!--
+ //############################################
+ // BINARY MAPPING
+ //############################################
+ -->
<bean
id="org.springframework.web.servlet.config.viewControllerHandlerMapping"
class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="order" value="1"/>
<property name="urlMap">
