Author: ate
Date: Thu Sep 13 10:25:12 2012
New Revision: 1384267
URL: http://svn.apache.org/viewvc?rev=1384267&view=rev
Log:
RAVE-697: page fragments don't (and shouldn't) need to be prefixed with / to
separate them from 'plain' routed controllers.
Now it is only needed as a prefix in the route target to indicate a nested
pagefragment target instead of a routed plain controller.
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
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/config/enhancers/ExtendsEnhancer.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/abstractPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/deeperFragmentExtensionPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionMergingPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionNonExistingPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionSimplePageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.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=1384267&r1=1384266&r2=1384267&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
Thu Sep 13 10:25:12 2012
@@ -30,9 +30,9 @@
"name" : "pages",
"userPage" : {
"jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "/userPage",
+ "name" : "userPage",
"controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
- "extends" : "/extended",
+ "extends" : "extended",
"viewName" : "pages/userpage/page",
"body" : {
"jcr:primaryType" : "raveconfig:pagefragment",
@@ -54,7 +54,7 @@
"jcr:primaryType" : "raveconfig:pagefragment",
"name" : "extended",
"controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
- "extends" : "/standard",
+ "extends" : "standard",
"viewName" : "pages/userpage/page",
"header" : {
"jcr:primaryType" : "raveconfig:pagefragment",
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=1384267&r1=1384266&r2=1384267&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
Thu Sep 13 10:25:12 2012
@@ -41,8 +41,10 @@ public class NestedHandlerMethodHandlerM
super.processRoute(route);
}
else {
+ // strip / prefix indicator of page targets
+ String pageTarget = route.getTarget().substring(1);
PagesConfig pageConfig = (PagesConfig)getConfig();
- PageFragment page =
pageConfig.getPages().get(route.getTarget());
+ PageFragment page = pageConfig.getPages().get(pageTarget);
if (page != null) {
Class<?> controllerClass =
getControllerClass(page.getController());
if (controllerClass != null) {
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=1384267&r1=1384266&r2=1384267&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
Thu Sep 13 10:25:12 2012
@@ -186,7 +186,7 @@ public class ExtendsEnhancer implements
if (parent != null) {
path = parent.getPath() + "/" + fragment.getName();
} else {
- path = "/"+fragment.getName();
+ path = fragment.getName();
}
this.parent = parent;
this.description = fragment.getDescription();
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
Thu Sep 13 10:25:12 2012
@@ -109,7 +109,7 @@ public class JaxbMappingsTest {
final PageFragment sub3sub1 = sub3.getChildren().get(0);
assertEquals("sub3sub1-withextend", sub3sub1.getName());
assertEquals("org.apache.rave.unittest.NonExistingController",sub3sub1.getController());
- assertEquals("/some/fragment",
((ExtendablePageFragment)sub3sub1).getExtends());
+ assertEquals("some/fragment",
((ExtendablePageFragment)sub3sub1).getExtends());
assertNull(sub3sub1.getViewName());
assertNull(sub3sub1.getChildren());
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
Thu Sep 13 10:25:12 2012
@@ -18,6 +18,6 @@
-->
<routes name="default">
- <route path="/mypage2" target="myPage"/>
- <route path="/mypageFoo" target="myPage" view="bar"/>
+ <route path="/mypage2" target="/myPage"/>
+ <route path="/mypageFoo" target="/myPage" view="bar"/>
</routes>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/abstractPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/abstractPageDefinitions.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/abstractPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/abstractPageDefinitions.xml
Thu Sep 13 10:25:12 2012
@@ -26,7 +26,7 @@
<pageFragment name="sub2sub1"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
<pageFragment name="sub3" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
- <pageFragment name="sub3sub1" extends="/some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ <pageFragment name="sub3sub1" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/deeperFragmentExtensionPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/deeperFragmentExtensionPageDefinitions.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/deeperFragmentExtensionPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/deeperFragmentExtensionPageDefinitions.xml
Thu Sep 13 10:25:12 2012
@@ -25,7 +25,7 @@
<pageFragment name="sub2sub1"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
<pageFragment name="sub3-withcontroller" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
- <pageFragment name="sub3sub1" extends="/some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ <pageFragment name="sub3sub1" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
@@ -33,7 +33,7 @@
<pageFragment name="home" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub2" controller="">
- <pageFragment name="sub2sub1" extends="/standard/sub2/sub2sub1"/>
+ <pageFragment name="sub2sub1" extends="standard/sub2/sub2sub1"/>
</pageFragment>
</pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionMergingPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionMergingPageDefinitions.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionMergingPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionMergingPageDefinitions.xml
Thu Sep 13 10:25:12 2012
@@ -30,16 +30,16 @@
</pageFragment>
- <pageFragment name="home" extends="/standard" description="home"
+ <pageFragment name="home" extends="standard" description="home"
controller="org.apache.rave.unittest.NonExistingController">
</pageFragment>
- <pageFragment name="agenda" extends="/standard" viewName="agenda">
+ <pageFragment name="agenda" extends="standard" viewName="agenda">
<pageFragment name="sub4"/>
</pageFragment>
- <pageFragment name="news" extends="/standard" description="news">
+ <pageFragment name="news" extends="standard" description="news">
<!-- override the controller from 'standard' -->
<pageFragment name="sub2"
controller="org.apache.rave.unittest.NonExistingNewsController">
<!-- a pageFragment that 'standard' does not have. It should also
inherit 'sub2sub1' -->
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionNonExistingPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionNonExistingPageDefinitions.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionNonExistingPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionNonExistingPageDefinitions.xml
Thu Sep 13 10:25:12 2012
@@ -25,7 +25,7 @@
<pageFragment name="sub2sub1"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
<pageFragment name="sub3" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
- <pageFragment name="sub3sub1" extends="/some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ <pageFragment name="sub3sub1" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionSimplePageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionSimplePageDefinitions.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionSimplePageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/extensionSimplePageDefinitions.xml
Thu Sep 13 10:25:12 2012
@@ -30,7 +30,7 @@
</pageFragment>
- <pageFragment name="home" extends="/standard" description="home">
+ <pageFragment name="home" extends="standard" description="home">
</pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
Thu Sep 13 10:25:12 2012
@@ -25,7 +25,7 @@
<pageFragment name="sub2sub1-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
<pageFragment name="sub3-withcontroller-withview" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
- <pageFragment name="sub3sub1-withextend" extends="/some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ <pageFragment name="sub3sub1-withextend" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml?rev=1384267&r1=1384266&r2=1384267&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
Thu Sep 13 10:25:12 2012
@@ -19,7 +19,7 @@
-->
<pageDefinitions name="default">
- <pageFragment name="/myPage" description="My Page" displayname="My page"
controller="org.apache.rave.portal.web.mvc.example.MyPageController">
+ <pageFragment name="myPage" description="My Page" displayname="My page"
controller="org.apache.rave.portal.web.mvc.example.MyPageController">
<pageFragment name="head"
controller="org.apache.rave.portal.web.mvc.example.MyHeaderController"
viewName="pages/override/myheader"/>
<pageFragment name="body"
controller="org.apache.rave.portal.web.mvc.example.MyContentController"/>
<pageFragment name="footer"
controller="org.apache.rave.portal.web.mvc.example.MyFooterController"/>
