Author: ard
Date: Mon Sep 10 14:59:28 2012
New Revision: 1382922
URL: http://svn.apache.org/viewvc?rev=1382922&view=rev
Log:
RAVE-695 further alignment of new namings, and moving of example classes to
test env
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
(contents, props changed)
- copied, changed from r1382866,
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
(contents, props changed)
- copied, changed from r1382844,
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/url-mapping.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/example/
- copied from r1382759,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/example/
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
(contents, props changed)
- copied, changed from r1382879,
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-definitions.xml
Removed:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/url-mapping.xml
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/example/
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-definitions.xml
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_url_mapping.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1382922&r1=1382921&r2=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Mon Sep 10 14:59:28 2012
@@ -161,7 +161,7 @@
<bean id="filePageRoutesManager"
class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager">
<property name="configurationPath" value="/WEB-INF/page-definitions.xml"/>
- <property name="urlMappingsPath" value="/WEB-INF/url-mapping.xml"/>
+ <property name="urlMappingsPath" value="/WEB-INF/routes.xml"/>
<property name="refreshDelay" value="10000"/>
</bean>
Copied:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
(from r1382866,
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml?p2=rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml&p1=rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml&r1=1382866&r2=1382922&rev=1382922&view=diff
==============================================================================
(empty)
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-definitions.xml
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
(from r1382844,
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/url-mapping.xml)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml?p2=rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml&p1=rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/url-mapping.xml&r1=1382844&r2=1382922&rev=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/url-mapping.xml
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
Mon Sep 10 14:59:28 2012
@@ -17,11 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<url-definitions name="default">
- <url-mapping path="/home" target="userPage" action="defaultPage"/>
- <url-mapping path="/page" target="userPage" action="defaultPage"/>
- <url-mapping path="/page/{pageId}" target="userPage"/>
+<routes name="default">
+ <route path="/home" target="userPage" action="defaultPage"/>
+ <route path="/page" target="userPage" action="defaultPage"/>
+ <route path="/page/{pageId}" target="userPage"/>
- <url-mapping path="/mypage3" target="myPage3"/>
- <url-mapping path="/mypageFoo" target="myPage3" action="bar"/>
-</url-definitions>
+</routes>
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/routes.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.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/FileRoute.java?rev=1382922&r1=1382921&r2=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoute.java
Mon Sep 10 14:59:28 2012
@@ -77,7 +77,7 @@ public class FileRoute implements Route
}
- @XmlElement(name = "url-mapping", type = FileRoute.class)
+ @XmlElement(name = "route", type = FileRoute.class)
@Override
public List<Route> getChildren() {
return children;
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.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/FileRoutes.java?rev=1382922&r1=1382921&r2=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FileRoutes.java
Mon Sep 10 14:59:28 2012
@@ -32,7 +32,7 @@ import org.apache.rave.portal.web.mvc.co
/**
* @version "$Id$"
*/
-@XmlRootElement(name = "url-definitions")
+@XmlRootElement(name = "routes")
public class FileRoutes implements Routes {
private String name;
@@ -49,7 +49,7 @@ public class FileRoutes implements Route
this.name = name;
}
- @XmlElement(name = "url-mapping", type = FileRoute.class)
+ @XmlElement(name = "route", type = FileRoute.class)
@Override
public List<Route> getRoutes() {
return routes;
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_url_mapping.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_url_mapping.xml?rev=1382922&r1=1382921&r2=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_url_mapping.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/example_url_mapping.xml
Mon Sep 10 14:59:28 2012
@@ -17,19 +17,19 @@
specific language governing permissions and limitations
under the License.
-->
-<url-definitions name="default">
- <url-mapping path="/login" target="loginPage">
- <url-mapping path="loginPage/header"/>
- <url-mapping path="loginPage/footer"/>
- </url-mapping>
- <url-mapping path="/admin" target="adminPage"/>
- <url-mapping path="/user" target="userAdminPage">
- <url-mapping path="admin">
- <url-mapping path="login" target="loginPage">
- <url-mapping path="userAdminPage/footer"/>
- </url-mapping>
- <url-mapping path="add" target="userAdminPage"/>
- <url-mapping path="delete" target="userAdminPage"/>
- </url-mapping>
- </url-mapping>
-</url-definitions>
+<routes name="default">
+ <route path="/login" target="loginPage">
+ <route path="loginPage/header"/>
+ <route path="loginPage/footer"/>
+ </route>
+ <route path="/admin" target="adminPage"/>
+ <route path="/user" target="userAdminPage">
+ <route path="admin">
+ <route path="login" target="loginPage">
+ <route path="userAdminPage/footer"/>
+ </route>
+ <route path="add" target="userAdminPage"/>
+ <route path="delete" target="userAdminPage"/>
+ </route>
+ </route>
+</routes>
Copied:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml (from
r1382879,
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-definitions.xml)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml?p2=rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml&p1=rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-definitions.xml&r1=1382879&r2=1382922&rev=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-definitions.xml
(original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
Mon Sep 10 14:59:28 2012
@@ -24,7 +24,7 @@
<page-fragment name="footer" path="myFooter"
controller="org.apache.rave.portal.web.mvcexample.MyFooterController"/>
</page-definition>
-->
-<url-definitions name="default">
- <url-mapping url="/mypage2" page="myPage"/>
- <url-mapping url="/mypageFoo" page="myPage" views="bar"/>
-</url-definitions>
+<routes name="default">
+ <route path="/mypage2" target="myPage"/>
+ <route path="/mypageFoo" target="myPage" view="bar"/>
+</routes>
Propchange:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/routes.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml?rev=1382922&r1=1382921&r2=1382922&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Mon Sep 10 14:59:28 2012
@@ -48,7 +48,7 @@
<bean id="filePageRoutesManager"
class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager">
<property name="configurationPath" value="classpath:page-definitions.xml"/>
- <property name="urlMappingsPath" value="classpath:url-definitions.xml"/>
+ <property name="urlMappingsPath" value="classpath:routes.xml"/>
</bean>
<bean name="unroutedHandlerMapping"
class="org.apache.rave.portal.web.mvc.UnRoutedRequestMappingHandlerMapping">
