Author: ate
Date: Mon Sep 10 10:15:53 2012
New Revision: 1382731
URL: http://svn.apache.org/viewvc?rev=1382731&view=rev
Log:
RAVE-696: Create new rave-web-jcr module providing a JCR based implementation
of the rave-web-hmvc provided page model and controllers and integration of
other content services
- more cleanup and fixes
Added:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-template.ftl
- copied unchanged from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-template.ftl
Removed:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-template.ftl
Modified:
rave/sandbox/content-services/demo-portal/ (props changed)
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
Propchange: rave/sandbox/content-services/demo-portal/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 10 10:15:53 2012
@@ -3,5 +3,5 @@ derby.log
.classpath
.project
target
-rave-demo-portal.iml
widgetDatabase
+overlays
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java?rev=1382731&r1=1382730&r2=1382731&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
Mon Sep 10 10:15:53 2012
@@ -190,11 +190,11 @@ public class RoutedRequestMappingHandler
configured = false;
// TODO
}
+*/
public void shutdown() {
- repositoryFactory.removeListener(this);
+// repositoryFactory.removeListener(this);
}
-*/
protected boolean isNamedMethod(Method method) {
return AnnotationUtils.findAnnotation(method, Named.class) != null;
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java?rev=1382731&r1=1382730&r2=1382731&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
Mon Sep 10 10:15:53 2012
@@ -39,12 +39,12 @@ 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;
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
import org.springframework.web.servlet.mvc.Controller;
-import
org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
@@ -67,8 +67,7 @@ public class BinaryRepositoryControllerT
private MockHttpServletRequest request;
private MockHttpServletResponse response;
- @Autowired
- private RequestMappingHandlerAdapter handlerAdapter;
+ private HandlerAdapter handlerAdapter;
private SimpleUrlHandlerMapping handlerMapping;
@@ -79,6 +78,7 @@ public class BinaryRepositoryControllerT
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
handlerMapping = (SimpleUrlHandlerMapping)
applicationContext.getBean("org.springframework.web.servlet.config.viewControllerHandlerMapping");
+ handlerAdapter = (HandlerAdapter)
applicationContext.getBean("nestedHandlerMethodHandlerAdapter");
// register CND:
