You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/09/19 13:53:55 UTC

svn commit: r1387535 - in /rave/sandbox/content-services: demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/ demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/ demo-portal/src/main/resources/ demo-portal/src/main/w...

Author: ate
Date: Wed Sep 19 11:53:53 2012
New Revision: 1387535

URL: http://svn.apache.org/viewvc?rev=1387535&view=rev
Log:
RAVE-694: rave-web-hmvc
- add support for PageFragment level HandlerInterceptors  (root/page level only)
- add support for properties on both route and pagefragment which are available to help/customize processing of routed/nested HandlerInterceptors and HandlerMethods (controllers)
- provide enhanced HandlerInterceptor adapters supporting routed/nested handler processing

Added:
    rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java   (with props)
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java   (with props)
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedHandlerInterceptorAdapter.java
      - copied, changed from r1386891, rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/PreHandleModelHandlerInterceptor.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java   (with props)
Removed:
    rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/PageHeaderController.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/PreHandleModelHandlerInterceptor.java
Modified:
    rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/UserPageContentController.java
    rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/AuthenticatedUserInterceptor.java
    rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/MobileDeviceInterceptor.java
    rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/UserPageInterceptor.java
    rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
    rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
    rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
    rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerConfigImpl.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfig.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfigImpl.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerAdapter.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerMapping.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutePathMapping.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/Route.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/enhancers/ExtendsEnhancer.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
    rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java
    rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java
    rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java
    rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java

