Author: ard
Date: Mon Sep 10 15:09:36 2012
New Revision: 1382926
URL: http://svn.apache.org/viewvc?rev=1382926&view=rev
Log:
RAVE-695 further alignment of new namings
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
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/file/FilePageDefinitions.java
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/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_configuration.xml
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-definitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
Mon Sep 10 15:09:36 2012
@@ -17,15 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
+<pageDefinitions name="default">
- <page-definition name="userPage" viewName="pages/userpage/page"
controller="org.apache.rave.portal.web.mvc.controller.UserPageController">
- <page-fragment name="header" viewName="pages/userpage/page-header"
controller="org.apache.rave.portal.web.mvc.controller.PageHeaderController"/>
- <page-fragment name="body" viewName="pages/userpage/page-body">
- <page-fragment name="tabs" viewName="pages/userpage/page-tabs"/>
- <page-fragment name="content" viewName="pages/userpage/page-content"/>
- </page-fragment>
- <page-fragment name="footer" viewName="pages/footer"/>
- </page-definition>
+ <pageDefinition name="userPage" viewName="pages/userpage/page"
controller="org.apache.rave.portal.web.mvc.controller.UserPageController">
+ <pageFragment name="header" viewName="pages/userpage/page-header"
controller="org.apache.rave.portal.web.mvc.controller.PageHeaderController"/>
+ <pageFragment name="body" viewName="pages/userpage/page-body">
+ <pageFragment name="tabs" viewName="pages/userpage/page-tabs"/>
+ <pageFragment name="content" viewName="pages/userpage/page-content"/>
+ </pageFragment>
+ <pageFragment name="footer" viewName="pages/footer"/>
+ </pageDefinition>
-</definitions>
+</pageDefinitions>
Modified:
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/file/FilePageDefinition.java?rev=1382926&r1=1382925&r2=1382926&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/file/FilePageDefinition.java
Mon Sep 10 15:09:36 2012
@@ -26,7 +26,7 @@ import org.apache.rave.portal.web.mvc.co
/**
* @version "$Id$"
*/
-@XmlRootElement(name = "page-definition")
+@XmlRootElement(name = "pageDefinition")
public class FilePageDefinition extends FilePageFragment implements
PageDefinition {
public FilePageDefinition() {
Modified:
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/file/FilePageDefinitions.java?rev=1382926&r1=1382925&r2=1382926&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/file/FilePageDefinitions.java
Mon Sep 10 15:09:36 2012
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@XmlRootElement(name = "definitions")
+@XmlRootElement(name = "pageDefinitions")
public class FilePageDefinitions implements PageDefinitions {
private static final Logger log =
LoggerFactory.getLogger(FilePageDefinitions.class);
@@ -50,7 +50,7 @@ public class FilePageDefinitions impleme
this.name = name;
}
- @XmlElement(name = "page-definition", type = FilePageDefinition.class)
+ @XmlElement(name = "pageDefinition", type = FilePageDefinition.class)
@Override
public List<PageDefinition> getPageDefinitions() {
return pageDefinitions;
@@ -60,7 +60,7 @@ public class FilePageDefinitions impleme
this.pageDefinitions = definitions;
}
- @XmlElement(name = "page-fragment", type = FilePageFragment.class)
+ @XmlElement(name = "pageFragment", type = FilePageFragment.class)
public List<PageFragment> getPageFragments() {
return pageFragments;
}
Modified:
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/file/FilePageFragment.java?rev=1382926&r1=1382925&r2=1382926&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/file/FilePageFragment.java
Mon Sep 10 15:09:36 2012
@@ -30,7 +30,7 @@ import org.apache.rave.portal.web.mvc.co
/**
* @version "$Id$"
*/
-@XmlRootElement(name = "page-fragment")
+@XmlRootElement(name = "pageFragment")
public class FilePageFragment implements PageFragment {
private String name;
@@ -70,7 +70,7 @@ public class FilePageFragment implements
}
- @XmlElementRef(name = "page-fragment", type = FilePageFragment.class)
+ @XmlElementRef(name = "pageFragment", type = FilePageFragment.class)
@Override
public List<PageFragment> getChildren() {
return children;
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/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/file/JaxbMappingsTest.java?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
Mon Sep 10 15:09:36 2012
@@ -60,7 +60,7 @@ public class JaxbMappingsTest {
/*
* first child we expect :
- * <page-fragment name="sub1-nocontroller" />
+ * <pageFragment name="sub1-nocontroller" />
*/
{
final PageFragment sub1 = pageDefinition.getChildren().get(0);
@@ -73,9 +73,9 @@ public class JaxbMappingsTest {
/*
* second child we expect :
- * <page-fragment name="sub2-emptycontrollor" controller="">
- * <page-fragment name="sub2sub1-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
- * </page-fragment>
+ * <pageFragment name="sub2-emptycontrollor" controller="">
+ * <pageFragment name="sub2sub1-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
+ * </pageFragment>
*/
{
final PageFragment sub2 = pageDefinition.getChildren().get(1);
@@ -95,9 +95,9 @@ public class JaxbMappingsTest {
/*
* third child we expect :
- * <page-fragment name="sub3-withcontroller-withview"
view="pages/test" controller="org.apache.rave.unittest.NonExistingController">
- * <page-fragment name="sub3sub1-withextend"
extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
- * </page-fragment>
+ * <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);
@@ -157,9 +157,9 @@ public class JaxbMappingsTest {
assertNull("There should be no pages in '"+testSrc+"'.",
filePageDefinitions.getPageDefinitions());
/*
- * <page-fragment name="fragment-emptycontrollor" controller="">
- * <page-fragment name="fragmentsub-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
- * </page-fragment>
+ * <pageFragment name="fragment-emptycontrollor" controller="">
+ * <pageFragment name="fragmentsub-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
+ * </pageFragment>
*/
{
final PageFragment pageFragment =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
@@ -190,8 +190,8 @@ public class JaxbMappingsTest {
assertNull("There should be no pages in '"+testSrc+"'.",
filePageDefinitions.getPageDefinitions());
/*
- * <page-fragment name="fragment1" />
- * <page-fragment name="fragment2" />
+ * <pageFragment name="fragment1" />
+ * <pageFragment name="fragment2" />
*/
final PageFragment fragment1 =
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
assertEquals("fragment1", fragment1.getName());
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=1382926&r1=1382925&r2=1382926&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
Mon Sep 10 15:09:36 2012
@@ -17,89 +17,89 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
+<pageDefinitions name="default">
<!--
STANDARD PAGE (HAS NO PARENT)
-->
- <page-definition name="standard" description="Page that is being extended by
other pages"
+ <pageDefinition name="standard" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingMyPageController">
- <page-fragment name="menuController"
controller="org.apache.rave.unittest.NonExistingMyMenuController"
+ <pageFragment name="menuController"
controller="org.apache.rave.unittest.NonExistingMyMenuController"
/>
- <page-fragment name="header"
controller="org.apache.rave.unittest.NonExistingMyHeadController">
- <page-fragment name="headerController"
controller="org.apache.rave.unittest.NonExistingMyHeaderController"
+ <pageFragment name="header"
controller="org.apache.rave.unittest.NonExistingMyHeadController">
+ <pageFragment name="headerController"
controller="org.apache.rave.unittest.NonExistingMyHeaderController"
/>
- </page-fragment>
- <page-fragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
- <page-fragment name="subfooter"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
+ </pageFragment>
+ <pageFragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <pageFragment name="subfooter"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
- </page-fragment>
- </page-definition>
+ </pageFragment>
+ </pageDefinition>
<!-- INVALID PAGE DEFINITION (ALREADY DEFINED) -->
- <page-definition name="standard" description="Page that is being extended by
other pages"
+ <pageDefinition name="standard" description="Page that is being extended by
other pages"
owner="testUser" >
- </page-definition>
+ </pageDefinition>
<!--
LOGIN PAGE (extends STANDARD page)
-->
- <page-definition name="loginPage" description="Login screen"
parent="standard" controller="com.test.LoginHeaderController">
- <page-fragment name="header" controller="com.test.LoginHeaderController"/>
- <page-fragment name="body"
controller="org.apache.rave.unittest.NonExistingMyBodyController">
- <page-fragment name="headerController"
controller="com.test.LoginHeaderController"/>
- </page-fragment>
- </page-definition>
+ <pageDefinition name="loginPage" description="Login screen"
parent="standard" controller="com.test.LoginHeaderController">
+ <pageFragment name="header" controller="com.test.LoginHeaderController"/>
+ <pageFragment name="body"
controller="org.apache.rave.unittest.NonExistingMyBodyController">
+ <pageFragment name="headerController"
controller="com.test.LoginHeaderController"/>
+ </pageFragment>
+ </pageDefinition>
<!--
ADMIN PAGE (extends ADMIN page, see below)
-->
- <page-definition name="userAdminPage" description="User administration
pages"
+ <pageDefinition name="userAdminPage" description="User administration pages"
parent="adminPage"
controller="org.apache.rave.unittest.NonExistingMyAdminController">
<!-- @overrides footer-->
- <page-fragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
- <page-fragment name="footerController"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
- </page-fragment>
+ <pageFragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <pageFragment name="footerController"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
+ </pageFragment>
<!-- @overrides admin header-->
- <page-fragment name="header"
controller="org.apache.rave.unittest.NonExistingMyHeaderController">
- <page-fragment name="headerController"
controller="org.apache.rave.unittest.NonExistingMyHeaderController"/>
- </page-fragment>
+ <pageFragment name="header"
controller="org.apache.rave.unittest.NonExistingMyHeaderController">
+ <pageFragment name="headerController"
controller="org.apache.rave.unittest.NonExistingMyHeaderController"/>
+ </pageFragment>
<!-- add body-->
- <page-fragment name="body"
controller="org.apache.rave.unittest.NonExistingMyBodyController"/>
- </page-definition>
+ <pageFragment name="body"
controller="org.apache.rave.unittest.NonExistingMyBodyController"/>
+ </pageDefinition>
<!-- INVALID USER ADMIN PAGE (ALREADY DEFINED ABOVE)-->
- <page-definition name="userAdminPage" description="User administration pages"
+ <pageDefinition name="userAdminPage" description="User administration pages"
parent="adminPage"
controller="org.apache.rave.unittest.NonExistingMyBodyController">
<!-- add body-->
- <page-fragment name="body"
controller="org.apache.rave.unittest.NonExistingMyBodyController"/>
- </page-definition>
+ <pageFragment name="body"
controller="org.apache.rave.unittest.NonExistingMyBodyController"/>
+ </pageDefinition>
<!--
ADMIN PAGE (extends STANDARD page)
-->
- <page-definition name="adminPage" description="Administration pages"
controller="org.apache.rave.unittest.NonExistingMyPageController"
+ <pageDefinition name="adminPage" description="Administration pages"
controller="org.apache.rave.unittest.NonExistingMyPageController"
parent="standard">
<!-- @overrides footer-->
- <page-fragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
- <page-fragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
+ <pageFragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <pageFragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
- </page-fragment>
+ </pageFragment>
- </page-definition>
+ </pageDefinition>
<!-- FRAGMENT-->
- <page-fragment name="adminPageFragment" description="Administration pages"
controller="org.apache.rave.unittest.NonExistingMyPageController"
+ <pageFragment name="adminPageFragment" description="Administration pages"
controller="org.apache.rave.unittest.NonExistingMyPageController"
parent="standard">
<!-- @overrides footer-->
- <page-fragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
- <page-fragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
+ <pageFragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <pageFragment name="footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
- </page-fragment>
+ </pageFragment>
- </page-fragment>
+ </pageFragment>
-</definitions>
+</pageDefinitions>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageDefintion.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageDefintion.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageDefintion.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageDefintion.xml
Mon Sep 10 15:09:36 2012
@@ -17,16 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
- <page-definition name="root-one" description="Page that is being extended by
other pages"
+<pageDefinitions name="default">
+ <pageDefinition name="root-one" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="sub1-nocontroller"/>
+ <pageFragment name="sub1-nocontroller"/>
- </page-definition>
+ </pageDefinition>
- <page-definition name="root-two" description="Page that is being extended by
other pages"
+ <pageDefinition name="root-two" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="sub1-nocontroller"/>
- </page-definition>
+ <pageFragment name="sub1-nocontroller"/>
+ </pageDefinition>
-</definitions>
+</pageDefinitions>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageFragment.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageFragment.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageFragment.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/multiplePageFragment.xml
Mon Sep 10 15:09:36 2012
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
- <page-fragment name="fragment1" />
- <page-fragment name="fragment2" />
-</definitions>
\ No newline at end of file
+<pageDefinitions name="default">
+ <pageFragment name="fragment1" />
+ <pageFragment name="fragment2" />
+</pageDefinitions>
\ No newline at end of file
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/pageDefintionsAndRootPageFragments.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/pageDefintionsAndRootPageFragments.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/pageDefintionsAndRootPageFragments.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/pageDefintionsAndRootPageFragments.xml
Mon Sep 10 15:09:36 2012
@@ -17,19 +17,19 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
- <page-definition name="root-one" description="Page that is being extended by
other pages"
+<pageDefinitions name="default">
+ <pageDefinition name="root-one" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="fragment"/>
- </page-definition>
+ <pageFragment name="fragment"/>
+ </pageDefinition>
- <page-definition name="root-two" description="Page that is being extended by
other pages"
+ <pageDefinition name="root-two" description="Page that is being extended by
other pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="fragment"/>
- </page-definition>
+ <pageFragment name="fragment"/>
+ </pageDefinition>
- <page-fragment name="fragment" controller="">
- <page-fragment name="fragmentsub"
controller="org.apache.rave.unittest.NonExistingController"/>
- </page-fragment>
+ <pageFragment name="fragment" controller="">
+ <pageFragment name="fragmentsub"
controller="org.apache.rave.unittest.NonExistingController"/>
+ </pageFragment>
-</definitions>
+</pageDefinitions>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/sameNameSiblings.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/sameNameSiblings.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/sameNameSiblings.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/sameNameSiblings.xml
Mon Sep 10 15:09:36 2012
@@ -17,22 +17,22 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
- <page-definition name="top" description="Page that is being extended by
other pages"
+<pageDefinitions name="default">
+ <pageDefinition name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="sub" />
- <page-fragment name="sub" />
- <page-fragment name="sub" />
- </page-definition>
+ <pageFragment name="sub" />
+ <pageFragment name="sub" />
+ <pageFragment name="sub" />
+ </pageDefinition>
- <page-definition name="top" description="Page that is being extended by
other pages"
+ <pageDefinition name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="sub" />
- <page-fragment name="sub" />
- <page-fragment name="sub" />
- </page-definition>
+ <pageFragment name="sub" />
+ <pageFragment name="sub" />
+ <pageFragment name="sub" />
+ </pageDefinition>
- <page-fragment name="fragment" />
- <page-fragment name="fragment" />
+ <pageFragment name="fragment" />
+ <pageFragment name="fragment" />
-</definitions>
\ No newline at end of file
+</pageDefinitions>
\ No newline at end of file
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
Mon Sep 10 15:09:36 2012
@@ -17,19 +17,19 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
+<pageDefinitions name="default">
<!--
STANDARD PAGE (HAS NO PARENT)
-->
- <page-definition name="top" description="Page that is being extended by
other pages"
+ <pageDefinition name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="sub1-nocontroller"/>
- <page-fragment name="sub2-emptycontrollor" controller="">
- <page-fragment name="sub2sub1-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
- </page-fragment>
- <page-fragment name="sub3-withcontroller-withview" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
- <page-fragment name="sub3sub1-withextend" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
- </page-fragment>
- </page-definition>
+ <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>
-</definitions>
\ No newline at end of file
+</pageDefinitions>
\ No newline at end of file
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageFragment.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageFragment.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageFragment.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageFragment.xml
Mon Sep 10 15:09:36 2012
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
- <page-fragment name="fragment-emptycontrollor" controller="">
- <page-fragment name="fragmentsub-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
- </page-fragment>
-</definitions>
\ No newline at end of file
+<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
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml?rev=1382926&r1=1382925&r2=1382926&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
Mon Sep 10 15:09:36 2012
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<definitions name="default">
+<pageDefinitions name="default">
- <page-definition name="myPage" description="My Page" displayname="My page"
controller="org.apache.rave.portal.web.mvc.example.MyPageController">
- <page-fragment name="head"
controller="org.apache.rave.portal.web.mvc.example.MyHeaderController"
viewName="pages/override/myheader"/>
- <page-fragment name="body"
controller="org.apache.rave.portal.web.mvc.example.MyContentController"/>
- <page-fragment name="footer"
controller="org.apache.rave.portal.web.mvc.example.MyFooterController"/>
- </page-definition>
+ <pageDefinition name="myPage" description="My Page" displayname="My page"
controller="org.apache.rave.portal.web.mvc.example.MyPageController">
+ <pageFragment name="head"
controller="org.apache.rave.portal.web.mvc.example.MyHeaderController"
viewName="pages/override/myheader"/>
+ <pageFragment name="body"
controller="org.apache.rave.portal.web.mvc.example.MyContentController"/>
+ <pageFragment name="footer"
controller="org.apache.rave.portal.web.mvc.example.MyFooterController"/>
+ </pageDefinition>
-</definitions>
+</pageDefinitions>
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=1382926&r1=1382925&r2=1382926&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 15:09:36 2012
@@ -17,13 +17,6 @@
under the License.
-->
-<!--
- <page-definition name="myPage" path="/mypage2" description="My Page"
displayname="My page"
controller="org.apache.rave.portal.web.mvcexample.MyPageController">
- <page-fragment name="head" path="myHeader"
controller="org.apache.rave.portal.web.mvcexample.MyHeaderController"/>
- <page-fragment name="body" path="myBody"
controller="org.apache.rave.portal.web.mvcexample.MyContentController"/>
- <page-fragment name="footer" path="myFooter"
controller="org.apache.rave.portal.web.mvcexample.MyFooterController"/>
-</page-definition>
--->
<routes name="default">
<route path="/mypage2" target="myPage"/>
<route path="/mypageFoo" target="myPage" view="bar"/>
