You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/09/10 08:17:25 UTC
svn commit: r1382648 [2/2] - in /rave/sandbox/content-services:
demo-portal/src/main/java/org/apache/rave/portal/web/hmvc/
demo-portal/src/main/java/org/apache/rave/portal/web/mvc/
demo-portal/src/main/java/org/apache/rave/portal/web/mvc/controller/ de...
Copied: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletRequest.java (from r1382525, rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/support/HmvcServletRequest.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletRequest.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletRequest.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/support/HmvcServletRequest.java&r1=1382525&r2=1382648&rev=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/support/HmvcServletRequest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletRequest.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.support;
+package org.apache.rave.portal.web.mvc.support;
import java.util.ArrayList;
import java.util.Collection;
@@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory;
*
* @version "$Id$"
*/
-public class HmvcServletRequest extends HttpServletRequestWrapper {
+public class NestedServletRequest extends HttpServletRequestWrapper {
- private static final Logger log = LoggerFactory.getLogger(HmvcServletRequest.class);
+ private static final Logger log = LoggerFactory.getLogger(NestedServletRequest.class);
private String componentRequestUri;
private boolean component;
private Map<String, String> headers;
@@ -50,7 +50,7 @@ public class HmvcServletRequest extends
*
* @throws IllegalArgumentException if the request is null
*/
- public HmvcServletRequest(HttpServletRequest request) {
+ public NestedServletRequest(HttpServletRequest request) {
super(request);
headers = new HashMap<String, String>();
}
Copied: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletResponse.java (from r1382525, rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/support/HmvcServletResponse.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletResponse.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletResponse.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/support/HmvcServletResponse.java&r1=1382525&r2=1382648&rev=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/support/HmvcServletResponse.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/NestedServletResponse.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.support;
+package org.apache.rave.portal.web.mvc.support;
import java.io.IOException;
import java.io.PrintWriter;
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
/**
* @version "$Id$"
*/
-public class HmvcServletResponse extends HttpServletResponseWrapper {
+public class NestedServletResponse extends HttpServletResponseWrapper {
- private static Logger log = LoggerFactory.getLogger(HmvcServletResponse.class);
+ private static Logger log = LoggerFactory.getLogger(NestedServletResponse.class);
private final ResponseHolder responseHolder;
@@ -45,7 +45,7 @@ public class HmvcServletResponse extends
*
* @throws IllegalArgumentException if the response is null
*/
- public HmvcServletResponse(HttpServletResponse response) {
+ public NestedServletResponse(HttpServletResponse response) {
super(response);
responseHolder = new ResponseHolder(response);
}
Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/ResponseHolder.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/ResponseHolder.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/ResponseHolder.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/support/ResponseHolder.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.support;
+package org.apache.rave.portal.web.mvc.support;
import java.io.ByteArrayOutputStream;
import java.io.CharArrayWriter;
@@ -228,8 +228,8 @@ public class ResponseHolder {
}
public void forward(String pathInfo) throws IOException {
- if (response instanceof HmvcServletResponse) {
- ((HmvcServletResponse) response).forward(pathInfo);
+ if (response instanceof NestedServletResponse) {
+ ((NestedServletResponse) response).forward(pathInfo);
}
failIfCommitted();
closed = true;
@@ -289,7 +289,7 @@ public class ResponseHolder {
*/
public void setStatus(int statusCode) {
if (!committed) {
- if (response instanceof HmvcServletResponse) {
+ if (response instanceof NestedServletResponse) {
response.setStatus(statusCode);
} else {
this.statusCode = statusCode;
Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/IncludeComponentTag.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/IncludeComponentTag.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/IncludeComponentTag.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/IncludeComponentTag.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.tags;
+package org.apache.rave.portal.web.mvc.tags;
import java.io.IOException;
import java.util.Map;
@@ -26,9 +26,9 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.rave.portal.web.hmvc.HmvcHandlerMethod;
-import org.apache.rave.portal.web.hmvc.support.HmvcServletResponse;
-import org.apache.rave.portal.web.hmvc.support.ResponseHolder;
+import org.apache.rave.portal.web.mvc.NestedHandlerMethod;
+import org.apache.rave.portal.web.mvc.support.NestedServletResponse;
+import org.apache.rave.portal.web.mvc.support.ResponseHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,10 +54,10 @@ public class IncludeComponentTag extends
public int doEndTag() throws JspException {
@SuppressWarnings("unchecked")
- Map<String, ResponseHolder> ccvrMap = (Map<String, ResponseHolder>) pageContext.getRequest().getAttribute(HmvcHandlerMethod.VIEW_RESPONSE_STATE);
+ Map<String, ResponseHolder> ccvrMap = (Map<String, ResponseHolder>) pageContext.getRequest().getAttribute(NestedHandlerMethod.VIEW_RESPONSE_STATE);
if (ccvrMap != null && ccvrMap.containsKey(ref)) {
- HmvcServletResponse response = (HmvcServletResponse) pageContext.getResponse();
+ NestedServletResponse response = (NestedServletResponse) pageContext.getResponse();
if (response == null) {
if (log.isDebugEnabled()) {
log.error("Response was null");
Modified: rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryResourceTag.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryResourceTag.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryResourceTag.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryResourceTag.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.tags;
+package org.apache.rave.portal.web.mvc.tags;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Copied: rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld (from r1382525, rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/hmvc.tld)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld?p2=rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/hmvc.tld&r1=1382525&r2=1382648&rev=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/hmvc.tld (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld Mon Sep 10 06:17:23 2012
@@ -24,12 +24,12 @@
<description>Rave Core Tag Library</description>
<tlib-version>1.0</tlib-version>
- <short-name>hmvc-tags</short-name>
+ <short-name>rave-core</short-name>
<uri>http://www.apache-rave.org/jsp/core</uri>
<tag>
<description>Include component output</description>
<name>include</name>
- <tag-class>org.apache.rave.portal.web.hmvc.tags.IncludeComponentTag</tag-class>
+ <tag-class>org.apache.rave.portal.web.mvc.tags.IncludeComponentTag</tag-class>
<body-content>empty</body-content>
<attribute>
<description>The name of the component we are including</description>
@@ -47,7 +47,7 @@
<tag>
<description>Repository resource tag</description>
<name>resource</name>
- <tag-class>org.apache.rave.portal.web.hmvc.tags.RepositoryResourceTag</tag-class>
+ <tag-class>org.apache.rave.portal.web.mvc.tags.RepositoryResourceTag</tag-class>
<body-content>empty</body-content>
<attribute>
<description>The path of the resource we are including</description>
Copied: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java (from r1382532, rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfigTest.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfigTest.java&r1=1382532&r2=1382648&rev=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfigTest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMappingTest.java Mon Sep 10 06:17:23 2012
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc;
+package org.apache.rave.portal.web.mvc;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.portal.web.hmvc.example.MyPageController;
+import org.apache.rave.portal.web.mvc.example.MyPageController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,15 +51,15 @@ import static org.springframework.test.w
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:test-config.xml"})
-public class HmvcHandlerMethodMappingByConfigTest {
- private static Logger log = LoggerFactory.getLogger(HmvcHandlerMethodMappingByConfigTest.class);
+public class RoutedRequestMappingHandlerMappingTest {
+ private static Logger log = LoggerFactory.getLogger(RoutedRequestMappingHandlerMappingTest.class);
@Autowired
private ApplicationContext applicationContext;
private MockHttpServletRequest request;
private MockHttpServletResponse response;
private HandlerAdapter handlerAdapter;
- //<bean name="handlerAdapter" class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter"/>
+ //<bean name="handlerAdapter" class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerAdapter"/>
private MyPageController controller;
@@ -79,26 +79,26 @@ public class HmvcHandlerMethodMappingByC
final String requestUri = "/mypage2";
request.setRequestURI(requestUri);
Object handler = this.getHandler(request);
- HmvcHandlerMethod handlerMethod = (HmvcHandlerMethod) handler;
+ NestedHandlerMethod handlerMethod = (NestedHandlerMethod) handler;
final ModelAndView mav = handlerAdapter.handle(request, response, handlerMethod);
final Set<String> childrenNames = handlerMethod.getConfiguration().getChildren().keySet();
assertTrue("Expected 3 child names", childrenNames.size() == 3);
assertTrue("Expected body", childrenNames.contains("body"));
assertTrue("Expected head", childrenNames.contains("head"));
assertTrue("Expected footer", childrenNames.contains("footer"));
- final HmvcHandlerMethod child = handlerMethod.getConfiguration().getChildren().get("body").getMethod();
+ final NestedHandlerMethod child = handlerMethod.getConfiguration().getChildren().get("body").getMethod();
final Set<String> bodyKids = child.getConfiguration().getChildren().keySet();
assertTrue("body should have zero children", bodyKids.size() == 0);
- assertViewName(mav, "hmvc/mypage");
+ assertViewName(mav, "pages/mypage");
@SuppressWarnings("unchecked")
- final Map<String, ModelAndView> childModels = (Map<String, ModelAndView>) mav.getModelMap().get(HmvcHandlerMethod.MODEL_AND_VIEW);
+ final Map<String, ModelAndView> childModels = (Map<String, ModelAndView>) mav.getModelMap().get(NestedHandlerMethod.MODEL_AND_VIEW);
assertTrue(childModels != null);
final ModelAndView head = childModels.get("head");
assertTrue(head != null);
- assertEquals("Expected view", "hmvc/myheader", head.getViewName());
-// TODO: assertEquals("Expected view override", "hmvc/override/myheader", head.getViewName());
+ assertEquals("Expected view", "pages/myheader", head.getViewName());
+// TODO: assertEquals("Expected view override", "pages/override/myheader", head.getViewName());
request.setRequestURI("/mypageFoo");
- handlerMethod = (HmvcHandlerMethod) getHandler(request);
+ handlerMethod = (NestedHandlerMethod) getHandler(request);
assertTrue("Expected 3 child names", handlerMethod.getConfiguration().getChildren().keySet().size() == 3);
}
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/TestController.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/TestController.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/TestController.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/TestController.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc;
+package org.apache.rave.portal.web.mvc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.resource;
+package org.apache.rave.portal.web.mvc.resource;
import java.io.IOException;
import java.io.InputStream;
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.resource;
+package org.apache.rave.portal.web.mvc.resource;
import java.util.Calendar;
import java.util.Map;
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.resource;
+package org.apache.rave.portal.web.mvc.resource;
import org.junit.Before;
import org.junit.Test;
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java?rev=1382648&r1=1382525&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java Mon Sep 10 06:17:23 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.hmvc.resource;
+package org.apache.rave.portal.web.mvc.resource;
import java.io.InputStream;
import java.io.StringWriter;
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/log4j.xml?rev=1382648&r1=1382647&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/resources/log4j.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/log4j.xml Mon Sep 10 06:17:23 2012
@@ -50,7 +50,7 @@
<level value="warn"/>
</category>
- <category name="org.apache.rave.portal.web.hmvc">
+ <category name="org.apache.rave.portal.web.mvc">
<level value="debug"/>
</category>
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml?rev=1382648&r1=1382647&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml Mon Sep 10 06:17:23 2012
@@ -19,10 +19,10 @@
-->
<configuration name="default">
- <page-definition name="myPage" description="My Page" displayname="My page" controller="org.apache.rave.portal.web.hmvc.example.MyPageController">
- <page-fragment name="head" controller="org.apache.rave.portal.web.hmvc.example.MyHeaderController" viewname="hmvc/override/myheader"/>
- <page-fragment name="body" controller="org.apache.rave.portal.web.hmvc.example.MyContentController"/>
- <page-fragment name="footer" controller="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
+ <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>
</configuration>
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=1382648&r1=1382647&r2=1382648&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 06:17:23 2012
@@ -29,7 +29,7 @@
bean scanning of o.a.r.p.web.* components which can cause problems.
-->
- <context:component-scan base-package="org.apache.rave.portal.web.hmvc"/>
+ <context:component-scan base-package="org.apache.rave.portal.web.mvc"/>
<!--
//*************************************************************************************
@@ -90,7 +90,7 @@
</bean>
<!-- FILE LOADING -->
- <bean name="hmvcHandlerMappingByConfig" class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMappingByConfig">
+ <bean name="routedHandlerMapping" class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping">
<property name="order" value="-1"/>
<property name="configurationName" value="myConfiguration"/>
<property name="configurationPath" value="classpath:page-configuration.xml"/>
@@ -99,21 +99,9 @@
</bean>
- <!-- JCR LOADING -->
- <!--
- <bean name="hmvcHandlerMappingByConfig" class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMappingByConfig" depends-on="repositoryBootstrap" destroy-method="shutdown">
- <property name="order" value="-1"/>
- <property name="configurationName" value="myConfiguration"/>
- <property name="configurationPath" value="/raveconfig"/>
- <property name="configManager" ref="fileConfigurationManager"/>
- <property name="credentials" ref="jcrCredentials"/>
- <property name="lazyRepositoryFactory" ref="lazyRepositoryFactory"/>
- </bean>
- -->
-
<bean id="fileConfigurationManager" class="org.apache.rave.jcr.config.FileConfigManager"/>
- <bean name="hmvcHandlerMapping" class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMapping">
+ <bean name="unroutedHandlerMapping" class="org.apache.rave.portal.web.mvc.UnRoutedRequestMappingHandlerMapping">
<property name="order" value="0"/>
</bean>
@@ -142,9 +130,9 @@
<property name="order" value="2"/>
</bean>
- <bean name="nestedHandlerMethodHandlerAdapter" class="org.apache.rave.portal.web.hmvc.NestedHandlerMethodHandlerAdapterAdapter">
+ <bean name="nestedHandlerMethodHandlerAdapter" class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerAdapterAdapter">
<constructor-arg>
- <bean class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter">
+ <bean class="org.apache.rave.portal.web.mvc.NestedHandlerMethodHandlerAdapter">
<property name="order" value="-1"/>
<property name="webBindingInitializer">
<bean class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
@@ -218,7 +206,7 @@
<constructor-arg index="1" ref="javax.jcr.SimpleCredentials"/>
</bean>
- <bean id="jcrResourceLoader" class="org.apache.rave.portal.web.hmvc.resource.JcrRepositoryResourceLoader">
+ <bean id="jcrResourceLoader" class="org.apache.rave.portal.web.mvc.resource.JcrRepositoryResourceLoader">
<constructor-arg ref="documentManager"/>
</bean>
@@ -226,7 +214,7 @@
<property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
<property name="preTemplateLoaders">
<list>
- <bean class="org.apache.rave.portal.web.hmvc.resource.FreeMarkerTemplateLoader">
+ <bean class="org.apache.rave.portal.web.mvc.resource.FreeMarkerTemplateLoader">
<property name="loader" ref="jcrResourceLoader"/>
</bean>
</list>
@@ -253,7 +241,7 @@
// see also: org.springframework.web.servlet.config.viewControllerHandlerMapping
//*************************************************************************************
-->
- <bean id="binaryViewController" class="org.apache.rave.portal.web.hmvc.resource.BinaryRepositoryController">
+ <bean id="binaryViewController" class="org.apache.rave.portal.web.mvc.resource.BinaryRepositoryController">
<property name="methodNameResolver" ref="binaryNameResolver"/>
</bean>
Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml?rev=1382648&r1=1382647&r2=1382648&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml Mon Sep 10 06:17:23 2012
@@ -18,10 +18,10 @@
-->
<!--
- <page-definition name="myPage" path="/mypage2" description="My Page" displayname="My page" controller="org.apache.rave.portal.web.hmvc.example.MyPageController">
- <page-fragment name="head" path="myHeader" controller="org.apache.rave.portal.web.hmvc.example.MyHeaderController"/>
- <page-fragment name="body" path="myBody" controller="org.apache.rave.portal.web.hmvc.example.MyContentController"/>
- <page-fragment name="footer" path="myFooter" controller="org.apache.rave.portal.web.hmvc.example.MyFooterController"/>
+ <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>
-->
<url-configuration name="default">