Modified: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/UserPageContentController.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/UserPageContentController.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/UserPageContentController.java (original)
+++ rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/UserPageContentController.java Wed Sep 19 11:53:53 2012
@@ -29,7 +29,7 @@ public class UserPageContentController {
 
     @Named
     @RequestMapping
-    public String render(NestedHandlerContext hc, @ModelAttribute boolean mobileDevice) {
+    public String render(NestedHandlerContext hc, @ModelAttribute("mobileDevice") boolean mobileDevice) {
         if (mobileDevice) {
             return hc.getConfig().getViewName() + "-mobile";
         }

Modified: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/AuthenticatedUserInterceptor.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/AuthenticatedUserInterceptor.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/AuthenticatedUserInterceptor.java (original)
+++ rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/AuthenticatedUserInterceptor.java Wed Sep 19 11:53:53 2012
@@ -20,14 +20,16 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.rave.portal.service.UserService;
-import org.apache.rave.portal.web.mvc.PreHandleModelHandlerInterceptor;
+import org.apache.rave.portal.web.mvc.HandlerContext;
+import org.apache.rave.portal.web.mvc.RoutedHandlerInterceptorAdapter;
+import org.apache.rave.portal.web.mvc.RoutedHandlerMethod;
 import org.apache.rave.portal.web.util.ModelKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ExtendedModelMap;
 
-public class AuthenticatedUserInterceptor extends PreHandleModelHandlerInterceptor {
+public class AuthenticatedUserInterceptor extends RoutedHandlerInterceptorAdapter {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -39,7 +41,7 @@ public class AuthenticatedUserIntercepto
     }
 
     @Override
-    protected boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final ExtendedModelMap modelMap) throws Exception {
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, ExtendedModelMap modelMap) throws Exception {
         modelMap.put(ModelKeys.USER, userService.getAuthenticatedUser());
         return true;
     }

Modified: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/MobileDeviceInterceptor.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/MobileDeviceInterceptor.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/MobileDeviceInterceptor.java (original)
+++ rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/MobileDeviceInterceptor.java Wed Sep 19 11:53:53 2012
@@ -19,14 +19,16 @@ package org.apache.rave.portal.web.mvc.i
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.rave.portal.web.mvc.PreHandleModelHandlerInterceptor;
+import org.apache.rave.portal.web.mvc.HandlerContext;
+import org.apache.rave.portal.web.mvc.RoutedHandlerInterceptorAdapter;
+import org.apache.rave.portal.web.mvc.RoutedHandlerMethod;
 import org.springframework.mobile.device.DeviceUtils;
 import org.springframework.ui.ExtendedModelMap;
 
-public class MobileDeviceInterceptor extends PreHandleModelHandlerInterceptor {
+public class MobileDeviceInterceptor extends RoutedHandlerInterceptorAdapter {
 
     @Override
-    protected boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final ExtendedModelMap modelMap) throws Exception {
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, ExtendedModelMap modelMap) throws Exception {
         modelMap.addAttribute("mobileDevice", Boolean.valueOf(DeviceUtils.getCurrentDevice(request).isMobile()));
         return true;
     }

Added: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java?rev=1387535&view=auto
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java (added)
+++ rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java Wed Sep 19 11:53:53 2012
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rave.portal.web.mvc.interceptors;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.rave.portal.model.PageUser;
+import org.apache.rave.portal.model.Person;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.model.NavigationItem;
+import org.apache.rave.portal.web.model.NavigationMenu;
+import org.apache.rave.portal.web.mvc.NestedHandlerContext;
+import org.apache.rave.portal.web.mvc.NestedHandlerInterceptorAdapter;
+import org.apache.rave.portal.web.mvc.NestedHandlerMethod;
+import org.apache.rave.portal.web.util.ModelKeys;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ExtendedModelMap;
+
+public class TopMenuInterceptor extends NestedHandlerInterceptorAdapter {
+
+    private UserService userService;
+
+    @Autowired
+    TopMenuInterceptor(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, NestedHandlerMethod handler, NestedHandlerContext context, final ExtendedModelMap modelMap) throws Exception {
+
+        String servletPath = context.getRoutePathMapping().getServletPath();
+
+        Long referringPageId = null;
+
+        if (request.getParameter("referringPageId") != null) {
+            try {
+                referringPageId = Long.valueOf(request.getParameter("referringPageId"));
+            }
+            // ignore invalid number
+            catch (NumberFormatException nfe) {}
+        }
+
+        String referringPageQuery = referringPageId != null ? "?referringPageId="+referringPageId.toString() : "";
+        String pageBackPath = servletPath + (referringPageId != null ? "/page/view/"+referringPageId.toString() : "/");
+
+        NavigationMenu menu = new NavigationMenu("topnav");
+
+        // if on userPage page
+        if (Boolean.parseBoolean(getConfigProperty(context, "topnav.userPage", "false"))) {
+            User user = (User) modelMap.get(ModelKeys.USER);
+            if (user != null) {
+                NavigationItem profile = new NavigationItem("page.profile.title", getDisplayName(user), servletPath + "/person/" + user.getUsername() + referringPageQuery);
+                menu.addNavigationItem(profile);
+            }
+            PageUser pageUser = (PageUser)modelMap.get(ModelKeys.PAGE_USER);
+            if (pageUser != null && pageUser.isEditor()) {
+                NavigationItem store = new NavigationItem("page.store.title", null, servletPath + "/store" + referringPageQuery);
+                menu.addNavigationItem(store);
+            }
+        }
+
+        // if on userProfile page
+        if (Boolean.parseBoolean(getConfigProperty(context, "topnav.userProfile", "false"))) {
+            User user = (User) modelMap.get(ModelKeys.USER);
+            if (user != null) {
+                List<Person> friendRequests = userService.getFriendRequestsReceived(user.getUsername());
+                NavigationItem friendRequestItems = new NavigationItem("page.profile.friend.requests", String.valueOf(friendRequests.size()) , "#");
+                for(Person p : friendRequests) {
+                    NavigationItem childItem =
+                            new NavigationItem((p.getDisplayName()!=null && !p.getDisplayName().isEmpty()) ? p.getDisplayName() : p.getUsername(), p.getUsername(), "#");
+                    friendRequestItems.addChildNavigationItem(childItem);
+                }
+                menu.addNavigationItem(friendRequestItems);
+            }
+            // add page back link
+            menu.addNavigationItem(new NavigationItem("page.general.back", null, pageBackPath));
+        }
+
+        // if on store page
+        if (Boolean.parseBoolean(getConfigProperty(context, "topnav.store", "false"))) {
+            menu.addNavigationItem(new NavigationItem("page.addwidget.title", null, servletPath+ "/store/widget/add" + referringPageQuery));
+
+            // add page back link
+            menu.addNavigationItem(new NavigationItem("page.general.back", null, pageBackPath));
+        }
+
+        // if on widget page
+        if (Boolean.parseBoolean(getConfigProperty(context, "topnav.widget", "false"))) {
+            menu.addNavigationItem(new NavigationItem("page.widget.backToStore", null, servletPath+ "/store" + referringPageQuery));
+
+            // add page back link
+            menu.addNavigationItem(new NavigationItem("page.general.back", null, pageBackPath));
+        }
+
+        // if on admin page
+        if (Boolean.parseBoolean(getConfigProperty(context, "topnav.admin", "false"))) {
+            menu.addNavigationItem(new NavigationItem("page.general.back", null, servletPath + "/"));
+        }
+        else {
+            // link to admin for all others (if allowed: url security check during rendering)
+            menu.addNavigationItem(new NavigationItem("page.general.toadmininterface", null, servletPath + "/admin/"));
+        }
+
+        // always can logout
+        menu.addNavigationItem(new NavigationItem("page.general.logout", null, "/j_spring_security_logout"));
+
+        modelMap.addAttribute(menu.getName(), menu);
+
+        return true;
+    }
+
+    protected String getDisplayName(User user) {
+        String displayName = user.getDisplayName();
+        return (displayName == null || "".equals(displayName)) ? user.getUsername() : displayName;
+    }
+
+    protected String getConfigProperty(NestedHandlerContext context, String name, String defaultValue) {
+        // NB: properties retrieved from *only* the root config handler
+        String value = context.getConfig().getProperty(name);
+        return value != null ? value : defaultValue;
+    }
+}

Propchange: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/TopMenuInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/UserPageInterceptor.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/UserPageInterceptor.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/UserPageInterceptor.java (original)
+++ rave/sandbox/content-services/demo-portal/src/main/java/org/apache/rave/portal/web/mvc/interceptors/UserPageInterceptor.java Wed Sep 19 11:53:53 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.rave.portal.web.mvc.interceptors;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -28,14 +27,16 @@ import org.apache.rave.portal.model.Page
 import org.apache.rave.portal.model.PageUser;
 import org.apache.rave.portal.model.User;
 import org.apache.rave.portal.service.PageService;
-import org.apache.rave.portal.web.mvc.PreHandleModelHandlerInterceptor;
+import org.apache.rave.portal.web.mvc.HandlerContext;
+import org.apache.rave.portal.web.mvc.RoutedHandlerInterceptorAdapter;
+import org.apache.rave.portal.web.mvc.RoutedHandlerMethod;
 import org.apache.rave.portal.web.util.ModelKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ExtendedModelMap;
 
-public class UserPageInterceptor extends PreHandleModelHandlerInterceptor {
+public class UserPageInterceptor extends RoutedHandlerInterceptorAdapter {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -47,7 +48,7 @@ public class UserPageInterceptor extends
     }
 
     @Override
-    protected boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final ExtendedModelMap modelMap) throws Exception {
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, final ExtendedModelMap modelMap) throws Exception {
         Map<String, String> uriTemplateVariables = getUriTemplateVariables(request);
         Long pageId = null;
         User user = (User) modelMap.get(ModelKeys.USER);

Modified: rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json (original)
+++ rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json Wed Sep 19 11:53:53 2012
@@ -4,26 +4,22 @@
         "r1":{
             "jcr:primaryType":"raveconfig:route",
             "path":"/",
-            "target":"/userPage",
-            "interceptors":"userPage"
+            "target":"/userPage"
         },
         "r2":{
             "jcr:primaryType":"raveconfig:route",
             "path":"/page",
-            "target":"/userPage",
-            "interceptors":"userPage"
+            "target":"/userPage"
         },
         "r3":{
             "jcr:primaryType":"raveconfig:route",
             "path":"/page/view",
-            "target":"/userPage",
-            "interceptors":"userPage"
+            "target":"/userPage"
         },
         "r4":{
             "jcr:primaryType":"raveconfig:route",
             "path":"/page/view/{pageId}",
-            "target":"/userPage",
-            "interceptors":"userPage"
+            "target":"/userPage"
         },
         "r5":{
             "jcr:primaryType":"raveconfig:route",
@@ -38,6 +34,8 @@
             "name":"userPage",
             "extends":"extended",
             "viewName":"jcr:/pages/userpage/page",
+            "interceptors":"userPage",
+            "prop.topnav.userPage":"true",
             "body":{
                 "jcr:primaryType":"raveconfig:pagefragment",
                 "name":"body",
@@ -68,7 +66,6 @@
             "header":{
                 "jcr:primaryType":"raveconfig:pagefragment",
                 "name":"header",
-                "controller":"org.apache.rave.portal.web.mvc.controller.PageHeaderController",
                 "viewName":"pages/userpage/page-header"
             }
         },

Modified: rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml (original)
+++ rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml Wed Sep 19 11:53:53 2012
@@ -148,11 +148,15 @@
   </bean>
 
   <util:map id="routeInterceptors">
+  </util:map>
+
+  <util:map id="pageInterceptors">
     <entry key="userPage">
       <list>
         <bean class="org.apache.rave.portal.web.mvc.interceptors.MobileDeviceInterceptor"/>
         <bean class="org.apache.rave.portal.web.mvc.interceptors.AuthenticatedUserInterceptor"/>
         <bean class="org.apache.rave.portal.web.mvc.interceptors.UserPageInterceptor"/>
+        <bean class="org.apache.rave.portal.web.mvc.interceptors.TopMenuInterceptor"/>
       </list>
     </entry>
   </util:map>
@@ -163,6 +167,7 @@
     <property name="configManager" ref="enhancedPagesConfigManager"/>
     <property name="interceptors" ref="interceptors"/>
     <property name="routeInterceptors" ref="routeInterceptors"/>
+    <property name="pageInterceptors" ref="pageInterceptors"/>
   </bean>
 
   <bean id="jcrPagesConfigManager" class="org.apache.rave.portal.web.mvc.config.jcr.JcrPagesConfigManager" destroy-method="shutdown">

Modified: rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml (original)
+++ rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml Wed Sep 19 11:53:53 2012
@@ -19,7 +19,8 @@
   -->
 <pageDefinitions name="default">
 
-  <pageFragment name="userPage"    viewName="jcr:/pages/userpage/page" extends="extended">
+  <pageFragment name="userPage"    viewName="jcr:/pages/userpage/page" interceptors="userPage" extends="extended">
+    <property name="topnav.userPage">true</property>
     <pageFragment name="body"      viewName="pages/userpage/page-body">
       <pageFragment name="tabs"    viewName="pages/userpage/page-tabs"    controller="org.apache.rave.portal.web.mvc.controller.UserPageTabsController"/>
       <pageFragment name="content" viewName="pages/userpage/page-content" controller="org.apache.rave.portal.web.mvc.controller.UserPageContentController">
@@ -29,7 +30,7 @@
   </pageFragment>
 
   <pageFragment name="extended" viewName="pages/userpage/page" extends="standard">
-    <pageFragment name="header" viewName="pages/userpage/page-header" controller="org.apache.rave.portal.web.mvc.controller.PageHeaderController"/>
+    <pageFragment name="header" viewName="pages/userpage/page-header"/>
   </pageFragment>
 
   <pageFragment name="standard" viewName="pages/userpage/page">

Modified: rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml (original)
+++ rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml Wed Sep 19 11:53:53 2012
@@ -18,9 +18,9 @@
   under the License.
   -->
 <routes name="default">
-  <route path="/"                    target="/userPage" interceptors="userPage"/>
-  <route path="/page"                target="/userPage" interceptors="userPage"/>
-  <route path="/page/view"           target="/userPage" interceptors="userPage"/>
-  <route path="/page/view/{pageId}"  target="/userPage" interceptors="userPage"/>
+  <route path="/"                    target="/userPage"/>
+  <route path="/page"                target="/userPage"/>
+  <route path="/page/view"           target="/userPage"/>
+  <route path="/page/view/{pageId}"  target="/userPage"/>
   <route path="/dynapi/rest/widgets" target="org.apache.rave.portal.web.mvc.api.rest.DynWidgetApi"/>
 </routes>

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerConfigImpl.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerConfigImpl.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerConfigImpl.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerConfigImpl.java Wed Sep 19 11:53:53 2012
@@ -17,13 +17,12 @@
 package org.apache.rave.portal.web.mvc;
 
 import org.apache.rave.portal.web.mvc.config.Route;
-import org.springframework.web.method.HandlerMethod;
 
 public class HandlerConfigImpl implements HandlerConfig {
     private String name;
     private String action;
-    protected Route route;
-    protected RoutedHandlerMethod method;
+    private Route route;
+    private RoutedHandlerMethod method;
 
     @Override
     public String getName() {

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/HandlerContextImpl.java Wed Sep 19 11:53:53 2012
@@ -56,6 +56,16 @@ public class HandlerContextImpl implemen
     }
 
     @Override
+    public String getServletPath() {
+        return servletPath != null ? servletPath : "";
+    }
+
+    @Override
+    public String getContextPath() {
+        return urlPathHelper.getContextPath(request);
+    }
+
+    @Override
     public UriComponentsBuilder getRoutePath(Class controllerClass, String routeAction) {
         return getRoutePath(controllerClass.getName(), routeAction);
     }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfig.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfig.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfig.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfig.java Wed Sep 19 11:53:53 2012
@@ -23,7 +23,9 @@ public interface NestedHandlerConfig ext
 
     NestedHandlerConfig getParent();
     String getViewName();
-    Set<String> getChildrenNames();
+    String getInterceptors();
+    Map<String, NestedHandlerConfig> getChildren();
     NestedHandlerConfig getChild(String name);
-    Map<String, String> getParameters();
+    String getProperty(String name);
+    Map<String, String> getProperties();
 }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfigImpl.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfigImpl.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfigImpl.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerConfigImpl.java Wed Sep 19 11:53:53 2012
@@ -18,16 +18,16 @@ package org.apache.rave.portal.web.mvc;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 public class NestedHandlerConfigImpl extends HandlerConfigImpl implements NestedHandlerConfig {
     private String viewName;
+    private String interceptors;
     private NestedHandlerConfigImpl parent;
-    private Map<String, String> parameters = new HashMap<String, String>();
-    private Map<String, NestedHandlerConfigImpl> children = new LinkedHashMap<String, NestedHandlerConfigImpl>();
+    private Map<String, String> properties;
+    private Map<String, NestedHandlerConfig> children = new HashMap<String, NestedHandlerConfig>();
 
+    @Override
     public NestedHandlerConfigImpl getParent() {
         return parent;
     }
@@ -36,18 +36,21 @@ public class NestedHandlerConfigImpl ext
         this.parent = parent;
     }
 
-    public Map<String, NestedHandlerConfigImpl> getChildren() {
-        return children;
-    }
-
-    public Set<String> getChildrenNames() {
-        return Collections.unmodifiableSet(children.keySet());
+    @Override
+    public Map<String, NestedHandlerConfig> getChildren() {
+        return Collections.unmodifiableMap(children);
     }
 
+    @Override
     public NestedHandlerConfig getChild(String name) {
         return children.get(name);
     }
 
+    public void addChild(NestedHandlerConfig child) {
+        children.put(child.getName(), child);
+    }
+
+    @Override
     public String getViewName() {
         return viewName;
     }
@@ -56,10 +59,16 @@ public class NestedHandlerConfigImpl ext
         this.viewName = viewName;
     }
 
-    public Map<String, String> getParameters() {
-        return parameters;
+    @Override
+    public String getInterceptors() {
+        return interceptors;
     }
 
+    public void setInterceptors(final String interceptors) {
+        this.interceptors = interceptors;
+    }
+
+    @Override
     public NestedHandlerMethod getMethod() {
         return (NestedHandlerMethod)super.getMethod();
     }
@@ -67,4 +76,27 @@ public class NestedHandlerConfigImpl ext
     public void setMethod(NestedHandlerMethod method) {
         super.setMethod(method);
     }
-}
+
+    @Override
+    public String getProperty(String name) {
+        return getProperties().get(name);
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        if (properties == null) {
+            properties = Collections.emptyMap();
+        }
+        return properties;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        if (properties == null) {
+            properties = Collections.emptyMap();
+        }
+        else {
+            properties = Collections.unmodifiableMap(properties);
+        }
+        this.properties = properties;
+    }
+}
\ No newline at end of file

Added: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java?rev=1387535&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java (added)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java Wed Sep 19 11:53:53 2012
@@ -0,0 +1,40 @@
+package org.apache.rave.portal.web.mvc;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.ui.ExtendedModelMap;
+import org.springframework.web.servlet.ModelAndView;
+
+public abstract class NestedHandlerInterceptorAdapter extends RoutedHandlerInterceptorAdapter {
+
+    protected final boolean preHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, ExtendedModelMap modelMap) throws Exception {
+        if (handler instanceof NestedHandlerMethod) {
+            return preHandle(request, response, (NestedHandlerMethod)handler, (NestedHandlerContext)context, modelMap);
+        }
+        // else: be lenient
+        return true;
+    }
+
+    protected final void postHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, ModelAndView modelAndView) throws Exception {
+        if (handler instanceof NestedHandlerMethod) {
+            postHandle(request, response, (NestedHandlerMethod)handler, (NestedHandlerContext)context, modelAndView);
+        }
+    }
+
+    protected final void afterCompletion(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, Exception ex) throws Exception {
+        if (handler instanceof NestedHandlerMethod) {
+            afterCompletion(request, response, (NestedHandlerMethod)handler, (NestedHandlerContext)context, ex);
+        }
+    }
+
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, NestedHandlerMethod handler, NestedHandlerContext context, ExtendedModelMap modelMap) throws Exception {
+        return true;
+    }
+
+    protected void postHandle(HttpServletRequest request, HttpServletResponse response, NestedHandlerMethod handler, NestedHandlerContext context, ModelAndView modelAndView) throws Exception {
+    }
+
+    protected void afterCompletion(HttpServletRequest request, HttpServletResponse response, NestedHandlerMethod handler, NestedHandlerContext context, Exception ex) throws Exception {
+    }
+}

Propchange: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerInterceptorAdapter.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerAdapter.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerAdapter.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerAdapter.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerAdapter.java Wed Sep 19 11:53:53 2012
@@ -69,7 +69,7 @@ public class NestedHandlerMethodHandlerA
 
             Map<String, ModelAndView> cmvMap = new LinkedHashMap<String, ModelAndView>();
             for (String name : hm.getConfiguration().getChildren().keySet()) {
-                NestedHandlerMethod chm = (NestedHandlerMethod)hm.getConfiguration().getChildren().get(name).getMethod();
+                NestedHandlerMethod chm = ((NestedHandlerConfigImpl)hm.getConfiguration().getChild(name)).getMethod();
                 request.setAttribute(DispatcherServlet.INPUT_FLASH_MAP_ATTRIBUTE, mv.getModel());
                 ModelAndView cmv = handleNested(request, response, chm);
                 if (cmv != null) {

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerMapping.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerMapping.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerMapping.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/NestedHandlerMethodHandlerMapping.java Wed Sep 19 11:53:53 2012
@@ -30,12 +30,22 @@ import org.apache.rave.portal.web.mvc.co
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerExecutionChain;
+import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 
 public class NestedHandlerMethodHandlerMapping extends RoutedRequestMappingHandlerMapping {
 
     private static final Logger log = LoggerFactory.getLogger(NestedHandlerMethodHandlerMapping.class);
 
+    Map<String, List<HandlerInterceptor>> pageInterceptors = new HashMap<String, List<HandlerInterceptor>>();
+
+    public void setPageInterceptors(Map<String, List<HandlerInterceptor>> map) {
+        if (map != null && !map.isEmpty()) {
+            this.pageInterceptors.putAll(map);
+        }
+    }
+
     protected void processRoute(Route route) {
         if (!StringUtils.isEmpty(route.getTarget())) {
             if (!route.getTarget().startsWith("/")) {
@@ -86,7 +96,9 @@ public class NestedHandlerMethodHandlerM
         config.setName(fragment.getName());
         config.setViewName(fragment.getViewName());
         config.setRoute(route);
+        config.setInterceptors(fragment.getInterceptors());
         config.setMethod(new NestedHandlerMethod(handler, method, config));
+        config.setProperties(fragment.getProperties());
 
         final List<PageFragment> children = fragment.getChildren();
         if (children != null ) {
@@ -108,7 +120,7 @@ public class NestedHandlerMethodHandlerM
                         log.info("@@@ Registering child component [{}] for parent [{}] ", child.getName(), fragment.getName());
                         NestedHandlerConfigImpl childConfig = getNestedHandlerMethodForFragment(route, ccInstance, ami.method, child, action).getConfiguration();
                         childConfig.setParent(config);
-                        config.getChildren().put(child.getName(), childConfig);
+                        config.addChild(childConfig);
                     }
                 }
             }
@@ -136,4 +148,21 @@ public class NestedHandlerMethodHandlerM
         }
         return handlerMethod;
     }
+
+    protected void addHandlerContextInterceptors(HandlerExecutionChain chain, HandlerContext handlerContext, HttpServletRequest request) {
+        if (handlerContext instanceof NestedHandlerContext) {
+            // first add potential page interceptors
+            NestedHandlerConfig config = ((NestedHandlerContext)handlerContext).getConfig();
+            if (config.getInterceptors() != null) {
+                List<HandlerInterceptor> interceptors = pageInterceptors.get(config.getInterceptors());
+                if (interceptors != null) {
+                    for (HandlerInterceptor interceptor : interceptors) {
+                        chain.addInterceptor(interceptor);
+                    }
+                }
+            }
+        }
+        // add possible route interceptors (after the page interceptors)
+        super.addHandlerContextInterceptors(chain, handlerContext, request);
+    }
 }
\ No newline at end of file

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutePathMapping.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutePathMapping.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutePathMapping.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutePathMapping.java Wed Sep 19 11:53:53 2012
@@ -19,6 +19,8 @@ package org.apache.rave.portal.web.mvc;
 import org.springframework.web.util.UriComponentsBuilder;
 
 public interface RoutePathMapping {
+    String getContextPath();
+    String getServletPath();
     UriComponentsBuilder getRoutePath(Class controllerClass, String routeAction);
     UriComponentsBuilder getRoutePath(String routeTarget, String routeAction);
     UriComponentsBuilder getRoutePath();

Copied: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedHandlerInterceptorAdapter.java (from r1386891, rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/PreHandleModelHandlerInterceptor.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedHandlerInterceptorAdapter.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedHandlerInterceptorAdapter.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/PreHandleModelHandlerInterceptor.java&r1=1386891&r2=1387535&rev=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/PreHandleModelHandlerInterceptor.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedHandlerInterceptorAdapter.java Wed Sep 19 11:53:53 2012
@@ -7,20 +7,38 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.ui.ExtendedModelMap;
-import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-public abstract class PreHandleModelHandlerInterceptor implements HandlerInterceptor {
+public abstract class RoutedHandlerInterceptorAdapter extends HandlerInterceptorAdapter {
 
     @Override
-    public final boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler) throws Exception {
-        ExtendedModelMap m = (ExtendedModelMap)request.getAttribute(RoutedHandlerMethod.PREHANDLE_INTERCEPTOR_MODEL);
-        if (m == null) {
-            m = new ExtendedModelMap();
-            request.setAttribute(RoutedHandlerMethod.PREHANDLE_INTERCEPTOR_MODEL, m);
+    public final boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (handler instanceof RoutedHandlerMethod && request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT) != null) {
+            ExtendedModelMap m = (ExtendedModelMap)request.getAttribute(RoutedHandlerMethod.PREHANDLE_INTERCEPTOR_MODEL);
+            if (m == null) {
+                m = new ExtendedModelMap();
+                request.setAttribute(RoutedHandlerMethod.PREHANDLE_INTERCEPTOR_MODEL, m);
+            }
+            return preHandle(request, response, (RoutedHandlerMethod)handler, (HandlerContext) request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT), m);
+        }
+        // else: be lenient
+        return true;
+    }
+
+    @Override
+    public final void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        if (handler instanceof RoutedHandlerMethod && request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT) != null) {
+            postHandle(request, response, (RoutedHandlerMethod)handler, (HandlerContext) request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT), modelAndView);
+        }
+    }
+
+    @Override
+    public final void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        if (handler instanceof RoutedHandlerMethod && request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT) != null) {
+            afterCompletion(request, response, (RoutedHandlerMethod)handler, (HandlerContext) request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT), ex);
         }
