Author: ard
Date: Tue Sep 11 10:30:46 2012
New Revision: 1383336
URL: http://svn.apache.org/viewvc?rev=1383336&view=rev
Log:
RAVE-695 getting rid of PageDefinitions : They are PageFragments just as well,
only don't have a parent. Still need to introduce the concept of 'abstract'
Removed:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageDefinition.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinition.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageFragment.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/pageDefintionsAndRootPageFragments.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageFragment.xml
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/EnhancedPagesConfigManager.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/XmlPageDefinitions.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/JaxbMappingsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManagerTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
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=1383336&r1=1383335&r2=1383336&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:30:46 2012
@@ -22,7 +22,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.apache.rave.portal.web.mvc.config.PagesConfig;
import org.apache.rave.portal.web.mvc.config.Route;
@@ -40,7 +39,7 @@ public class NestedHandlerMethodHandlerM
protected void processRoute(Route route) {
if (!StringUtils.isEmpty(route.getTarget())) {
PagesConfig pageConfig = (PagesConfig)getConfig();
- PageDefinition pageDefinition =
pageConfig.getPageDefinitions().get(route.getTarget());
+ PageFragment pageDefinition =
pageConfig.getPageFragments().get(route.getTarget());
if (pageDefinition != null) {
Class<?> controllerClass =
getControllerClass(pageDefinition.getController());
if (controllerClass != null) {
@@ -61,7 +60,7 @@ public class NestedHandlerMethodHandlerM
}
}
- protected void registerPageHandlerMethod(PageDefinition pageDefinition,
Object handler, Method method, RequestMappingInfo mapping, String action) {
+ protected void registerPageHandlerMethod(PageFragment pageDefinition,
Object handler, Method method, RequestMappingInfo mapping, String action) {
NestedHandlerMethod nestedHandlerMethod =
getNestedHandlerMethodForFragment(handler, method, pageDefinition, action);
registerHandlerMethod(handler, method, mapping);
// replace default HandlerMethod with our own nestedHandlerMethod
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java?rev=1383336&r1=1383335&r2=1383336&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java
Tue Sep 11 10:30:46 2012
@@ -20,15 +20,15 @@ package org.apache.rave.portal.web.mvc.c
/**
* <p>
- * This {@link EnhancedPagesConfigManager} is about enhancing and validating
{@link PageDefinition}s and {@link PagesConfig}s.
+ * This {@link EnhancedPagesConfigManager} is about enhancing and validating
{@link PageFragment}s and {@link PagesConfig}s.
* It takes a {@link PagesConfigManager} implementation as constructor
argument. Typically, this delegate {@link PagesConfigManager}
- * gets its {@link PageDefinition}s and {@link Config} bootstrapped from
either file system sources,
+ * gets its {@link PageFragment}s and {@link Config} bootstrapped from either
file system sources,
* or sources stored in some repository, like {@link javax.jcr.Repository}.
* </p>
* <p>
* This {@link EnhancedPagesConfigManager} is agnostic about the backing
storage, but is targeting the glue between the
- * {@link Route} and {@link PageDefinition}s and about the enhancement like
resolving
- * the <code>extend</code> logic of the {@link PageDefinition}s and {@link
PageFragment}s of the
+ * {@link Route} and {@link PageFragment}s and about the enhancement like
resolving
+ * the <code>extend</code> logic of the {@link PageFragment}s and {@link
PageFragment}s of the
* </p>
*/
public class EnhancedPagesConfigManager implements PagesConfigManager {
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=1383336&r1=1383335&r2=1383336&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:30:46 2012
@@ -22,5 +22,5 @@ import java.util.Map;
public interface PagesConfig extends Config {
- Map<String, PageDefinition> getPageDefinitions();
+ Map<String, PageFragment> getPageFragments();
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.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/XmlPageDefinitions.java?rev=1383336&r1=1383335&r2=1383336&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.java
Tue Sep 11 10:30:46 2012
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
import org.apache.rave.portal.web.mvc.config.PageFragment;
@@ -34,7 +33,6 @@ public class XmlPageDefinitions {
private String name;
- private List<PageDefinition> pageDefinitions;
private List<PageFragment> pageFragments;
@XmlAttribute
@@ -46,15 +44,6 @@ public class XmlPageDefinitions {
this.name = name;
}
- @XmlElement(name = "pageDefinition", type = XmlPageDefinition.class)
- public List<PageDefinition> getPageDefinitions() {
- return pageDefinitions;
- }
-
- public void setPageDefinitions(List<PageDefinition> definitions) {
- this.pageDefinitions = definitions;
- }
-
@XmlElement(name = "pageFragment", type = XmlPageFragment.class)
public List<PageFragment> getPageFragments() {
return pageFragments;
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=1383336&r1=1383335&r2=1383336&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:30:46 2012
@@ -32,7 +32,7 @@ import javax.xml.bind.Unmarshaller;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
+import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.apache.rave.portal.web.mvc.config.PagesConfig;
import org.apache.rave.portal.web.mvc.config.PagesConfigManager;
import org.apache.rave.portal.web.mvc.config.Route;
@@ -52,16 +52,16 @@ public class XmlPagesConfigManager imple
private static class PagesConfigImpl implements PagesConfig {
private List<Route> routes;
- private Map<String, PageDefinition> pageDefinitions;
+ private Map<String, PageFragment> pageFragments;
- public PagesConfigImpl(List<Route> routes, Map<String, PageDefinition>
pageDefinitions) {
+ public PagesConfigImpl(List<Route> routes, Map<String, PageFragment>
pageFragments) {
this.routes = routes;
- this.pageDefinitions = pageDefinitions;
+ this.pageFragments = pageFragments;
}
@Override
- public Map<String, PageDefinition> getPageDefinitions() {
- return pageDefinitions;
+ public Map<String, PageFragment> getPageFragments() {
+ return pageFragments;
}
@Override
@@ -126,8 +126,8 @@ public class XmlPagesConfigManager imple
if (pageDefinitions == null) {
throw new InvalidConfigurationException("Provided
PageDefinitions was null");
}
- Map<String, PageDefinition> pageDefinitionMap = new
HashMap<String, PageDefinition>();
- for (PageDefinition pd : pageDefinitions.getPageDefinitions()) {
+ Map<String, PageFragment> pageDefinitionMap = new HashMap<String,
PageFragment>();
+ for (PageFragment pd : pageDefinitions.getPageFragments()) {
pageDefinitionMap.put(pd.getName(), pd);
}
log.info("Loading configuration: {}", routesPath);
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=1383336&r1=1383335&r2=1383336&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:30:46 2012
@@ -42,11 +42,11 @@ public class EnhancedPagesConfigManagerT
@Test
public void noExtensionsPageRoutesManager() throws Exception {
EnhancedPagesConfigManager enhancedPagesConfigManager =
(EnhancedPagesConfigManager)applicationContext.getBean("noExtensionsEnhancedPagesConfigManager");
- final Map<String,PageDefinition> pageDefinitions =
enhancedPagesConfigManager.getConfig().getPageDefinitions();
+ final Map<String,PageFragment> pageFragments =
enhancedPagesConfigManager.getConfig().getPageFragments();
- assertEquals(1, pageDefinitions.size());
+ assertEquals(1, pageFragments.size());
- final PageDefinition pageDefinition = pageDefinitions.get(0);
+ final PageFragment pageDefinition = pageFragments.get(0);
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,PageDefinition> pageDefinitions =
enhancedPagesConfigManager.getConfig().getPageDefinitions();
+ final Map<String,PageFragment> pageDefinitions =
enhancedPagesConfigManager.getConfig().getPageFragments();
assertEquals(4, pageDefinitions.size());
}
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=1383336&r1=1383335&r2=1383336&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
Tue Sep 11 10:30:46 2012
@@ -26,7 +26,6 @@ import javax.xml.bind.Unmarshaller;
import org.apache.commons.io.IOUtils;
import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.junit.Test;
@@ -47,22 +46,22 @@ public class JaxbMappingsTest {
assertNotNull(xmlPageDefinitions);
assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(1, xmlPageDefinitions.getPageDefinitions().size());
+ assertEquals(1, xmlPageDefinitions.getPageFragments().size());
assertNull("There should be no standalone fragments in '" +
testSrc + "'.", xmlPageDefinitions.getPageFragments());
- final PageDefinition pageDefinition =
xmlPageDefinitions.getPageDefinitions().get(0);
- assertEquals("top", pageDefinition.getName());
- assertNull(pageDefinition.getExtend());
- assertNull(pageDefinition.getViewName());
- assertEquals("org.apache.rave.unittest.NonExistingController",
pageDefinition.getController());
- assertEquals(3, pageDefinition.getChildren().size());
+ final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(0);
+ assertEquals("top", pageFragment.getName());
+ assertNull(pageFragment.getExtend());
+ assertNull(pageFragment.getViewName());
+ assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragment.getController());
+ assertEquals(3, pageFragment.getChildren().size());
/*
* first child we expect :
* <pageFragment name="sub1-nocontroller" />
*/
{
- final PageFragment sub1 = pageDefinition.getChildren().get(0);
+ final PageFragment sub1 = pageFragment.getChildren().get(0);
assertEquals("sub1-nocontroller", sub1.getName());
assertNull(sub1.getController());
assertNull(sub1.getExtend());
@@ -77,7 +76,7 @@ public class JaxbMappingsTest {
* </pageFragment>
*/
{
- final PageFragment sub2 = pageDefinition.getChildren().get(1);
+ final PageFragment sub2 = pageFragment.getChildren().get(1);
assertEquals("sub2-emptycontrollor", sub2.getName());
assertEquals("",sub2.getController());
assertNull(sub2.getExtend());
@@ -99,7 +98,7 @@ public class JaxbMappingsTest {
* </pageFragment>
*/
{
- final PageFragment sub3 = pageDefinition.getChildren().get(2);
+ final PageFragment sub3 = pageFragment.getChildren().get(2);
assertEquals("sub3-withcontroller-withview", sub3.getName());
assertEquals("org.apache.rave.unittest.NonExistingController",sub3.getController());
assertNull(sub3.getExtend());
@@ -123,101 +122,26 @@ public class JaxbMappingsTest {
assertNotNull(xmlPageDefinitions);
assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(2, xmlPageDefinitions.getPageDefinitions().size());
+ assertEquals(2, xmlPageDefinitions.getPageFragments().size());
assertNull("There should be no standalone fragments in
'"+testSrc+"'.", xmlPageDefinitions.getPageFragments());
{
- final PageDefinition pageDefinition =
xmlPageDefinitions.getPageDefinitions().get(0);
- assertEquals("root-one", pageDefinition.getName());
- assertNull(pageDefinition.getExtend());
- assertNull(pageDefinition.getViewName());
- assertEquals("org.apache.rave.unittest.NonExistingController",
pageDefinition.getController());
- assertEquals(1, pageDefinition.getChildren().size());
+ final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(0);
+ assertEquals("root-one", pageFragment.getName());
+ assertNull(pageFragment.getExtend());
+ assertNull(pageFragment.getViewName());
+ assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragment.getController());
+ assertEquals(1, pageFragment.getChildren().size());
}
{
- final PageDefinition pageDefinition =
xmlPageDefinitions.getPageDefinitions().get(1);
- assertEquals("root-two", pageDefinition.getName());
- assertNull(pageDefinition.getExtend());
- assertNull(pageDefinition.getViewName());
- assertEquals("org.apache.rave.unittest.NonExistingController",
pageDefinition.getController());
- assertEquals(1, pageDefinition.getChildren().size());
- }
- }
-
- @Test
- public void testSinglePageFragment() {
- String testSrc = "singlePageFragment.xml";
- final XmlPageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(xmlPageDefinitions);
-
- assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(1, xmlPageDefinitions.getPageFragments().size());
- assertNull("There should be no pages in '" + testSrc + "'.",
xmlPageDefinitions.getPageDefinitions());
-
- /*
- * <pageFragment name="fragment-emptycontrollor" controller="">
- * <pageFragment name="fragmentsub-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
- * </pageFragment>
- */
- {
- final PageFragment pageFragment =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(0);
- assertEquals("fragment-emptycontrollor", pageFragment.getName());
+ final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(1);
+ assertEquals("root-two", pageFragment.getName());
assertNull(pageFragment.getExtend());
assertNull(pageFragment.getViewName());
- assertEquals("", pageFragment.getController());
+ assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragment.getController());
assertEquals(1, pageFragment.getChildren().size());
-
- final PageFragment pageFragmentSub =
pageFragment.getChildren().get(0);
- assertEquals("fragmentsub-withcontroller",
pageFragmentSub.getName());
- assertNull(pageFragmentSub.getExtend());
- assertNull(pageFragmentSub.getViewName());
- assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragmentSub.getController());
- assertNull(pageFragmentSub.getChildren());
}
-
- }
-
- @Test
- public void testMultiplePageFragment() {
- String testSrc = "multiplePageFragment.xml";
- final XmlPageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(xmlPageDefinitions);
-
- assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(2, xmlPageDefinitions.getPageFragments().size());
- assertNull("There should be no pages in '" + testSrc + "'.",
xmlPageDefinitions.getPageDefinitions());
-
- /*
- * <pageFragment name="fragment1" />
- * <pageFragment name="fragment2" />
- */
- final PageFragment fragment1 =
xmlPageDefinitions.getPageFragments().get(0);
- assertEquals("fragment1", fragment1.getName());
-
- final PageFragment fragment2 =
xmlPageDefinitions.getPageFragments().get(1);
- assertEquals("fragment2", fragment2.getName());
- }
-
-
- @Test
- public void testPageDefintionsAndRootPageFragments() {
- String testSrc = "pageDefintionsAndRootPageFragments.xml";
- final XmlPageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(xmlPageDefinitions);
-
- assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(2, xmlPageDefinitions.getPageDefinitions().size());
- assertEquals(1, xmlPageDefinitions.getPageFragments().size());
-
- final PageDefinition pageDefinition1 =
xmlPageDefinitions.getPageDefinitions().get(0);
- assertEquals("root-one", pageDefinition1.getName());
-
- final PageDefinition pageDefinition2 =
xmlPageDefinitions.getPageDefinitions().get(1);
- assertEquals("root-two", pageDefinition2.getName());
-
- final PageFragment fragment =
xmlPageDefinitions.getPageFragments().get(0);
- assertEquals("fragment", fragment.getName());
}
@Test
@@ -227,12 +151,12 @@ public class JaxbMappingsTest {
assertNotNull(xmlPageDefinitions);
assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(2, xmlPageDefinitions.getPageDefinitions().size());
+ assertEquals(2, xmlPageDefinitions.getPageFragments().size());
assertEquals(2, xmlPageDefinitions.getPageFragments().size());
- final PageDefinition pageDefinition1 =
xmlPageDefinitions.getPageDefinitions().get(0);
- final PageDefinition pageDefinition2 =
xmlPageDefinitions.getPageDefinitions().get(0);
-
assertTrue(pageDefinition1.getName().equals(pageDefinition2.getName()));
+ final PageFragment pageFragment1 =
xmlPageDefinitions.getPageFragments().get(0);
+ final PageFragment pageFragment2 =
xmlPageDefinitions.getPageFragments().get(0);
+ assertTrue(pageFragment1.getName().equals(pageFragment2.getName()));
final PageFragment fragment1 =
xmlPageDefinitions.getPageFragments().get(0);
final PageFragment fragment2 =
xmlPageDefinitions.getPageFragments().get(0);
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=1383336&r1=1383335&r2=1383336&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:30:46 2012
@@ -2,8 +2,7 @@ package org.apache.rave.portal.web.mvc.c
import java.util.Map;
-import org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
+import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +22,7 @@ public class XmlPagesConfigManagerTest {
@Test
public void singleXmlPagesConfigManager() throws Exception {
XmlPagesConfigManager xmlPagesConfigManager =
(XmlPagesConfigManager)applicationContext.getBean("singleXmlPagesConfigManager");
- final Map<String,PageDefinition> pageDefinitions =
xmlPagesConfigManager.getConfig().getPageDefinitions();
-
- assertEquals(1, pageDefinitions.size());
+ final Map<String,PageFragment> pageFragments =
xmlPagesConfigManager.getConfig().getPageFragments();
+ assertEquals(1, pageFragments.size());
}
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml?rev=1383336&r1=1383335&r2=1383336&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
Tue Sep 11 10:30:46 2012
@@ -21,7 +21,7 @@
<!--
STANDARD PAGE (HAS NO PARENT)
-->
- <pageDefinition name="standard" description="Page that is being extended by
other pages"
+ <pageFragment name="standard" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub1-nocontroller"/>
<pageFragment name="sub2-emptycontrollor" controller="">
@@ -30,26 +30,26 @@
<pageFragment name="sub3-withcontroller-withview" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub3sub1-withextend" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
- </pageDefinition>
+ </pageFragment>
- <pageDefinition name="home" extend="top" description="Page that is being
extended by other pages"
+ <pageFragment name="home" extend="top" description="Page that is being
extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
- </pageDefinition>
+ </pageFragment>
- <pageDefinition name="agenda" extend="top" description="Page that is being
extended by other pages"
+ <pageFragment name="agenda" extend="top" description="Page that is being
extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub4-nocontroller"/>
- </pageDefinition>
+ </pageFragment>
- <pageDefinition name="news" extend="top" description="Page that is being
extended by other pages"
+ <pageFragment name="news" extend="top" description="Page that is being
extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub2-emptycontrollor"
controller="org.apache.rave.unittest.NonExistingNewsController">
<pageFragment name="news" />
</pageFragment>
- </pageDefinition>
+ </pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml?rev=1383336&r1=1383335&r2=1383336&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml
Tue Sep 11 10:30:46 2012
@@ -18,15 +18,15 @@
under the License.
-->
<pageDefinitions name="default">
- <pageDefinition name="root-one" description="Page that is being extended by
other pages"
+ <pageFragment name="root-one" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub1-nocontroller"/>
- </pageDefinition>
+ </pageFragment>
- <pageDefinition name="root-two" description="Page that is being extended by
other pages"
+ <pageFragment name="root-two" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub1-nocontroller"/>
- </pageDefinition>
+ </pageFragment>
</pageDefinitions>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml?rev=1383336&r1=1383335&r2=1383336&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml
Tue Sep 11 10:30:46 2012
@@ -18,19 +18,19 @@
under the License.
-->
<pageDefinitions name="default">
- <pageDefinition name="top" description="Page that is being extended by other
pages"
+ <pageFragment name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub" />
<pageFragment name="sub" />
<pageFragment name="sub" />
- </pageDefinition>
+ </pageFragment>
- <pageDefinition name="top" description="Page that is being extended by other
pages"
+ <pageFragment name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub" />
<pageFragment name="sub" />
<pageFragment name="sub" />
- </pageDefinition>
+ </pageFragment>
<pageFragment name="fragment" />
<pageFragment name="fragment" />
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=1383336&r1=1383335&r2=1383336&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
Tue Sep 11 10:30:46 2012
@@ -21,7 +21,7 @@
<!--
STANDARD PAGE (HAS NO PARENT)
-->
- <pageDefinition name="top" description="Page that is being extended by other
pages"
+ <pageFragment name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub1-nocontroller"/>
<pageFragment name="sub2-emptycontrollor" controller="">
@@ -30,6 +30,6 @@
<pageFragment name="sub3-withcontroller-withview" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub3sub1-withextend" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
- </pageDefinition>
+ </pageFragment>
</pageDefinitions>
\ No newline at end of file
