Author: ard
Date: Tue Sep 4 14:51:45 2012
New Revision: 1380672
URL: http://svn.apache.org/viewvc?rev=1380672&view=rev
Log:
RAVE-695 do not use classes from an artifact that has a dependency on this
artifact. The controller fully qualified classnames are not relevant to really
exist for the page-configuration artifact as they only get instantiated in the
rave-web-hmvc artifact in HmvcHandlerMethodMappingByConfig
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/example_configuration.xml
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/page-config.json
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/example_configuration.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/example_configuration.xml?rev=1380672&r1=1380671&r2=1380672&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/example_configuration.xml
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/example_configuration.xml
Tue Sep 4 14:51:45 2012
@@ -23,15 +23,15 @@
-->
<page-definition name="standard" description="Page that is being extended by
other pages"
displayname="Standard page"
- owner="testUser" type="TEMPLATE" path="/standard"
controller="org.apache.rave.portal.web.hmvc.example.MyPageController">
- <page-fragment name="menuController"
controller="org.apache.rave.portal.web.hmvc.example.MyMenuController"
+ owner="testUser" type="TEMPLATE" path="/standard"
controller="org.apache.rave.unittest.NonExistingMyPageController">
+ <page-fragment name="menuController"
controller="org.apache.rave.unittest.NonExistingMyMenuController"
type="COMPONENT"/>
- <page-fragment name="header" path="/header"
controller="org.apache.rave.portal.web.hmvc.example.MyHeadController">
- <page-fragment name="headerController"
controller="org.apache.rave.portal.web.hmvc.example.MyHeaderController"
+ <page-fragment name="header" path="/header"
controller="org.apache.rave.unittest.NonExistingMyHeadController">
+ <page-fragment name="headerController"
controller="org.apache.rave.unittest.NonExistingMyHeaderController"
type="COMPONENT"/>
</page-fragment>
- <page-fragment name="footer" path="/footer"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController">
- <page-fragment name="subfooter" path="/subfooter"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
+ <page-fragment name="footer" path="/footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <page-fragment name="subfooter" path="/subfooter"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
</page-fragment>
@@ -48,7 +48,7 @@
-->
<page-definition name="loginPage" path="/login" description="Login screen"
parent="standard" controller="com.test.LoginHeaderController">
<page-fragment name="header" path="/header"
controller="com.test.LoginHeaderController"/>
- <page-fragment name="body" path="/body"
controller="org.apache.rave.portal.web.hmvc.example.MyBodyController">
+ <page-fragment name="body" path="/body"
controller="org.apache.rave.unittest.NonExistingMyBodyController">
<page-fragment name="headerController"
controller="com.test.LoginHeaderController"/>
</page-fragment>
</page-definition>
@@ -57,45 +57,45 @@
ADMIN PAGE (extends ADMIN page, see below)
-->
<page-definition name="userAdminPage" path="/admin/user" description="User
administration pages"
- parent="adminPage"
controller="org.apache.rave.portal.web.hmvc.example.MyAdminController">
+ parent="adminPage"
controller="org.apache.rave.unittest.NonExistingMyAdminController">
<!-- @overrides footer-->
- <page-fragment name="footer" path="/footer"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController">
- <page-fragment name="footerController"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
+ <page-fragment name="footer" path="/footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <page-fragment name="footerController"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
</page-fragment>
<!-- @overrides admin header-->
- <page-fragment name="header" path="/header"
controller="org.apache.rave.portal.web.hmvc.example.MyHeaderController">
- <page-fragment name="headerController"
controller="org.apache.rave.portal.web.hmvc.example.MyHeaderController"/>
+ <page-fragment name="header" path="/header"
controller="org.apache.rave.unittest.NonExistingMyHeaderController">
+ <page-fragment name="headerController"
controller="org.apache.rave.unittest.NonExistingMyHeaderController"/>
</page-fragment>
<!-- add body-->
- <page-fragment name="body" path="/body"
controller="org.apache.rave.portal.web.hmvc.example.MyBodyController"/>
+ <page-fragment name="body" path="/body"
controller="org.apache.rave.unittest.NonExistingMyBodyController"/>
</page-definition>
<!-- INVALID USER ADMIN PAGE (ALREADY DEFINED ABOVE)-->
<page-definition name="userAdminPage" path="/admin/user" description="User
administration pages"
- parent="adminPage"
controller="org.apache.rave.portal.web.hmvc.example.MyBodyController">
+ parent="adminPage"
controller="org.apache.rave.unittest.NonExistingMyBodyController">
<!-- add body-->
- <page-fragment name="body" path="/body"
controller="org.apache.rave.portal.web.hmvc.example.MyBodyController"/>
+ <page-fragment name="body" path="/body"
controller="org.apache.rave.unittest.NonExistingMyBodyController"/>
</page-definition>
<!--
ADMIN PAGE (extends STANDARD page)
-->
- <page-definition name="adminPage" path="/admin" description="Administration
pages" controller="org.apache.rave.portal.web.hmvc.example.MyPageController"
+ <page-definition name="adminPage" path="/admin" description="Administration
pages" controller="org.apache.rave.unittest.NonExistingMyPageController"
parent="standard">
<!-- @overrides footer-->
- <page-fragment name="footer" path="/footer"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController">
- <page-fragment name="footer" path="/subfooter"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
+ <page-fragment name="footer" path="/footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <page-fragment name="footer" path="/subfooter"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
</page-fragment>
</page-definition>
<!-- FRAGMENT-->
- <page-fragment name="adminPageFragment" path="/admin"
description="Administration pages"
controller="org.apache.rave.portal.web.hmvc.example.MyPageController"
+ <page-fragment name="adminPageFragment" path="/admin"
description="Administration pages"
controller="org.apache.rave.unittest.NonExistingMyPageController"
parent="standard">
<!-- @overrides footer-->
- <page-fragment name="footer" path="/footer"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController">
- <page-fragment name="footer" path="/subfooter"
controller="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
+ <page-fragment name="footer" path="/footer"
controller="org.apache.rave.unittest.NonExistingMyFooterController">
+ <page-fragment name="footer" path="/subfooter"
controller="org.apache.rave.unittest.NonExistingMyFooterController"/>
</page-fragment>
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/page-config.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/page-config.json?rev=1380672&r1=1380671&r2=1380672&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/page-config.json
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/page-config.json
Tue Sep 4 14:51:45 2012
@@ -9,24 +9,24 @@
"name":"myPage",
"path":"/mypage2",
"description":"Simple page",
-
"controller":"org.apache.rave.portal.web.hmvc.example.MyPageController",
+
"controller":"org.apache.rave.unittest.NonExistingMyPageController",
"head":{
"jcr:primaryType":"raveconfig:pagefragment",
"name":"head",
"path":"myHeader",
-
"controller":"org.apache.rave.portal.web.hmvc.example.MyHeaderController"
+
"controller":"org.apache.rave.unittest.NonExistingMyHeaderController"
},
"body":{
"jcr:primaryType":"raveconfig:pagefragment",
"name":"body",
"path":"myBody",
-
"controller":"org.apache.rave.portal.web.hmvc.example.MyContentController"
+
"controller":"org.apache.rave.unittest.NonExistingMyContentController"
},
"footer":{
"jcr:primaryType":"raveconfig:pagefragment",
"name":"footer",
"path":"myFooter",
-
"controller":"org.apache.rave.portal.web.hmvc.example.MyFooterController"
+
"controller":"org.apache.rave.unittest.NonExistingMyFooterController"
}
}
}
