Author: marijan
Date: Thu Jul 5 09:13:28 2012
New Revision: 1357506
URL: http://svn.apache.org/viewvc?rev=1357506&view=rev
Log:
RAVE-700 Provide basic PageDefinition filesystem storage using json or xml
- add menu component
- use real classes
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_configuration.xml
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java?rev=1357506&r1=1357505&r2=1357506&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
Thu Jul 5 09:13:28 2012
@@ -72,7 +72,7 @@ public class FilePageConfigDaoTest {
final List<PageFragment> adminKids = adminFragment.getChildren();
- assertEquals(2, adminKids.size());
+ assertEquals(3, adminKids.size());
// admin should have header from page definition
PageDefinition standard = pageDefinitions.iterator().next();
final List<PageFragment> children = standard.getChildren();
@@ -97,7 +97,7 @@ public class FilePageConfigDaoTest {
assertTrue(adminFooter != null);
assertEquals(1, adminFooter.getChildren().size());
final PageFragment userAdminFragment =
fragmentDefinitionsMap.get("userAdminPage");
- assertEquals(3, userAdminFragment.getChildren().size());
+ assertEquals(4, userAdminFragment.getChildren().size());
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_configuration.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_configuration.xml?rev=1357506&r1=1357505&r2=1357506&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_configuration.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_configuration.xml
Thu Jul 5 09:13:28 2012
@@ -24,11 +24,15 @@
<page-definition name="standard" description="Page that is being extended
by other pages"
displayname="Standard page"
owner="testUser" src="standard.jsp" type="TEMPLATE"
path="/standard">
+ <page-fragment name="menuController"
class="org.apache.rave.portal.web.hmvc.example.MyMenuController"
+ src="menu.jsp" type="COMPONENT"/>
<page-fragment name="header" path="/header">
- <page-fragment name="headerController"
class="com.test.HeaderController" src="header.jsp" type="COMPONENT"/>
+ <page-fragment name="headerController"
class="org.apache.rave.portal.web.hmvc.example.MyHeaderController"
+ src="header.jsp" type="COMPONENT"/>
</page-fragment>
<page-fragment name="footer" path="/footer">
- <page-fragment name="nullController"
class="com.test.ViewController" src="footer.jsp" type="COMPONENT"/>
+ <page-fragment name="footerController"
class="org.apache.rave.portal.web.hmvc.example.MyFooterController"
+ src="footer.jsp" type="COMPONENT"/>
</page-fragment>
</page-definition>
@@ -52,8 +56,9 @@
<page-fragment name="adminPage" path="/admin" description="Administration
pages" src="admin.jsp"
parent="standard">
<!-- @overrides footer-->
- <page-fragment name="footer" path="/footer" src="myFooter.jsp">
- <page-fragment name="footerController"
class="com.test.FooterController"/>
+ <page-fragment name="footer" path="/footer" src="myFooter.jsp"
+
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController">
+ <page-fragment name="footerController"
class="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
</page-fragment>
</page-fragment>
@@ -64,15 +69,17 @@
parent="adminPage">
<!-- @overrides footer-->
<page-fragment name="footer" path="/footer" src="myFooter.jsp">
- <page-fragment name="footerController"
class="com.test.FooterController"/>
+ <page-fragment name="footerController"
class="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
</page-fragment>
<!-- @overrides admin header-->
<page-fragment name="header" path="/header">
- <page-fragment name="headerController"
class="com.test.UserLoginHeaderController" src="login.jsp"/>
+ <page-fragment name="headerController"
class="org.apache.rave.portal.web.hmvc.example.MyHeaderController"
+ src="login.jsp"/>
</page-fragment>
<!-- add body-->
<page-fragment name="body" path="/body">
- <page-fragment name="bodyController" class="com.test.UserBody"
src="body.jsp"/>
+ <page-fragment name="bodyController"
class="org.apache.rave.portal.web.hmvc.example.MyBodyController"
+ src="body.jsp"/>
</page-fragment>
</page-fragment>