-        return preHandle(request, response, handler, m);
     }
 
     @SuppressWarnings("unchecked")
@@ -30,15 +48,13 @@ public abstract class PreHandleModelHand
         return (variables != null) ? variables : Collections.<String, String>emptyMap();
     }
 
-    protected abstract boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final ExtendedModelMap modelMap) throws Exception;
+    protected boolean preHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, ExtendedModelMap modelMap) throws Exception {
+        return true;
+    }
 
-    @Override
-    public void postHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final ModelAndView modelAndView) throws Exception {
-        // default do nothing: override to customize behavior
+    protected void postHandle(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, ModelAndView modelAndView) throws Exception {
     }
 
-    @Override
-    public void afterCompletion(final HttpServletRequest request, final HttpServletResponse response, final Object handler, final Exception ex) throws Exception {
-        // default do nothing: override to customize behavior
+    protected void afterCompletion(HttpServletRequest request, HttpServletResponse response, RoutedHandlerMethod handler, HandlerContext context, Exception ex) throws Exception {
     }
 }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java Wed Sep 19 11:53:53 2012
@@ -288,6 +288,7 @@ public class RoutedRequestMappingHandler
                             HandlerConfigImpl config = new HandlerConfigImpl();
                             config.setName(controller);
                             config.setAction(route.getAction());
+                            config.setRoute(route);
                             config.setMethod(new RoutedHandlerMethod(handler, ami.method, config));
                             registerHandlerMethod(handler, ami.method, ami.info);
                             registerTargetActionPath(controller, ami.action, ami.info);
@@ -405,19 +406,23 @@ public class RoutedRequestMappingHandler
         return config;
     }
 
