Author: ate
Date: Mon Sep 10 19:10:48 2012
New Revision: 1383057
URL: http://svn.apache.org/viewvc?rev=1383057&view=rev
Log:
RAVE-694: more mvc config cleanup and name refactoring
Added:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java
- copied, changed from r1382970,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigManagerImpl.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/
- copied from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinition.java
- copied, changed from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinition.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.java
- copied, changed from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
- copied, changed from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
- copied, changed from r1382970,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java
- copied, changed from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoutes.java
- copied, changed from r1382970,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.java
Removed:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigManagerImpl.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/FilePageDefinition.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/FilePageDefinitions.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/FilePageFragment.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/FilePageRoutesManager.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/FileRoute.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/FileRoutes.java
Modified:
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/routes.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java
(from r1382970,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigManagerImpl.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?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigManagerImpl.java&r1=1382970&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigManagerImpl.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManager.java
Mon Sep 10 19:10:48 2012
@@ -20,23 +20,23 @@ package org.apache.rave.portal.web.mvc.c
/**
* <p>
- * This {@link PagesConfigManagerImpl} is about enhancing and validating
{@link PageDefinitions} and {@link PagesConfig}s.
+ * This {@link EnhancedPagesConfigManager} is about enhancing and validating
{@link PageDefinitions} and {@link PagesConfig}s.
* It takes a {@link PagesConfigManager} implementation as constructor
argument. Typically, this delegate {@link PagesConfigManager}
* gets its {@link PageDefinitions} and {@link Config} bootstrapped from
either file system sources,
* or sources stored in some repository, like {@link javax.jcr.Repository}.
* </p>
* <p>
- * This {@link PagesConfigManagerImpl} is agnostic about the backing storage,
but is targeting the glue between the
+ * 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
* </p>
*/
-public class PagesConfigManagerImpl implements PagesConfigManager {
+public class EnhancedPagesConfigManager implements PagesConfigManager {
private PagesConfigManager delegatee;
- public PagesConfigManagerImpl(PagesConfigManager delegatee) {
+ public EnhancedPagesConfigManager(PagesConfigManager delegatee) {
this.delegatee = delegatee;
}
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinition.java
(from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinition.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/XmlPageDefinition.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinition.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinition.java&r1=1382965&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinition.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinition.java
Mon Sep 10 19:10:48 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config.xml;
import javax.xml.bind.annotation.XmlRootElement;
@@ -27,12 +27,12 @@ import org.apache.rave.portal.web.mvc.co
* @version "$Id$"
*/
@XmlRootElement(name = "pageDefinition")
-public class FilePageDefinition extends FilePageFragment implements
PageDefinition {
+public class XmlPageDefinition extends XmlPageFragment implements
PageDefinition {
- public FilePageDefinition() {
+ public XmlPageDefinition() {
}
- public FilePageDefinition(String name) {
+ public XmlPageDefinition(String name) {
super(name);
}
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.java
(from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.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?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java&r1=1382965&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageDefinitions.java
Mon Sep 10 19:10:48 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config.xml;
import java.util.List;
@@ -33,9 +33,9 @@ import org.slf4j.LoggerFactory;
@XmlRootElement(name = "pageDefinitions")
-public class FilePageDefinitions implements PageDefinitions {
+public class XmlPageDefinitions implements PageDefinitions {
- private static final Logger log =
LoggerFactory.getLogger(FilePageDefinitions.class);
+ private static final Logger log =
LoggerFactory.getLogger(XmlPageDefinitions.class);
private String name;
private List<PageDefinition> pageDefinitions;
@@ -50,7 +50,7 @@ public class FilePageDefinitions impleme
this.name = name;
}
- @XmlElement(name = "pageDefinition", type = FilePageDefinition.class)
+ @XmlElement(name = "pageDefinition", type = XmlPageDefinition.class)
@Override
public List<PageDefinition> getPageDefinitions() {
return pageDefinitions;
@@ -60,7 +60,7 @@ public class FilePageDefinitions impleme
this.pageDefinitions = definitions;
}
- @XmlElement(name = "pageFragment", type = FilePageFragment.class)
+ @XmlElement(name = "pageFragment", type = XmlPageFragment.class)
public List<PageFragment> getPageFragments() {
return pageFragments;
}
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
(from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.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/XmlPageFragment.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.java&r1=1382965&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
Mon Sep 10 19:10:48 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config.xml;
import java.util.List;
@@ -31,7 +31,7 @@ import org.apache.rave.portal.web.mvc.co
* @version "$Id$"
*/
@XmlRootElement(name = "pageFragment")
-public class FilePageFragment implements PageFragment {
+public class XmlPageFragment implements PageFragment {
private String name;
private String description;
@@ -42,10 +42,10 @@ public class FilePageFragment implements
private List<PageFragment> children;
- public FilePageFragment() {
+ public XmlPageFragment() {
}
- public FilePageFragment(String name) {
+ public XmlPageFragment(String name) {
this.name = name;
}
@@ -70,7 +70,7 @@ public class FilePageFragment implements
}
- @XmlElementRef(name = "pageFragment", type = FilePageFragment.class)
+ @XmlElementRef(name = "pageFragment", type = XmlPageFragment.class)
@Override
public List<PageFragment> getChildren() {
return children;
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
(from r1382970,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.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?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.java&r1=1382970&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
Mon Sep 10 19:10:48 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config.xml;
import java.io.IOException;
import java.io.InputStream;
@@ -44,9 +44,9 @@ import org.springframework.core.io.Resou
/**
* @version "$Id$"
*/
-public class FilePageRoutesManager implements PagesConfigManager,
ResourceLoaderAware {
+public class XmlPagesConfigManager implements PagesConfigManager,
ResourceLoaderAware {
- private static Logger log =
LoggerFactory.getLogger(FilePageRoutesManager.class);
+ private static Logger log =
LoggerFactory.getLogger(XmlPagesConfigManager.class);
private static class PagesConfigImpl implements PagesConfig {
@@ -136,9 +136,9 @@ public class FilePageRoutesManager imple
if (is == null) {
throw new InvalidConfigurationException("Configuration
file not found for path: " + urlMappingsPath);
}
- JAXBContext context =
JAXBContext.newInstance(FileRoutes.class);
+ JAXBContext context = JAXBContext.newInstance(XmlRoutes.class);
Unmarshaller unmarshaller = context.createUnmarshaller();
- final FileRoutes routes = (FileRoutes)
unmarshaller.unmarshal(is);
+ final XmlRoutes routes = (XmlRoutes)
unmarshaller.unmarshal(is);
this.config = new PagesConfigImpl(routes.getRoutes(),
pageDefinitions.getPageDefinitions());
lastBuildTime = System.currentTimeMillis();
return this.config;
@@ -163,7 +163,7 @@ public class FilePageRoutesManager imple
if (is == null) {
throw new InvalidConfigurationException("Configuration file
not found for path: " + configurationPath);
}
- JAXBContext context =
JAXBContext.newInstance(FilePageDefinitions.class);
+ JAXBContext context =
JAXBContext.newInstance(XmlPageDefinitions.class);
Unmarshaller unmarshaller = context.createUnmarshaller();
return (PageDefinitions) unmarshaller.unmarshal(is);
} catch (JAXBException e) {
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java
(from r1382965,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.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/XmlRoute.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.java&r1=1382965&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoute.java
Mon Sep 10 19:10:48 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config.xml;
import java.util.List;
@@ -25,20 +25,18 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlElement;
import org.apache.rave.portal.web.mvc.config.Route;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @version "$Id$"
*/
-public class FileRoute implements Route {
+public class XmlRoute implements Route {
private String path;
private String target;
private String action;
private List<Route> children;
- public FileRoute() {
+ public XmlRoute() {
}
@@ -77,7 +75,7 @@ public class FileRoute implements Route
}
- @XmlElement(name = "route", type = FileRoute.class)
+ @XmlElement(name = "route", type = XmlRoute.class)
@Override
public List<Route> getChildren() {
return children;
@@ -92,7 +90,7 @@ public class FileRoute implements Route
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
- sb.append("FileRoute");
+ sb.append("XmlRoute");
sb.append("{path='").append(path).append('\'');
sb.append("{target='").append(target).append('\'');
sb.append("{action ='").append(action).append('\'');
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoutes.java
(from r1382970,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.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/XmlRoutes.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoutes.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.java&r1=1382970&r2=1383057&rev=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlRoutes.java
Mon Sep 10 19:10:48 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config.xml;
import java.util.List;
@@ -31,7 +31,7 @@ import org.apache.rave.portal.web.mvc.co
* @version "$Id$"
*/
@XmlRootElement(name = "routes")
-public class FileRoutes {
+public class XmlRoutes {
private String name;
private List<Route> routes;
@@ -45,7 +45,7 @@ public class FileRoutes {
this.name = name;
}
- @XmlElement(name = "route", type = FileRoute.class)
+ @XmlElement(name = "route", type = XmlRoute.class)
public List<Route> getRoutes() {
return routes;
}
@@ -57,7 +57,7 @@ public class FileRoutes {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
- sb.append("FileConfig");
+ sb.append("XmlRoutes");
sb.append(", name='").append(name).append('\'');
sb.append(", routes=").append(routes);
sb.append('}');
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/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/JaxbMappingsTest.java?rev=1383057&r1=1383056&r2=1383057&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java
Mon Sep 10 19:10:48 2012
@@ -25,7 +25,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.commons.io.IOUtils;
-import org.apache.rave.portal.web.mvc.config.file.FilePageDefinitions;
+import org.apache.rave.portal.web.mvc.config.xml.XmlPageDefinitions;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -40,15 +40,15 @@ public class JaxbMappingsTest {
@Test
public void testSinglePageDefintion() {
String testSrc = "singlePageDefinition.xml";
- final PageDefinitions filePageDefinitions =
loadPageConfiguration(testSrc);
+ final PageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(filePageDefinitions);
+ assertNotNull(xmlPageDefinitions);
- assertEquals("default", filePageDefinitions.getName());
- assertEquals(1, filePageDefinitions.getPageDefinitions().size());
- assertNull("There should be no standalone fragments in '" +
testSrc + "'.", ((FilePageDefinitions) filePageDefinitions).getPageFragments());
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(1, xmlPageDefinitions.getPageDefinitions().size());
+ assertNull("There should be no standalone fragments in '" +
testSrc + "'.", ((XmlPageDefinitions) xmlPageDefinitions).getPageFragments());
- final PageDefinition pageDefinition =
filePageDefinitions.getPageDefinitions().get(0);
+ final PageDefinition pageDefinition =
xmlPageDefinitions.getPageDefinitions().get(0);
assertEquals("top", pageDefinition.getName());
assertNull(pageDefinition.getExtend());
assertNull(pageDefinition.getViewName());
@@ -117,15 +117,15 @@ public class JaxbMappingsTest {
@Test
public void testMultiplPageDefintion() {
String testSrc = "multiplePageDefintion.xml";
- final PageDefinitions filePageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(filePageDefinitions);
+ final PageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
- assertEquals("default", filePageDefinitions.getName());
- assertEquals(2, filePageDefinitions.getPageDefinitions().size());
- assertNull("There should be no standalone fragments in
'"+testSrc+"'.", ((FilePageDefinitions)filePageDefinitions).getPageFragments());
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(2, xmlPageDefinitions.getPageDefinitions().size());
+ assertNull("There should be no standalone fragments in
'"+testSrc+"'.", ((XmlPageDefinitions)xmlPageDefinitions).getPageFragments());
{
- final PageDefinition pageDefinition =
filePageDefinitions.getPageDefinitions().get(0);
+ final PageDefinition pageDefinition =
xmlPageDefinitions.getPageDefinitions().get(0);
assertEquals("root-one", pageDefinition.getName());
assertNull(pageDefinition.getExtend());
assertNull(pageDefinition.getViewName());
@@ -134,7 +134,7 @@ public class JaxbMappingsTest {
}
{
- final PageDefinition pageDefinition =
filePageDefinitions.getPageDefinitions().get(1);
+ final PageDefinition pageDefinition =
xmlPageDefinitions.getPageDefinitions().get(1);
assertEquals("root-two", pageDefinition.getName());
assertNull(pageDefinition.getExtend());
assertNull(pageDefinition.getViewName());
@@ -146,12 +146,12 @@ public class JaxbMappingsTest {
@Test
public void testSinglePageFragment() {
String testSrc = "singlePageFragment.xml";
- final PageDefinitions filePageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(filePageDefinitions);
+ final PageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
- assertEquals("default", filePageDefinitions.getName());
- assertEquals(1,
((FilePageDefinitions)filePageDefinitions).getPageFragments().size());
- assertNull("There should be no pages in '"+testSrc+"'.",
filePageDefinitions.getPageDefinitions());
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(1,
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().size());
+ assertNull("There should be no pages in '" + testSrc + "'.",
xmlPageDefinitions.getPageDefinitions());
/*
* <pageFragment name="fragment-emptycontrollor" controller="">
@@ -159,7 +159,7 @@ public class JaxbMappingsTest {
* </pageFragment>
*/
{
- final PageFragment pageFragment =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
+ final PageFragment pageFragment =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(0);
assertEquals("fragment-emptycontrollor", pageFragment.getName());
assertNull(pageFragment.getExtend());
assertNull(pageFragment.getViewName());
@@ -179,21 +179,21 @@ public class JaxbMappingsTest {
@Test
public void testMultiplePageFragment() {
String testSrc = "multiplePageFragment.xml";
- final PageDefinitions filePageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(filePageDefinitions);
+ final PageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
- assertEquals("default", filePageDefinitions.getName());
- assertEquals(2,
((FilePageDefinitions)filePageDefinitions).getPageFragments().size());
- assertNull("There should be no pages in '"+testSrc+"'.",
filePageDefinitions.getPageDefinitions());
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(2,
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().size());
+ assertNull("There should be no pages in '" + testSrc + "'.",
xmlPageDefinitions.getPageDefinitions());
/*
* <pageFragment name="fragment1" />
* <pageFragment name="fragment2" />
*/
- final PageFragment fragment1 =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
+ final PageFragment fragment1 =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(0);
assertEquals("fragment1", fragment1.getName());
- final PageFragment fragment2 =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(1);
+ final PageFragment fragment2 =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(1);
assertEquals("fragment2", fragment2.getName());
}
@@ -201,39 +201,39 @@ public class JaxbMappingsTest {
@Test
public void testPageDefintionsAndRootPageFragments() {
String testSrc = "pageDefintionsAndRootPageFragments.xml";
- final PageDefinitions filePageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(filePageDefinitions);
+ final PageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
- assertEquals("default", filePageDefinitions.getName());
- assertEquals(2, filePageDefinitions.getPageDefinitions().size());
- assertEquals(1,
((FilePageDefinitions)filePageDefinitions).getPageFragments().size());
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(2, xmlPageDefinitions.getPageDefinitions().size());
+ assertEquals(1, ((XmlPageDefinitions)
xmlPageDefinitions).getPageFragments().size());
- final PageDefinition pageDefinition1 =
filePageDefinitions.getPageDefinitions().get(0);
+ final PageDefinition pageDefinition1 =
xmlPageDefinitions.getPageDefinitions().get(0);
assertEquals("root-one", pageDefinition1.getName());
- final PageDefinition pageDefinition2 =
filePageDefinitions.getPageDefinitions().get(1);
+ final PageDefinition pageDefinition2 =
xmlPageDefinitions.getPageDefinitions().get(1);
assertEquals("root-two", pageDefinition2.getName());
- final PageFragment fragment =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
+ final PageFragment fragment =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(0);
assertEquals("fragment", fragment.getName());
}
@Test
public void testSameNameSiblings() {
String testSrc = "sameNameSiblings.xml";
- final PageDefinitions filePageDefinitions =
loadPageConfiguration(testSrc);
- assertNotNull(filePageDefinitions);
+ final PageDefinitions xmlPageDefinitions =
loadPageConfiguration(testSrc);
+ assertNotNull(xmlPageDefinitions);
- assertEquals("default", filePageDefinitions.getName());
- assertEquals(2, filePageDefinitions.getPageDefinitions().size());
- assertEquals(2,
((FilePageDefinitions)filePageDefinitions).getPageFragments().size());
+ assertEquals("default", xmlPageDefinitions.getName());
+ assertEquals(2, xmlPageDefinitions.getPageDefinitions().size());
+ assertEquals(2, ((XmlPageDefinitions)
xmlPageDefinitions).getPageFragments().size());
- final PageDefinition pageDefinition1 =
filePageDefinitions.getPageDefinitions().get(0);
- final PageDefinition pageDefinition2 =
filePageDefinitions.getPageDefinitions().get(0);
+ final PageDefinition pageDefinition1 =
xmlPageDefinitions.getPageDefinitions().get(0);
+ final PageDefinition pageDefinition2 =
xmlPageDefinitions.getPageDefinitions().get(0);
assertTrue(pageDefinition1.getName().equals(pageDefinition2.getName()));
- final PageFragment fragment1 =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
- final PageFragment fragment2 =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
+ final PageFragment fragment1 =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(0);
+ final PageFragment fragment2 =
((XmlPageDefinitions)xmlPageDefinitions).getPageFragments().get(0);
assertTrue(fragment1.getName().equals(fragment2.getName()));
}
@@ -246,7 +246,7 @@ public class JaxbMappingsTest {
if (is == null) {
throw new InvalidConfigurationException("Configuration file
not found for path: " + testSrc);
}
- JAXBContext context =
JAXBContext.newInstance(FilePageDefinitions.class);
+ JAXBContext context =
JAXBContext.newInstance(XmlPageDefinitions.class);
Unmarshaller unmarshaller = context.createUnmarshaller();
return (PageDefinitions) unmarshaller.unmarshal(is);
} catch (JAXBException e) {
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml?rev=1383057&r1=1383056&r2=1383057&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
(original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
Mon Sep 10 19:10:48 2012
@@ -19,5 +19,5 @@
<routes name="default">
<route path="/mypage2" target="myPage"/>
- <route path="/mypageFoo" target="myPage" view="bar"/>
+ <route path="/mypageFoo" target="myPage" action="bar"/>
</routes>
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=1383057&r1=1383056&r2=1383057&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
Mon Sep 10 19:10:48 2012
@@ -42,11 +42,11 @@
<!-- FILE LOADING -->
<bean name="routedHandlerMapping"
class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping">
<property name="order" value="-1"/>
- <property name="routesManager" ref="filePageRoutesManager"/>
+ <property name="configManager" ref="xmlPagesConfigManager"/>
</bean>
- <bean id="filePageRoutesManager"
class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager">
+ <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"/>
</bean>
