Author: ate
Date: Sun Sep 9 16:36:16 2012
New Revision: 1382532
URL: http://svn.apache.org/viewvc?rev=1382532&view=rev
Log:
RAVE-698: replace forked spring RequestMappingHandlerAdapter with a separate
adapter around our nested/hmvc HandlerAdapter.
This AdapterAdapter delegates to a handleNested method instead of the final
handleInternal method which we previously had to fork to to be able to override.
If or when the final handleInternal method in the spring
RequestMappingHandlerAdapter is relaxed so we can extend and wrap it, this
temporary AdapterAdapter solution no longer will be needed.
Added:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java
(with props)
Removed:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/springframework/
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
rave/sandbox/content-services/pom.xml
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodHandlerAdapter.java
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfigTest.java
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=1382532&r1=1382531&r2=1382532&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
Sun Sep 9 16:36:16 2012
@@ -197,22 +197,27 @@
<property name="interceptors" ref="interceptors"/>
</bean>
- <bean name="hmvcHandlerAdapter"
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter">
- <property name="order" value="-1"/>
- <property name="webBindingInitializer">
- <bean
class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
- <property name="conversionService">
- <bean
class="org.springframework.format.support.FormattingConversionServiceFactoryBean"/>
- </property>
- <property name="validator">
- <!-- depends on JSR-303
- <bean
class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
- -->
- <null/>
+ <bean name="nestedHandlerMethodHandlerAdapter"
class="org.apache.rave.portal.web.hmvc.NestedHandlerMethodHandlerAdapterAdapter">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter">
+ <property name="order" value="-1"/>
+ <property name="webBindingInitializer">
+ <bean
class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
+ <property name="conversionService">
+ <bean
class="org.springframework.format.support.FormattingConversionServiceFactoryBean"/>
+ </property>
+ <property name="validator">
+ <!-- depends on JSR-303
+ <bean
class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
+ -->
+ <null/>
+ </property>
+ </bean>
</property>
+ <property name="messageConverters" ref="messageConverters"/>
</bean>
- </property>
- <property name="messageConverters" ref="messageConverters"/>
+ </constructor-arg>
+ <property name="order" value="-1"/>
</bean>
<bean id="requestMappingHandlerAdapter"
class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
Modified: rave/sandbox/content-services/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1382532&r1=1382531&r2=1382532&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Sun Sep 9 16:36:16 2012
@@ -41,7 +41,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <apache.rave.version>0.15-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.16-SNAPSHOT</apache.rave.version>
<apache.wookie.version>0.10.0-incubating</apache.wookie.version>
<apache.jackrabbit.version>2.4.1</apache.jackrabbit.version>
<apacheds.version>1.5.5</apacheds.version>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodHandlerAdapter.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodHandlerAdapter.java?rev=1382532&r1=1382531&r2=1382532&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodHandlerAdapter.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodHandlerAdapter.java
Sun Sep 9 16:36:16 2012
@@ -28,9 +28,10 @@ import org.springframework.web.method.Ha
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.ModelAndView;
-import
org.springframework.web.servlet.mvc.method.annotation.ForkedRequestMappingHandlerAdapter;
-public class HmvcHandlerMethodHandlerAdapter extends
ForkedRequestMappingHandlerAdapter {
+import
org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+
+public class HmvcHandlerMethodHandlerAdapter extends
RequestMappingHandlerAdapter {
@Override
public void afterPropertiesSet() {
@@ -42,14 +43,13 @@ public class HmvcHandlerMethodHandlerAda
super.afterPropertiesSet();
}
- @Override
- protected ModelAndView handleInternal(HttpServletRequest request,
HttpServletResponse response,
+ protected ModelAndView handleNested(HttpServletRequest request,
HttpServletResponse response,
HandlerMethod handlerMethod) throws
Exception {
HmvcHandlerMethod hm = (handlerMethod instanceof HmvcHandlerMethod) ?
(HmvcHandlerMethod)handlerMethod : null;
if (hm != null) {
request.setAttribute(HmvcHandlerMethod.HMVC_CONFIG,
hm.getConfiguration());
}
- ModelAndView mv = super.handleInternal(request, response,
handlerMethod);
+ ModelAndView mv = handleInternal(request, response, handlerMethod);
if (hm != null) {
@@ -59,7 +59,7 @@ public class HmvcHandlerMethodHandlerAda
for (String name : hm.getConfiguration().getChildren().keySet()) {
HmvcHandlerMethod chm =
hm.getConfiguration().getChildren().get(name).getMethod();
request.setAttribute(DispatcherServlet.INPUT_FLASH_MAP_ATTRIBUTE,
mv.getModel());
- ModelAndView cmv = handleInternal(request, response, chm);
+ ModelAndView cmv = handleNested(request, response, chm);
if (cmv != null) {
cmvMap.put(name, cmv);
}
Added:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java?rev=1382532&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java
Sun Sep 9 16:36:16 2012
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rave.portal.web.hmvc;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.core.Ordered;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerAdapter;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * HandlerAdapter for @{link HmvcHandlerMethodHandlerAdapter}, which extends
{@link }RequestMappingHandlerAdapter},
+ * to allow it to wrap around its parent class final handleInternal method.
+ * If or when that method is made non-final, this adapter no longer is needed.
+ * @see
HmvcHandlerMethodHandlerAdapter#handleNested(javax.servlet.http.HttpServletRequest,
javax.servlet.http.HttpServletResponse,
org.springframework.web.method.HandlerMethod)
+ */
+public class NestedHandlerMethodHandlerAdapterAdapter implements
HandlerAdapter, Ordered {
+
+ private int order = Ordered.HIGHEST_PRECEDENCE;
+ HmvcHandlerMethodHandlerAdapter adapter;
+
+ NestedHandlerMethodHandlerAdapterAdapter(HmvcHandlerMethodHandlerAdapter
adapter) {
+ this.adapter = adapter;
+ }
+ @Override
+ public boolean supports(final Object handler) {
+ return adapter.supports(handler);
+ }
+
+ @Override
+ public ModelAndView handle(final HttpServletRequest request, final
HttpServletResponse response, final Object handler) throws Exception {
+ return adapter.handleNested(request, response, (HandlerMethod)handler);
+ }
+
+ @Override
+ public long getLastModified(final HttpServletRequest request, final Object
handler) {
+ return adapter.getLastModified(request, handler);
+ }
+
+ /**
+ * Specify the order value for this HandlerAdapter bean.
+ * <p>Default value is <code>Ordered.HIGHEST_PRECEDENCE</code>
+ * @see org.springframework.core.Ordered#getOrder()
+ */
+ public void setOrder(int order) {
+ this.order = order;
+ }
+
+ @Override
+ public int getOrder() {
+ return 0;
+ }
+}
Propchange:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/NestedHandlerMethodHandlerAdapterAdapter.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
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/hmvc/HmvcHandlerMethodMappingByConfigTest.java?rev=1382532&r1=1382531&r2=1382532&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/hmvc/HmvcHandlerMethodMappingByConfigTest.java
Sun Sep 9 16:36:16 2012
@@ -36,6 +36,7 @@ import org.springframework.mock.web.Mock
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.ModelAndView;
@@ -57,7 +58,7 @@ public class HmvcHandlerMethodMappingByC
private ApplicationContext applicationContext;
private MockHttpServletRequest request;
private MockHttpServletResponse response;
- private HmvcHandlerMethodHandlerAdapter handlerAdapter;
+ private HandlerAdapter handlerAdapter;
//<bean name="handlerAdapter"
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter"/>
private MyPageController controller;
@@ -67,7 +68,7 @@ public class HmvcHandlerMethodMappingByC
public void setUp() throws Exception {
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
- handlerAdapter = (HmvcHandlerMethodHandlerAdapter)
applicationContext.getBean("hmvcHandlerAdapter");
+ handlerAdapter = (HandlerAdapter)
applicationContext.getBean("nestedHandlerMethodHandlerAdapter");
controller = new MyPageController();
}
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=1382532&r1=1382531&r2=1382532&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
Sun Sep 9 16:36:16 2012
@@ -142,21 +142,26 @@
<property name="order" value="2"/>
</bean>
- <bean name="hmvcHandlerAdapter"
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter">
- <property name="order" value="-1"/>
- <property name="webBindingInitializer">
- <bean
class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
- <property name="conversionService">
- <bean
class="org.springframework.format.support.FormattingConversionServiceFactoryBean"/>
- </property>
- <property name="validator">
- <!-- depends on JSR-303
- <bean
class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
- -->
- <null/>
+ <bean name="nestedHandlerMethodHandlerAdapter"
class="org.apache.rave.portal.web.hmvc.NestedHandlerMethodHandlerAdapterAdapter">
+ <constructor-arg>
+ <bean
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter">
+ <property name="order" value="-1"/>
+ <property name="webBindingInitializer">
+ <bean
class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
+ <property name="conversionService">
+ <bean
class="org.springframework.format.support.FormattingConversionServiceFactoryBean"/>
+ </property>
+ <property name="validator">
+ <!-- depends on JSR-303
+ <bean
class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
+ -->
+ <null/>
+ </property>
+ </bean>
</property>
</bean>
- </property>
+ </constructor-arg>
+ <property name="order" value="-1"/>
</bean>
<bean id="requestMappingHandlerAdapter"
class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