+    protected void addHandlerContextInterceptors(HandlerExecutionChain chain, HandlerContext handlerContext, HttpServletRequest request) {
+        Route route = handlerContext.getConfig().getRoute();
+        if (route.getInterceptors() != null) {
+            List<HandlerInterceptor> interceptors = routeInterceptors.get(route.getInterceptors());
+            if (interceptors != null) {
+                for (HandlerInterceptor interceptor : interceptors) {
+                    chain.addInterceptor(interceptor);
+                }
+            }
+        }
+    }
+
     protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
         HandlerExecutionChain chain = super.getHandlerExecutionChain(handler, request);
         HandlerContext handlerContext = (HandlerContext)request.getAttribute(RoutedHandlerMethod.HANDLER_CONTEXT);
         if (handlerContext != null) {
-            Route route = handlerContext.getConfig().getRoute();
-            if (route.getInterceptors() != null) {
-                List<HandlerInterceptor> interceptors = routeInterceptors.get(route.getInterceptors());
-                if (interceptors != null) {
-                    for (HandlerInterceptor interceptor : interceptors) {
-                        chain.addInterceptor(interceptor);
-                    }
-                }
-            }
+            addHandlerContextInterceptors(chain, handlerContext, request);
         }
         return chain;
     }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java Wed Sep 19 11:53:53 2012
