svn commit: r1357229 - in /rave/sandbox/content-services/rave-web-hmvc/src: main/java/org/apache/rave/portal/web/model/config/PageConfig.java test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java

[marijan]

Author: marijan
Date: Wed Jul  4 11:35:01 2012
New Revision: 1357229

URL: http://svn.apache.org/viewvc?rev=1357229&view=rev
Log:
RAVE-700 Provide basic PageDefinition filesystem storage using json or xml

- merge children

Modified:
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/PageConfig.java
    
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/PageConfig.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/PageConfig.java?rev=1357229&r1=1357228&r2=1357229&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/PageConfig.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/model/config/PageConfig.java
 Wed Jul  4 11:35:01 2012
@@ -158,6 +158,9 @@ public class PageConfig {
             final List<PageFragment> children = owner.getChildren();
             for (PageFragmentConfig child : fragmentChildren) {
                 final PageFragment fragment = createFragment(child);
+                // process children
+                fragment.setParent(owner);
+                mergeFragmentChildren(fragment, child);
                 children.add(fragment);
             }
         }

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=1357229&r1=1357228&r2=1357229&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
 Wed Jul  4 11:35:01 2012
@@ -72,13 +72,23 @@ public class FilePageConfigDaoTest {
         for (PageFragment child : children) {
             if (child.getName().equals("header")) {
                 standardHeader = child;
-                log.debug("found header");
                 break;
-
             }
         }
         assertTrue(standardHeader != null);
         assertTrue(adminKids.contains(standardHeader));
+        // admin footer has a child nodes
+        PageFragment adminFooter = null;
+        for (PageFragment adminKid : adminKids) {
+            if (adminKid.getName().equals("footer")) {
+                adminFooter = adminKid;
+                break;
+            }
+        }
+
+        assertTrue(adminFooter != null);
+        assertEquals(1, adminFooter.getChildren().size());
+
         log.info("config {}", config);
 
     }