Author: ard
Date: Tue Sep 11 09:58:00 2012
New Revision: 1383330
URL: http://svn.apache.org/viewvc?rev=1383330&view=rev
Log:
RAVE-695 some more naming alignments
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
- copied, changed from r1383307,
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/PageRoutesManagerImplTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/
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/
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/
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/
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/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/sameNameSiblings.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/config/xml/singlePageFragment.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/xml-pages-config-manager-test.xml
Removed:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/PageRoutesManagerImplTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageDefintion.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageFragment.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/pageDefintionsAndRootPageFragments.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/sameNameSiblings.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageFragment.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-routes-manager-impl-test-config.xml
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
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/resources/test-config.xml
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=1383330&r1=1383329&r2=1383330&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
Tue Sep 11 09:58:00 2012
@@ -153,15 +153,15 @@
<property name="configManager" ref="xmlPagesConfigManager"/>
<!--
<property name="configurationName" value="myConfiguration"/>
- <property name="configurationPath" value="/raveconfig"/>
+ <property name="pageDefinitionsPath" value="/raveconfig"/>
<property name="credentials" ref="jcrCredentials"/>
<property name="lazyRepositoryFactory" ref="lazyRepositoryFactory"/>
-->
</bean>
<bean id="xmlPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
- <property name="configurationPath" value="/WEB-INF/page-definitions.xml"/>
- <property name="urlMappingsPath" value="/WEB-INF/routes.xml"/>
+ <property name="routesPath" value="/WEB-INF/routes.xml"/>
+ <property name="pageDefinitionsPath"
value="/WEB-INF/page-definitions.xml"/>
<property name="refreshDelay" value="10000"/>
</bean>
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=1383330&r1=1383329&r2=1383330&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 09:58:00 2012
@@ -72,9 +72,9 @@ public class XmlPagesConfigManager imple
private ResourceLoader resourceLoader;
- private String urlMappingsPath;
+ private String routesPath;
- private String configurationPath;
+ private String pageDefinitionsPath;
// delay refresh in milliseconds
private long refreshDelay;
@@ -83,12 +83,12 @@ public class XmlPagesConfigManager imple
private volatile PagesConfig config;
private volatile long lastBuildTime;
- public void setUrlMappingsPath(final String urlMappingsPath) {
- this.urlMappingsPath = urlMappingsPath;
+ public void setRoutesPath(final String routesPath) {
+ this.routesPath = routesPath;
}
- public void setConfigurationPath(final String configurationPath) {
- this.configurationPath = configurationPath;
+ public void setPageDefinitionsPath(final String pageDefinitionsPath) {
+ this.pageDefinitionsPath = pageDefinitionsPath;
}
public void setRefreshDelay(long refreshDelay) {
@@ -118,8 +118,8 @@ public class XmlPagesConfigManager imple
// another thread already rebuilt the model. Return model
return config;
}
- if (StringUtils.isBlank(configurationPath) ||
StringUtils.isBlank(urlMappingsPath)) {
- throw new InvalidConfigurationException("Both
configurationPath and urlMappingsPath should be set " +
+ if (StringUtils.isBlank(pageDefinitionsPath) ||
StringUtils.isBlank(routesPath)) {
+ throw new InvalidConfigurationException("Both
pageDefinitionsPath and routesPath should be set " +
"to point to file location");
}
XmlPageDefinitions pageDefinitions = getPageDefinitions();
@@ -130,16 +130,16 @@ public class XmlPagesConfigManager imple
for (PageDefinition pd : pageDefinitions.getPageDefinitions()) {
pageDefinitionMap.put(pd.getName(), pd);
}
- log.info("Loading configuration: {}", urlMappingsPath);
+ log.info("Loading configuration: {}", routesPath);
InputStream is = null;
try {
try {
- Resource resource =
resourceLoader.getResource(urlMappingsPath);
+ Resource resource = resourceLoader.getResource(routesPath);
is = resource.getInputStream();
} catch (Exception ex) {
}
if (is == null) {
- throw new InvalidConfigurationException("Configuration
file not found for path: " + urlMappingsPath);
+ throw new InvalidConfigurationException("Configuration
file not found for path: " + routesPath);
}
JAXBContext context = JAXBContext.newInstance(XmlRoutes.class);
Unmarshaller unmarshaller = context.createUnmarshaller();
@@ -148,7 +148,7 @@ public class XmlPagesConfigManager imple
lastBuildTime = System.currentTimeMillis();
return this.config;
} catch (JAXBException e) {
- throw new InvalidConfigurationException("Error parsing
configuration file: " + urlMappingsPath, e);
+ throw new InvalidConfigurationException("Error parsing
configuration file: " + routesPath, e);
} finally {
IOUtils.closeQuietly(is);
}
@@ -156,23 +156,23 @@ public class XmlPagesConfigManager imple
}
public XmlPageDefinitions getPageDefinitions() {
- log.info("Loading configuration: {}", configurationPath);
+ log.info("Loading configuration: {}", pageDefinitionsPath);
InputStream is = null;
try {
try {
- Resource resource =
resourceLoader.getResource(configurationPath);
+ Resource resource =
resourceLoader.getResource(pageDefinitionsPath);
is = resource.getInputStream();
} catch (Exception ex) {
}
if (is == null) {
- throw new InvalidConfigurationException("Configuration file
not found for path: " + configurationPath);
+ throw new InvalidConfigurationException("Configuration file
not found for path: " + pageDefinitionsPath);
}
JAXBContext context =
JAXBContext.newInstance(XmlPageDefinitions.class);
Unmarshaller unmarshaller = context.createUnmarshaller();
return (XmlPageDefinitions) unmarshaller.unmarshal(is);
} catch (JAXBException e) {
- throw new InvalidConfigurationException("Error parsing
configuration file: " + configurationPath, e);
+ throw new InvalidConfigurationException("Error parsing
configuration file: " + pageDefinitionsPath, e);
} finally {
IOUtils.closeQuietly(is);
}
@@ -180,11 +180,11 @@ public class XmlPagesConfigManager imple
public long lastModified() {
try {
- Resource resource1 = resourceLoader.getResource(urlMappingsPath);
+ Resource resource1 = resourceLoader.getResource(routesPath);
if (resource1 == null || !resource1.exists()) {
return 0;
}
- Resource resource2 = resourceLoader.getResource(configurationPath);
+ Resource resource2 =
resourceLoader.getResource(pageDefinitionsPath);
if (resource2 == null || !resource2.exists()) {
return 0;
}
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
(from r1383307,
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/PageRoutesManagerImplTest.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?p2=rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/PageRoutesManagerImplTest.java&r1=1383307&r2=1383330&rev=1383330&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/PageRoutesManagerImplTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
Tue Sep 11 09:58:00 2012
@@ -17,12 +17,10 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc;
+package org.apache.rave.portal.web.mvc.config;
import java.util.Map;
-import org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +33,8 @@ import static org.junit.Assert.assertNul
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({"classpath:page-routes-manager-impl-test-config.xml"})
-public class PageRoutesManagerImplTest {
+@ContextConfiguration({"classpath:config/enhanced-pages-config-manager-test.xml"})
+public class EnhancedPagesConfigManagerTest {
@Autowired
private ApplicationContext applicationContext;
Added:
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=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,260 @@
+/*
+ * 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 java.io.InputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+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;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+
+public class JaxbMappingsTest {
+
+ final static String TEST_CONFIG_PATH_JAXB_MAPPINGS = "jaxbmappings";
+ @Test
+ public void testSinglePageDefintion() {
+ String testSrc = "singlePageDefinition.xml";
+ final XmlPageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+
+ assertNotNull(xmlPageDefinitions);
+
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(1, xmlPageDefinitions.getPageDefinitions().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());
+
+ /*
+ * first child we expect :
+ * <pageFragment name="sub1-nocontroller" />
+ */
+ {
+ final PageFragment sub1 = pageDefinition.getChildren().get(0);
+ assertEquals("sub1-nocontroller", sub1.getName());
+ assertNull(sub1.getController());
+ assertNull(sub1.getExtend());
+ assertNull(sub1.getViewName());
+ assertNull(sub1.getChildren());
+ }
+
+ /*
+ * second child we expect :
+ * <pageFragment name="sub2-emptycontrollor" controller="">
+ * <pageFragment name="sub2sub1-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
+ * </pageFragment>
+ */
+ {
+ final PageFragment sub2 = pageDefinition.getChildren().get(1);
+ assertEquals("sub2-emptycontrollor", sub2.getName());
+ assertEquals("",sub2.getController());
+ assertNull(sub2.getExtend());
+ assertNull(sub2.getViewName());
+ assertEquals( 1, sub2.getChildren().size());
+
+ final PageFragment sub2sub1 = sub2.getChildren().get(0);
+ assertEquals("sub2sub1-withcontroller", sub2sub1.getName());
+
assertEquals("org.apache.rave.unittest.NonExistingController",sub2sub1.getController());
+ assertNull(sub2sub1.getExtend());
+ assertNull(sub2sub1.getViewName());
+ assertNull(sub2sub1.getChildren());
+ }
+
+ /*
+ * third child we expect :
+ * <pageFragment name="sub3-withcontroller-withview"
view="pages/test" controller="org.apache.rave.unittest.NonExistingController">
+ * <pageFragment name="sub3sub1-withextend"
extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ * </pageFragment>
+ */
+ {
+ final PageFragment sub3 = pageDefinition.getChildren().get(2);
+ assertEquals("sub3-withcontroller-withview", sub3.getName());
+
assertEquals("org.apache.rave.unittest.NonExistingController",sub3.getController());
+ assertNull(sub3.getExtend());
+ assertEquals("pages/test", sub3.getViewName());
+ assertEquals( 1, sub3.getChildren().size());
+
+ final PageFragment sub3sub1 = sub3.getChildren().get(0);
+ assertEquals("sub3sub1-withextend", sub3sub1.getName());
+
assertEquals("org.apache.rave.unittest.NonExistingController",sub3sub1.getController());
+ assertEquals("some/fragment", sub3sub1.getExtend());
+ assertNull(sub3sub1.getViewName());
+ assertNull(sub3sub1.getChildren());
+ }
+
+ }
+
+ @Test
+ public void testMultiplPageDefintion() {
+ String testSrc = "multiplePageDefintion.xml";
+ final XmlPageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
+
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(2, xmlPageDefinitions.getPageDefinitions().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 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());
+ assertNull(pageFragment.getExtend());
+ assertNull(pageFragment.getViewName());
+ assertEquals("", 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
+ public void testSameNameSiblings() {
+ String testSrc = "sameNameSiblings.xml";
+ final XmlPageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
+
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(2, xmlPageDefinitions.getPageDefinitions().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 fragment1 =
xmlPageDefinitions.getPageFragments().get(0);
+ final PageFragment fragment2 =
xmlPageDefinitions.getPageFragments().get(0);
+ assertTrue(fragment1.getName().equals(fragment2.getName()));
+ }
+
+ public static XmlPageDefinitions loadPageConfiguration(String configPath) {
+ InputStream is = null;
+ String testSrc = TEST_CONFIG_PATH_JAXB_MAPPINGS + "/" + configPath;
+ try {
+
+ is =
JaxbMappingsTest.class.getClassLoader().getResourceAsStream(testSrc);
+ if (is == null) {
+ throw new InvalidConfigurationException("Configuration file
not found for path: " + testSrc);
+ }
+ JAXBContext context =
JAXBContext.newInstance(XmlPageDefinitions.class);
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ return (XmlPageDefinitions) unmarshaller.unmarshal(is);
+ } catch (JAXBException e) {
+ throw new InvalidConfigurationException("Error parsing
configuration file: " + testSrc, e);
+ } finally {
+ IOUtils.closeQuietly(is);
+ }
+ }
+}
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml?rev=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,79 @@
+<!--
+ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+
+ <bean id="noExtensionsEnhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/noExtensionsPageDefinitions.xml"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="singlePageExtensionEnhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/singlePageExtensionPageDefinitions.xml"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="hierarchicalMultiplePageExtensionEnhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/hierarchicalMultiplePageExtension.xml"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="complexExtensionsEnhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/complexExtensionsPageRoutesManager.xml"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="recursiveExtensionsEnhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/recursiveExtensionsPageRoutesManager.xml"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="pageFragmentExtensionsEnhancedPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.EnhancedPagesConfigManager">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/pageFragmentExtensionsPageRoutesManager.xml"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+</beans>
+
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml?rev=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <!--
+ STANDARD PAGE (HAS NO PARENT)
+ -->
+ <pageDefinition 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="">
+ <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" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ </pageFragment>
+ </pageDefinition>
+
+</pageDefinitions>
\ No newline at end of file
Added:
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=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/routes.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,23 @@
+<!--
+ 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.
+ -->
+
+<routes name="default">
+ <route path="/mypage2" target="myPage"/>
+ <route path="/mypageFoo" target="myPage" view="bar"/>
+</routes>
Added:
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=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <!--
+ STANDARD PAGE (HAS NO PARENT)
+ -->
+ <pageDefinition 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="">
+ <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" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ </pageFragment>
+ </pageDefinition>
+
+
+ <pageDefinition name="home" extend="top" description="Page that is being
extended by other pages"
+ controller="org.apache.rave.unittest.NonExistingController">
+ </pageDefinition>
+
+
+ <pageDefinition name="agenda" extend="top" description="Page that is being
extended by other pages"
+ controller="org.apache.rave.unittest.NonExistingController">
+ <pageFragment name="sub4-nocontroller"/>
+ </pageDefinition>
+
+
+ <pageDefinition 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>
+
+
+
+
+
+</pageDefinitions>
\ No newline at end of file
Added:
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=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageDefintion.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <pageDefinition name="root-one" description="Page that is being extended by
other pages"
+ controller="org.apache.rave.unittest.NonExistingController">
+ <pageFragment name="sub1-nocontroller"/>
+
+ </pageDefinition>
+
+ <pageDefinition name="root-two" description="Page that is being extended by
other pages"
+ controller="org.apache.rave.unittest.NonExistingController">
+ <pageFragment name="sub1-nocontroller"/>
+ </pageDefinition>
+
+</pageDefinitions>
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageFragment.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageFragment.xml?rev=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageFragment.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/multiplePageFragment.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <pageFragment name="fragment1" />
+ <pageFragment name="fragment2" />
+</pageDefinitions>
\ No newline at end of file
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/pageDefintionsAndRootPageFragments.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/pageDefintionsAndRootPageFragments.xml?rev=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/pageDefintionsAndRootPageFragments.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/pageDefintionsAndRootPageFragments.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <pageDefinition name="root-one" description="Page that is being extended by
other pages"
+ controller="org.apache.rave.unittest.NonExistingController">
+ <pageFragment name="fragment"/>
+ </pageDefinition>
+
+ <pageDefinition name="root-two" description="Page that is being extended by
other pages"
+ controller="org.apache.rave.unittest.NonExistingController">
+ <pageFragment name="fragment"/>
+ </pageDefinition>
+
+ <pageFragment name="fragment" controller="">
+ <pageFragment name="fragmentsub"
controller="org.apache.rave.unittest.NonExistingController"/>
+ </pageFragment>
+
+</pageDefinitions>
Added:
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=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/sameNameSiblings.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <pageDefinition 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>
+
+ <pageDefinition 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 name="fragment" />
+ <pageFragment name="fragment" />
+
+</pageDefinitions>
\ No newline at end of file
Added:
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=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <!--
+ STANDARD PAGE (HAS NO PARENT)
+ -->
+ <pageDefinition 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="">
+ <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" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ </pageFragment>
+ </pageDefinition>
+
+</pageDefinitions>
\ No newline at end of file
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageFragment.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageFragment.xml?rev=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageFragment.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageFragment.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<pageDefinitions name="default">
+ <pageFragment name="fragment-emptycontrollor" controller="">
+ <pageFragment name="fragmentsub-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
+ </pageFragment>
+</pageDefinitions>
\ No newline at end of file
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/xml-pages-config-manager-test.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/xml-pages-config-manager-test.xml?rev=1383330&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/xml-pages-config-manager-test.xml
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/xml-pages-config-manager-test.xml
Tue Sep 11 09:58:00 2012
@@ -0,0 +1,34 @@
+<!--
+ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+ <bean id="singleXmlPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/xml/singlePageDefinition.xml"/>
+ </bean>
+
+ <bean id="snsXmlPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
+ <property name="routesPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/xml/sameNameSiblings.xml"/>
+ </bean>
+
+</beans>
+
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml?rev=1383330&r1=1383329&r2=1383330&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Tue Sep 11 09:58:00 2012
@@ -46,8 +46,8 @@
</bean>
<bean id="xmlPagesConfigManager"
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
- <property name="configurationPath" value="classpath:page-definitions.xml"/>
- <property name="urlMappingsPath" value="classpath:routes.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:page-definitions.xml"/>
+ <property name="routesPath" value="classpath:routes.xml"/>
</bean>
<bean name="unroutedHandlerMapping"
class="org.apache.rave.portal.web.mvc.UnRoutedRequestMappingHandlerMapping">