@@ -20,6 +20,7 @@
 package org.apache.rave.portal.web.mvc.config;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version "$Id$"
@@ -63,4 +64,20 @@ public interface PageFragment {
      */
     List<PageFragment> getChildren();
 
+    /**
+     * @return name of list of (Spring) HandlerInterceptors which should be used when invoking this PageFragment. (only used for root fragments)
+     */
+    String getInterceptors();
+
+    /**
+     *
+     * @param name name of the property to retrieve the value for
+     * @return the value of a property defined for this PageFragment, null if undefined
+     */
+    String getProperty(String name);
+
+    /**
+     * @return An immutable map of properties defined for this Route, never null
+     */
+    Map<String, String> getProperties();
 }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/Route.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/Route.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/Route.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/Route.java Wed Sep 19 11:53:53 2012
@@ -20,6 +20,7 @@
 package org.apache.rave.portal.web.mvc.config;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version "$Id$"
@@ -37,4 +38,16 @@ public interface Route {
     String getAction();
 
     String getInterceptors();
+
+    /**
+     *
+     * @param name name of the property to retrieve the value for
+     * @return the value of a property defined for this Route, null if undefined
+     */
+    String getProperty(String name);
+
+    /**
+     * @return An immutable map of properties defined for this Route, never null
+     */
+    Map<String, String> getProperties();
 }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/enhancers/ExtendsEnhancer.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/enhancers/ExtendsEnhancer.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/enhancers/ExtendsEnhancer.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/enhancers/ExtendsEnhancer.java Wed Sep 19 11:53:53 2012
