Author: marijan
Date: Thu Jul 5 09:20:21 2012
New Revision: 1357513
URL: http://svn.apache.org/viewvc?rev=1357513&view=rev
Log:
RAVE-701 Provide a simple filesystem based url to page definition mapping (xml,
json)
- populate rendering
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/url/RenderMapping.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/url/FileUrlConfigDaoTest.java
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/url/RenderMapping.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/url/RenderMapping.java?rev=1357513&r1=1357512&r2=1357513&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/url/RenderMapping.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/url/RenderMapping.java
Thu Jul 5 09:20:21 2012
@@ -22,6 +22,7 @@ package org.apache.rave.portal.web.model
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -35,10 +36,12 @@ public class RenderMapping {
private String name;
private String path;
+ @XmlAttribute
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
@@ -47,6 +50,7 @@ public class RenderMapping {
return path;
}
+ @XmlAttribute
public void setPath(String path) {
this.path = path;
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/url/FileUrlConfigDaoTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/url/FileUrlConfigDaoTest.java?rev=1357513&r1=1357512&r2=1357513&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/url/FileUrlConfigDaoTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/url/FileUrlConfigDaoTest.java
Thu Jul 5 09:20:21 2012
@@ -57,10 +57,21 @@ public class FileUrlConfigDaoTest {
assertEquals(1, userKids.size());
UrlMapping userAdminMapping = userKids.get(0);
final List<UrlMapping> children = userAdminMapping.getChildren();
+ UrlMapping withRendering = null;
for (UrlMapping child : children) {
assertTrue(child.getParent() != null);
+ if (child.getUrl().equals("edit")) {
+ withRendering = child;
+ }
}
assertEquals(3, children.size());
+ assertTrue(withRendering != null);
+ final List<RenderMapping> renderMappings =
withRendering.getRenderMappings();
+ assertEquals(1, renderMappings.size());
+ final RenderMapping renderMapping = renderMappings.get(0);
+ assertEquals("userAdminPage/footer", renderMapping.getName());
+ assertEquals("/user/pages/footer.jsp", renderMapping.getPath());
+
}
}
