Author: ard
Date: Wed Sep 12 08:00:48 2012
New Revision: 1383830
URL: http://svn.apache.org/viewvc?rev=1383830&view=rev
Log:
RAVE-697 use only absolute paths for extends
Modified:
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/simplePageExtensionPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/xml/singlePageDefinition.xml
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=1383830&r1=1383829&r2=1383830&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
Wed Sep 12 08:00:48 2012
@@ -109,7 +109,7 @@ public class JaxbMappingsTest {
final PageFragment sub3sub1 = sub3.getChildren().get(0);
assertEquals("sub3sub1-withextend", sub3sub1.getName());
assertEquals("org.apache.rave.unittest.NonExistingController",sub3sub1.getController());
- assertEquals("some/fragment",
((ExtendablePageFragment)sub3sub1).getExtends());
+ assertEquals("/some/fragment",
((ExtendablePageFragment)sub3sub1).getExtends());
assertNull(sub3sub1.getViewName());
assertNull(sub3sub1.getChildren());
}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/simplePageExtensionPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/simplePageExtensionPageDefinitions.xml?rev=1383830&r1=1383829&r2=1383830&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/simplePageExtensionPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/simplePageExtensionPageDefinitions.xml
Wed Sep 12 08:00:48 2012
@@ -25,12 +25,12 @@
<pageFragment name="sub2sub1"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
<pageFragment name="sub3" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
- <pageFragment name="sub3sub1" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ <pageFragment name="sub3sub1" extends="/some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
- <pageFragment name="home" extends="standard" description="Page that is being
extended by other pages"
+ <pageFragment name="home" extends="/standard" description="Page that is
being extended by other pages"
controller="org.apache.rave.unittest.NonExistingController">
</pageFragment>
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=1383830&r1=1383829&r2=1383830&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
Wed Sep 12 08:00:48 2012
@@ -25,7 +25,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" extends="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
+ <pageFragment name="sub3sub1-withextend" extends="/some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
</pageFragment>
