Author: ate
Date: Mon Aug 6 06:38:39 2012
New Revision: 1369731
URL: http://svn.apache.org/viewvc?rev=1369731&view=rev
Log:
RAVE-698: start wiring hmvc
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mybody.jsp
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mycontent.jsp
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myfooter.jsp
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myheader.jsp
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mymenu.jsp
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp
(with props)
Modified:
rave/sandbox/content-services/demo-portal/pom.xml
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
Modified: rave/sandbox/content-services/demo-portal/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/pom.xml?rev=1369731&r1=1369730&r2=1369731&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/pom.xml (original)
+++ rave/sandbox/content-services/demo-portal/pom.xml Mon Aug 6 06:38:39 2012
@@ -95,6 +95,11 @@
<artifactId>rave-jcr-service</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-web-hmvc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Default database -->
<dependency>
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml?rev=1369731&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
Mon Aug 6 06:38:39 2012
@@ -0,0 +1,43 @@
+<!--
+ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:mvc="http://www.springframework.org/schema/mvc";
+ xmlns:oxm="http://www.springframework.org/schema/oxm";
+ xmlns:p="http://www.springframework.org/schema/p";
+ xsi:schemaLocation="http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/oxm
http://www.springframework.org/schema/oxm/spring-oxm.xsd";>
+
+ <context:component-scan base-package="org.apache.rave.portal.web.hmvc"/>
+
+ <!-- Configures the @Controller programming model -->
+ <mvc:annotation-driven/>
+
+ <!-- Resolves view names to protected .jsp resources within the
/WEB-INF/jsp/hmvc directory -->
+ <bean
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+ <property name="prefix" value="/WEB-INF/jsp/hmvc/"/>
+ <property name="suffix" value=".jsp"/>
+ </bean>
+
+ <bean name="handlerMapping"
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodMapping"/>
+ <bean name="handlerAdapter"
class="org.apache.rave.portal.web.hmvc.HmvcHandlerMethodHandlerAdapter"/>
+</beans>
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/hmvc-dispatcher-servlet.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mybody.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mybody.jsp?rev=1369731&view=auto
==============================================================================
(empty)
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mybody.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mybody.jsp
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mycontent.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mycontent.jsp?rev=1369731&view=auto
==============================================================================
(empty)
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mycontent.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mycontent.jsp
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myfooter.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myfooter.jsp?rev=1369731&view=auto
==============================================================================
(empty)
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myfooter.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myfooter.jsp
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myheader.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myheader.jsp?rev=1369731&view=auto
==============================================================================
(empty)
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myheader.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/myheader.jsp
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mymenu.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mymenu.jsp?rev=1369731&view=auto
==============================================================================
(empty)
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mymenu.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mymenu.jsp
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp?rev=1369731&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp
Mon Aug 6 06:38:39 2012
@@ -0,0 +1,8 @@
+<%@ page language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/xml"; prefix="x" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ taglib uri="http://www.apache-rave.org/jsp/core"; prefix="rave" %>
+
+<h1>mypage</h1>
\ No newline at end of file
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/hmvc/mypage.jsp
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml?rev=1369731&r1=1369730&r2=1369731&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
(original)
+++ rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
Mon Aug 6 06:38:39 2012
@@ -75,6 +75,21 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <!-- Handles hmvc requests into the application -->
+ <servlet>
+ <servlet-name>hmvc-dispatcher</servlet-name>
+
<servlet-class>org.apache.rave.portal.web.hmvc.servlet.HmvcDispatcherServlet</servlet-class>
+ <init-param>
+ <param-name>detectAllHandlerMappings</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>detectAllHandlerAdapters</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<!-- temporary exposure of ContextRepositoryServlet to show dynamic access
to repository descriptor values -->
<servlet-mapping>
<servlet-name>contextRepository</servlet-name>
@@ -87,6 +102,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>hmvc-dispatcher</servlet-name>
+ <url-pattern>/hmvc/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>dispatcher</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
