Author: ard
Date: Tue Sep 11 10:48:40 2012
New Revision: 1383345
URL: http://svn.apache.org/viewvc?rev=1383345&view=rev
Log:
RAVE-695 and align getPageFragments to getPages
Modified:
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/PagesConfig.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManagerTest.java
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=1383345&r1=1383344&r2=1383345&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
Tue Sep 11 10:48:40 2012
@@ -39,9 +39,9 @@ public class NestedHandlerMethodHandlerM
protected void processRoute(Route route) {
if (!StringUtils.isEmpty(route.getTarget())) {
PagesConfig pageConfig = (PagesConfig)getConfig();
- PageFragment pageDefinition =
pageConfig.getPageFragments().get(route.getTarget());
- if (pageDefinition != null) {
- Class<?> controllerClass =
getControllerClass(pageDefinition.getController());
+ PageFragment page = pageConfig.getPages().get(route.getTarget());
+ if (page != null) {
+ Class<?> controllerClass =
getControllerClass(page.getController());
if (controllerClass != null) {
Method method = getActionOrDefaultMethod(controllerClass,
route.getAction());
if (method != null) {
@@ -49,7 +49,7 @@ public class NestedHandlerMethodHandlerM
RequestMappingInfo mappingInfo =
createMappingInfo(annotation, route.getPath());
try {
Object handler =
getApplicationContext().getBean(controllerClass);
- registerPageHandlerMethod(pageDefinition, handler,
method, mappingInfo, route.getAction());
+ registerPageHandlerMethod(page, handler, method,
mappingInfo, route.getAction());
}
catch (Exception e) {
log.error("Error", e);
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfig.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfig.java?rev=1383345&r1=1383344&r2=1383345&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfig.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfig.java
Tue Sep 11 10:48:40 2012
@@ -22,5 +22,5 @@ import java.util.Map;
public interface PagesConfig extends Config {
- Map<String, PageFragment> getPageFragments();
+ Map<String, PageFragment> getPages();
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.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/XmlPagesConfigManager.java?rev=1383345&r1=1383344&r2=1383345&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
Tue Sep 11 10:48:40 2012
@@ -52,16 +52,16 @@ public class XmlPagesConfigManager imple
private static class PagesConfigImpl implements PagesConfig {
private List<Route> routes;
- private Map<String, PageFragment> pageFragments;
+ private Map<String, PageFragment> pages;
- public PagesConfigImpl(List<Route> routes, Map<String, PageFragment>
pageFragments) {
+ public PagesConfigImpl(List<Route> routes, Map<String, PageFragment>
pages) {
this.routes = routes;
- this.pageFragments = pageFragments;
+ this.pages = pages;
}
@Override
- public Map<String, PageFragment> getPageFragments() {
- return pageFragments;
+ public Map<String, PageFragment> getPages() {
+ return pages;
}
@Override
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java?rev=1383345&r1=1383344&r2=1383345&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
Tue Sep 11 10:48:40 2012
@@ -42,11 +42,11 @@ public class EnhancedPagesConfigManagerT
@Test
public void noExtensionsPageRoutesManager() throws Exception {
EnhancedPagesConfigManager enhancedPagesConfigManager =
(EnhancedPagesConfigManager)applicationContext.getBean("noExtensionsEnhancedPagesConfigManager");
- final Map<String,PageFragment> pageFragments =
enhancedPagesConfigManager.getConfig().getPageFragments();
+ final Map<String,PageFragment> pages =
enhancedPagesConfigManager.getConfig().getPages();
- assertEquals(1, pageFragments.size());
+ assertEquals(1, pages.size());
- final PageFragment pageDefinition = pageFragments.get("top");
+ final PageFragment pageDefinition = pages.get("top");
assertEquals("top", pageDefinition.getName());
assertNull(pageDefinition.getExtend());
assertNull(pageDefinition.getViewName());
@@ -58,7 +58,7 @@ public class EnhancedPagesConfigManagerT
@Test
public void singlePageExtensionPageRoutesManager() throws Exception {
EnhancedPagesConfigManager enhancedPagesConfigManager =
(EnhancedPagesConfigManager)applicationContext.getBean("singlePageExtensionEnhancedPagesConfigManager");
- final Map<String,PageFragment> pageDefinitions =
enhancedPagesConfigManager.getConfig().getPageFragments();
+ final Map<String,PageFragment> pageDefinitions =
enhancedPagesConfigManager.getConfig().getPages();
assertEquals(4, pageDefinitions.size());
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManagerTest.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/XmlPagesConfigManagerTest.java?rev=1383345&r1=1383344&r2=1383345&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManagerTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManagerTest.java
Tue Sep 11 10:48:40 2012
@@ -22,7 +22,7 @@ public class XmlPagesConfigManagerTest {
@Test
public void singleXmlPagesConfigManager() throws Exception {
XmlPagesConfigManager xmlPagesConfigManager =
(XmlPagesConfigManager)applicationContext.getBean("singleXmlPagesConfigManager");
- final Map<String,PageFragment> pageFragments =
xmlPagesConfigManager.getConfig().getPageFragments();
- assertEquals(1, pageFragments.size());
+ final Map<String,PageFragment> pages =
xmlPagesConfigManager.getConfig().getPages();
+ assertEquals(1, pages.size());
}
}
