Author: ard
Date: Tue Sep 11 10:59:40 2012
New Revision: 1383348
URL: http://svn.apache.org/viewvc?rev=1383348&view=rev
Log:
RAVE-695 introduce the concept of abstract Fragments and rename extend to
extends
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/noExtensionsPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/singlePageExtensionPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
Tue Sep 11 10:59:40 2012
@@ -65,7 +65,12 @@ public interface PageFragment {
* @return the absolute or relative path to the {@link PageFragment} that
is extended or <code>null</code> when no
* extension is done
*/
- String getExtend();
+ String getExtends();
+
+ /**
+ * @return <code>true</code> when this {@PageFragment} is abstract
+ */
+ boolean isAbstract();
/**
* @return the {@link List} of {@link PageFragment} children, or empty
list or <code>null</code> when not configured
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.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?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPageFragment.java
Tue Sep 11 10:59:40 2012
@@ -35,7 +35,8 @@ public class XmlPageFragment implements
private String name;
private String description;
- private String extend;
+ private String xmlExtends;
+ private boolean xmlAbstract;
private String viewName;
private String controller;
@@ -100,21 +101,31 @@ public class XmlPageFragment implements
this.description = description;
}
- @XmlAttribute
+ @XmlAttribute(name = "extends")
+ @Override
+ public String getExtends() {
+ return xmlExtends;
+ }
+
+ public void setExtends(String xmlExtends) {
+ this.xmlExtends = xmlExtends;
+ }
+
+ @XmlAttribute(name = "abstract")
@Override
- public String getExtend() {
- return extend;
+ public boolean isAbstract() {
+ return xmlAbstract;
}
- public void setExtend(String extend) {
- this.extend = extend;
+ public void setAbstract(boolean xmlAbstract) {
+ this.xmlAbstract = xmlAbstract;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(this.getClass().getName());
- sb.append(", extend=").append(extend);
+ sb.append(", xmlExtends=").append(xmlExtends);
sb.append(", name='").append(name).append('\'');
sb.append(", controller='").append(controller).append('\'');
sb.append('}');
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
Tue Sep 11 10:59:40 2012
@@ -48,7 +48,7 @@ public class EnhancedPagesConfigManagerT
final PageFragment pageDefinition = pages.get("top");
assertEquals("top", pageDefinition.getName());
- assertNull(pageDefinition.getExtend());
+ assertNull(pageDefinition.getExtends());
assertNull(pageDefinition.getViewName());
assertEquals("org.apache.rave.unittest.NonExistingController",
pageDefinition.getController());
assertEquals(3, pageDefinition.getChildren().size());
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/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/xml/JaxbMappingsTest.java?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
Tue Sep 11 10:59:40 2012
@@ -50,7 +50,7 @@ public class JaxbMappingsTest {
final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(0);
assertEquals("top", pageFragment.getName());
- assertNull(pageFragment.getExtend());
+ assertNull(pageFragment.getExtends());
assertNull(pageFragment.getViewName());
assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragment.getController());
assertEquals(3, pageFragment.getChildren().size());
@@ -63,7 +63,7 @@ public class JaxbMappingsTest {
final PageFragment sub1 = pageFragment.getChildren().get(0);
assertEquals("sub1-nocontroller", sub1.getName());
assertNull(sub1.getController());
- assertNull(sub1.getExtend());
+ assertNull(sub1.getExtends());
assertNull(sub1.getViewName());
assertNull(sub1.getChildren());
}
@@ -78,14 +78,14 @@ public class JaxbMappingsTest {
final PageFragment sub2 = pageFragment.getChildren().get(1);
assertEquals("sub2-emptycontrollor", sub2.getName());
assertEquals("",sub2.getController());
- assertNull(sub2.getExtend());
+ assertNull(sub2.getExtends());
assertNull(sub2.getViewName());
assertEquals( 1, sub2.getChildren().size());
final PageFragment sub2sub1 = sub2.getChildren().get(0);
assertEquals("sub2sub1-withcontroller", sub2sub1.getName());
assertEquals("org.apache.rave.unittest.NonExistingController",sub2sub1.getController());
- assertNull(sub2sub1.getExtend());
+ assertNull(sub2sub1.getExtends());
assertNull(sub2sub1.getViewName());
assertNull(sub2sub1.getChildren());
}
@@ -100,14 +100,14 @@ public class JaxbMappingsTest {
final PageFragment sub3 = pageFragment.getChildren().get(2);
assertEquals("sub3-withcontroller-withview", sub3.getName());
assertEquals("org.apache.rave.unittest.NonExistingController",sub3.getController());
- assertNull(sub3.getExtend());
+ assertNull(sub3.getExtends());
assertEquals("pages/test", sub3.getViewName());
assertEquals( 1, sub3.getChildren().size());
final PageFragment sub3sub1 = sub3.getChildren().get(0);
assertEquals("sub3sub1-withextend", sub3sub1.getName());
assertEquals("org.apache.rave.unittest.NonExistingController",sub3sub1.getController());
- assertEquals("some/fragment", sub3sub1.getExtend());
+ assertEquals("some/fragment", sub3sub1.getExtends());
assertNull(sub3sub1.getViewName());
assertNull(sub3sub1.getChildren());
}
@@ -126,7 +126,7 @@ public class JaxbMappingsTest {
{
final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(0);
assertEquals("root-one", pageFragment.getName());
- assertNull(pageFragment.getExtend());
+ assertNull(pageFragment.getExtends());
assertNull(pageFragment.getViewName());
assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragment.getController());
assertEquals(1, pageFragment.getChildren().size());
@@ -135,7 +135,7 @@ public class JaxbMappingsTest {
{
final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(1);
assertEquals("root-two", pageFragment.getName());
- assertNull(pageFragment.getExtend());
+ assertNull(pageFragment.getExtends());
assertNull(pageFragment.getViewName());
assertEquals("org.apache.rave.unittest.NonExistingController",
pageFragment.getController());
assertEquals(1, pageFragment.getChildren().size());
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/noExtensionsPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/noExtensionsPageDefinitions.xml?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/noExtensionsPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/noExtensionsPageDefinitions.xml
Tue Sep 11 10:59:40 2012
@@ -28,7 +28,7 @@
<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 name="sub3sub1-withextend" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/singlePageExtensionPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/singlePageExtensionPageDefinitions.xml?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/singlePageExtensionPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/singlePageExtensionPageDefinitions.xml
Tue Sep 11 10:59:40 2012
@@ -28,23 +28,23 @@
<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 name="sub3sub1-withextend" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
- <pageFragment name="home" extend="top" description="Page that is being
extended by other pages"
+ <pageFragment name="home" extends="top" description="Page that is being
extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
</pageFragment>
- <pageFragment name="agenda" extend="top" description="Page that is being
extended by other pages"
+ <pageFragment name="agenda" extends="top" description="Page that is being
extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub4-nocontroller"/>
</pageFragment>
- <pageFragment name="news" extend="top" description="Page that is being
extended by other pages"
+ <pageFragment name="news" extends="top" description="Page that is being
extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub2-emptycontrollor"
controller="org.apache.rave.unittest.NonExistingNewsController">
<pageFragment name="news" />
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml?rev=1383348&r1=1383347&r2=1383348&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
Tue Sep 11 10:59:40 2012
@@ -28,7 +28,7 @@
<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 name="sub3sub1-withextend" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