@@ -139,6 +139,15 @@ public class ExtendsEnhancer implements 
         if (fragment.getViewName() == null) {
             fragment.setViewName(extendsFrom.getViewName());
         }
+        if (fragment.getInterceptors() == null) {
+            fragment.setInterceptors(extendsFrom.getInterceptors());
+        }
+
+        for (String name : extendsFrom.properties.keySet()) {
+            if (fragment.properties.get(name) == null) {
+                fragment.properties.put(name, extendsFrom.properties.get(name));
+            }
+        }
     }
 
     /**
@@ -171,9 +180,11 @@ public class ExtendsEnhancer implements 
         private String description;
         private String controller;
         private String extendz;
+        private String interceptors;
         private boolean abstrakt;
         private Map<String, MutablePageFragment> children;
         private MutablePageFragment parent;
+        private Map<String, String> properties;
 
         /**
          * constructor that creates a deep copy of PageFragments to MutablePageFragment's
@@ -193,6 +204,7 @@ public class ExtendsEnhancer implements 
             this.controller = fragment.getController();
             this.extendz = fragment.getExtends();
             this.abstrakt = fragment.isAbstract();
+            this.interceptors = fragment.getInterceptors();
             if (fragment.getChildren() != null) {
                 // use LinkedHashMap to maintain order
                 children = new LinkedHashMap<String, MutablePageFragment>(fragment.getChildren().size());
@@ -201,6 +213,7 @@ public class ExtendsEnhancer implements 
                     children.put(mutableChild.getName(), mutableChild);
                 }
             }
+            this.properties = new HashMap<String, String>(fragment.getProperties());
         }
 
         @Override
@@ -239,6 +252,11 @@ public class ExtendsEnhancer implements 
         }
 
         @Override
+        public String getInterceptors() {
+            return interceptors;
+        }
+
+        @Override
         public List<PageFragment> getChildren() {
             if (children == null) {
                 return Collections.emptyList();
@@ -246,6 +264,16 @@ public class ExtendsEnhancer implements 
             return new ArrayList<PageFragment>(children.values());
         }
 
+        @Override
+        public String getProperty(String name) {
+            return properties.get(name);
+        }
+
+        @Override
+        public Map<String,String> getProperties() {
+            return Collections.unmodifiableMap(properties);
+        }
+
         /**
          * Extra needed utility method for enhancing fragments:
          * @return the hierarchical location relative to the root (thus not starting with /) made up of all ancestor names including the fragments own name devided by /
@@ -259,6 +287,10 @@ public class ExtendsEnhancer implements 
             this.viewName = viewName;
         }
 
+        public void setInterceptors(final String interceptors) {
+            this.interceptors = interceptors;
+        }
+
         public void setDescription(final String description) {
             this.description = description;
         }
@@ -295,5 +327,9 @@ public class ExtendsEnhancer implements 
             }
             children.put(child.getName(), child);
         }
+
+        public void addProperty(String name, String value) {
+            properties.put(name, value);
+        }
     }
 }

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java Wed Sep 19 11:53:53 2012
@@ -19,11 +19,16 @@
 
 package org.apache.rave.portal.web.mvc.config.xml;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.rave.portal.web.mvc.config.ExtendablePageFragment;
 import org.apache.rave.portal.web.mvc.config.PageFragment;
@@ -39,6 +44,9 @@ public class XmlPageFragment implements 
     private String xmlExtends;
     private boolean xmlAbstract;
     private String viewName;
+    private String interceptors;
+    private List<XmlProperty> xmlProperties;
+    private Map<String,String> properties;
 
     private String controller;
     private List<PageFragment> children;
@@ -63,6 +71,16 @@ public class XmlPageFragment implements 
 
     @XmlAttribute
     @Override
+    public String getInterceptors() {
+        return interceptors;
+    }
+
+    public void setInterceptors(String interceptors) {
+        this.interceptors = interceptors;
+    }
+
+    @XmlAttribute
+    @Override
     public String getController() {
         return controller;
     }
@@ -122,6 +140,39 @@ public class XmlPageFragment implements 
         this.xmlAbstract = xmlAbstract;
     }
 
+    @XmlElement(name = "property", type = XmlProperty.class)
+    public List<XmlProperty> getXmlProperties() {
+        return xmlProperties;
+    }
+
+    public void setXmlProperties(final List<XmlProperty> xmlProperties) {
+        this.xmlProperties = xmlProperties;
+        this.properties = null;
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        if (properties == null) {
+            Map<String, String> prop = new HashMap<String, String>();
+            if (xmlProperties != null) {
+                for (XmlProperty p : xmlProperties) {
+                    prop.put(p.getName(), p.getValue());
+                }
+            }
+            properties = Collections.unmodifiableMap(prop);
+        }
+        return properties;
+    }
+
+    public void setProperties(final Map<String, String> properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return getProperties().get(name);
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
@@ -132,5 +183,4 @@ public class XmlPageFragment implements 
         sb.append('}');
         return sb.toString();
     }
-}
-
+}
\ No newline at end of file

Added: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java?rev=1387535&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java (added)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java Wed Sep 19 11:53:53 2012
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.portal.web.mvc.config.xml;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlValue;
+
+public class XmlProperty {
+
+    private String name;
+    private String value;
+
+    @XmlAttribute
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @XmlValue
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+}

Propchange: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlProperty.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java Wed Sep 19 11:53:53 2012
@@ -19,10 +19,14 @@
 
 package org.apache.rave.portal.web.mvc.config.xml;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.rave.portal.web.mvc.config.Route;
 
@@ -36,6 +40,8 @@ public class XmlRoute implements Route {
     private String action;
     private String interceptors;
     private List<Route> children;
+    private List<XmlProperty> xmlProperties;
+    private Map<String,String> properties;
 
     public XmlRoute() {
     }
@@ -93,6 +99,38 @@ public class XmlRoute implements Route {
         this.children = children;
     }
 
+    @XmlElement(name = "property", type = XmlProperty.class)
+    public List<XmlProperty> getXmlProperties() {
+        return xmlProperties;
+    }
+
+    public void setXmlProperties(final List<XmlProperty> xmlProperties) {
+        this.xmlProperties = xmlProperties;
+        this.properties = null;
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        if (properties == null) {
+            Map<String, String> prop = new HashMap<String, String>();
+            if (xmlProperties != null) {
+                for (XmlProperty p : xmlProperties) {
+                    prop.put(p.getName(), p.getValue());
+                }
+            }
+            properties = Collections.unmodifiableMap(prop);
+        }
+        return properties;
+    }
+
+    public void setProperties(final Map<String, String> properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return getProperties().get(name);
+    }
 
     @Override
     public String toString() {

Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java Wed Sep 19 11:53:53 2012
@@ -86,7 +86,7 @@ public class RoutedRequestMappingHandler
         assertTrue("Expected body", childrenNames.contains("body"));
         assertTrue("Expected head", childrenNames.contains("head"));
         assertTrue("Expected footer", childrenNames.contains("footer"));
-        final NestedHandlerMethod child = (NestedHandlerMethod)handlerMethod.getConfiguration().getChildren().get("body").getMethod();
+        final NestedHandlerMethod child = ((NestedHandlerConfigImpl)handlerMethod.getConfiguration().getChild("body")).getMethod();
         final Set<String> bodyKids = child.getConfiguration().getChildren().keySet();
         assertTrue("body should have zero children", bodyKids.size() == 0);
         assertViewName(mav, "pages/mypage");

Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java Wed Sep 19 11:53:53 2012
@@ -20,9 +20,13 @@
 package org.apache.rave.portal.web.mvc.config.jcr;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl;
 import org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection;
 import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
 import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
@@ -57,9 +61,16 @@ public class JcrPageFragment implements 
     @Field
     private String name;
 
+    @Field
+    private String interceptors;
+
     @Collection(elementClassName = JcrPageFragment.class, jcrType = "raveconfig:pagefragment", collectionConverter = NTCollectionConverterImpl.class)
     private List<PageFragment> children;
 
+    @Collection(elementClassName = String.class, jcrName ="prop.*", collectionConverter = ResidualPropertiesCollectionConverterImpl.class)
+    private Map<String, String> properties;
+    private Map<String, String> props;
+
     @Override
     public String getViewName() {
         return viewName;
@@ -122,6 +133,15 @@ public class JcrPageFragment implements 
     }
 
     @Override
+    public String getInterceptors() {
+        return interceptors;
+    }
+
+    public void setInterceptors(final String interceptors) {
+        this.interceptors = interceptors;
+    }
+
+    @Override
     public String getController() {
         return controller;
     }
@@ -148,6 +168,45 @@ public class JcrPageFragment implements 
     }
 
     @Override
+    public Map<String, String> getProperties() {
+        if (props == null) {
+            if (properties == null) {
+                props = Collections.emptyMap();
+            }
+            else {
+                props = new HashMap<String, String>();
+                for (Map.Entry<String, String> entry : properties.entrySet()) {
+                    if (entry.getKey().startsWith("prop.")) {
+                        props.put(entry.getKey().substring("prop.".length()), entry.getValue());
+                    }
+                }
+            }
+        }
+        return props;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+        this.props = null;
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return getProperties().get(name);
+    }
+
+    public void setProperty(String name, String value) {
+        if (!name.startsWith("prop.")) {
+            name = "prop." +name;
+        }
+        if (properties == null) {
+            properties = new HashMap<String, String>();
+        }
+        properties.put(name, value);
+        props = null;
+    }
+
+    @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append("JcrPageFragment");

Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java?rev=1387535&r1=1387534&r2=1387535&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java Wed Sep 19 11:53:53 2012
@@ -19,9 +19,13 @@
 
 package org.apache.rave.portal.web.mvc.config.jcr;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl;
 import org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection;
 import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
 import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
@@ -52,6 +56,10 @@ public class JcrRoute implements Route {
     @Collection(elementClassName = JcrRoute.class, jcrType = "raveconfig:route", collectionConverter = NTCollectionConverterImpl.class)
     private List<Route> children;
 
+    @Collection(elementClassName = String.class, jcrName ="prop.*", collectionConverter = ResidualPropertiesCollectionConverterImpl.class)
+    private Map<String, String> properties;
+    private Map<String, String> props;
+
     @Override
     public String getPath() {
         return path;
@@ -99,6 +107,45 @@ public class JcrRoute implements Route {
     }
 
     @Override
+    public Map<String, String> getProperties() {
+        if (props == null) {
+            if (properties == null) {
+                props = Collections.emptyMap();
+            }
+            else {
+                props = new HashMap<String, String>();
+                for (Map.Entry<String, String> entry : properties.entrySet()) {
+                    if (entry.getKey().startsWith("prop.")) {
+                        props.put(entry.getKey().substring("prop.".length()), entry.getValue());
+                    }
+                }
+            }
+        }
+        return props;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+        this.props = null;
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return getProperties().get(name);
+    }
+
+    public void setProperty(String name, String value) {
+        if (!name.startsWith("prop.")) {
+            name = "prop." +name;
+        }
+        if (properties == null) {
+            properties = new HashMap<String, String>();
+        }
+        properties.put(name, value);
+        props = null;
+    }
+
+    @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append("JcrRoute");