svn commit: r1372943 - in /rave/sandbox/content-services: demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMapping.java

[ate]

Author: ate
Date: Tue Aug 14 15:50:46 2012
New Revision: 1372943

URL: http://svn.apache.org/viewvc?rev=1372943&view=rev
Log:
RAVE-698: hide @Hmvc annotated @RequestMapping methods from the 
default/fallback RequestMappingHandlerMapping

Modified:
    
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMapping.java

Modified: 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1372943&r1=1372942&r2=1372943&view=diff
==============================================================================
--- 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
 (original)
+++ 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
 Tue Aug 14 15:50:46 2012
@@ -125,20 +125,22 @@
   </util:list>
 
   <bean name="hmvcHandlerMappingByConfig" 
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMappingByConfig">
-    <property name="order" value="-2"/>
+    <property name="order" value="-1"/>
     <property name="interceptors" ref="interceptors"/>
   </bean>
 
   <bean name="hmvcHandlerMapping" 
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMapping">
-    <property name="order" value="-1"/>
+    <property name="order" value="0"/>
     <property name="interceptors" ref="interceptors"/>
   </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/> -->
   <bean 
id="org.springframework.web.servlet.config.viewControllerHandlerMapping" 
class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMapping.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMapping.java?rev=1372943&r1=1372942&r2=1372943&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMapping.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMapping.java
 Tue Aug 14 15:50:46 2012
@@ -91,8 +91,8 @@ public class HmvcHandlerMethodMapping ex
 
     @Override
     protected void registerHandlerMethod(Object handler, Method method, 
RequestMappingInfo mapping) {
-        registerHandler(handler, method, mapping);
         if (!isHmvcMethod(method)) {
+            registerHandler(handler, method, mapping);
             HmvcHandlerMethod handlerMethod = getHmvcHandlerMethod(handler, 
method, true);
             if (handlerMethod != null) {
                 hmvcHandlerMethods.put(super.getHandlerMethods().get(mapping), 
handlerMethod);