Author: ate
Date: Wed Sep 12 14:59:31 2012
New Revision: 1383989
URL: http://svn.apache.org/viewvc?rev=1383989&view=rev
Log:
RAVE-697: enable and use enhanced PageFragment example using extends in demo
portal
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp
(with props)
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
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=1383989&r1=1383988&r2=1383989&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 12 14:59:31 2012
@@ -1,68 +1,83 @@
{
- "routes":{
- "jcr:primaryType":"raveconfig:routes",
- "name":"routes",
- "route1":{
- "jcr:primaryType":"raveconfig:route",
- "name":"route1",
- "path":"/home",
- "target":"/userPage",
- "action": "defaultPage"
+ "routes" : {
+ "jcr:primaryType" : "raveconfig:routes",
+ "name" : "routes",
+ "route1" : {
+ "jcr:primaryType" : "raveconfig:route",
+ "action" : "defaultPage",
+ "path" : "/home",
+ "target" : "/userPage"
},
- "route2":{
- "jcr:primaryType":"raveconfig:route",
- "name":"route2",
- "path":"/page",
- "target":"/userPage",
- "action": "defaultPage"
+ "route2" : {
+ "jcr:primaryType" : "raveconfig:route",
+ "action" : "defaultPage",
+ "path" : "/page",
+ "target" : "/userPage"
},
- "route3":{
- "jcr:primaryType":"raveconfig:route",
- "name":"route3",
- "path":"/dynapi/rest/widgets",
- "target":"org.apache.rave.portal.web.mvc.api.rest.DynWidgetApi"
+ "route3" : {
+ "jcr:primaryType" : "raveconfig:route",
+ "path" : "/dynapi/rest/widgets",
+ "target" : "org.apache.rave.portal.web.mvc.api.rest.DynWidgetApi"
},
- "route4":{
- "jcr:primaryType":"raveconfig:route",
- "name":"route4",
- "path":"/page/{pageId}",
- "target":"/userPage"
+ "route4" : {
+ "jcr:primaryType" : "raveconfig:route",
+ "path" : "/page/{pageId}",
+ "target" : "/userPage"
}
},
- "pages":{
- "jcr:primaryType":"raveconfig:pagedefinitions",
- "name":"pages",
- "userPage":{
- "jcr:primaryType":"raveconfig:pagefragment",
- "name":"/userPage",
- "viewName":"pages/userpage/page",
-
"controller":"org.apache.rave.portal.web.mvc.controller.UserPageController",
- "header":{
- "jcr:primaryType":"raveconfig:pagefragment",
- "name":"header",
- "viewName":"pages/userpage/page-header",
-
"controller":"org.apache.rave.portal.web.mvc.controller.PageHeaderController"
- },
- "body":{
- "jcr:primaryType":"raveconfig:pagefragment",
- "name":"body",
- "viewName":"pages/userpage/page-body",
- "tabs":{
- "jcr:primaryType":"raveconfig:pagefragment",
- "name":"tabs",
- "viewName":"pages/userpage/page-tabs"
+ "pages" : {
+ "jcr:primaryType" : "raveconfig:pagedefinitions",
+ "name" : "pages",
+ "userPage" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "/userPage",
+ "controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
+ "extends" : "/extended",
+ "viewName" : "pages/userpage/page",
+ "body" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "body",
+ "viewName" : "pages/userpage/page-body",
+ "tabs" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "tabs",
+ "viewName" : "pages/userpage/page-tabs"
},
- "content":{
- "jcr:primaryType":"raveconfig:pagefragment",
- "name":"content",
- "viewName":"pages/userpage/page-content"
+ "content" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "content",
+ "viewName" : "pages/userpage/page-content"
}
+ }
+ },
+ "extended" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "extended",
+ "controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
+ "extends" : "/standard",
+ "viewName" : "pages/userpage/page",
+ "header" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "header",
+ "controller" :
"org.apache.rave.portal.web.mvc.controller.PageHeaderController",
+ "viewName" : "pages/userpage/page-header"
+ }
+ },
+ "standard" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "standard",
+ "controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
+ "viewName" : "pages/userpage/page",
+ "header" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "header",
+ "viewName" : "pages/header"
},
- "footer":{
- "jcr:primaryType":"raveconfig:pagefragment",
- "name":"footer",
- "viewName":"pages/footer"
+ "footer" : {
+ "jcr:primaryType" : "raveconfig:pagefragment",
+ "name" : "footer",
+ "viewName" : "pages/footer"
}
}
}
-}
+}
\ No newline at end of file
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=1383989&r1=1383988&r2=1383989&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
Wed Sep 12 14:59:31 2012
@@ -39,7 +39,7 @@
<!-- Configures the @Controller programming model -->
- <!-- Inline replacement of Spring <mvc:annotation-driven/> to be able to
override/extend its behavior.
+ <!-- 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).
@@ -150,7 +150,7 @@
<!-- JCR|File based LOADING -->
<bean name="nestedHandlerMethodHandlerMapping"
class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerMapping">
<property name="order" value="-1"/>
- <property name="configManager" ref="jcrPagesConfigManager"/>
+ <property name="configManager" ref="enhancedPagesConfigManager"/>
</bean>
<bean id="jcrPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.jcr.JcrPagesConfigManager"
destroy-method="shutdown">
@@ -161,6 +161,22 @@
<property name="refreshDelay" value="3000"/>
</bean>
+ <bean id="pageEnhancers"
class="org.springframework.beans.factory.config.ListFactoryBean">
+ <property name="sourceList">
+ <list>
+ <bean
class="org.apache.rave.portal.web.mvc.config.enhancers.SnsFragmentsRemoverEnhancer"/>
+ <bean
class="org.apache.rave.portal.web.mvc.config.enhancers.ExtendsEnhancer"/>
+ <bean
class="org.apache.rave.portal.web.mvc.config.enhancers.FragmentsThatAreAbstractRemoverEnhancer"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="enhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg ref="jcrPagesConfigManager"/>
+ <property name="enhancers" ref="pageEnhancers"/>
+ </bean>
+
+
<bean id="xmlPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
<property name="routesPath" value="/WEB-INF/routes.xml"/>
<property name="pageDefinitionsPath"
value="/WEB-INF/page-definitions.xml"/>
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp?rev=1383989&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp
Wed Sep 12 14:59:31 2012
@@ -0,0 +1,27 @@
+<%--
+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.
+--%>
+<%-- Common header --%>
+<div class="navbar">
+ <div class="navbar-inner">
+ <div class="container">
+ <span class="brand">Hello there, welcome to Rave!</span>
+ </div>
+ </div>
+</div>
+
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/header.jsp
------------------------------------------------------------------------------
svn:keywords = Id
