Author: ate
Date: Thu Sep 13 10:28:54 2012
New Revision: 1384269
URL: http://svn.apache.org/viewvc?rev=1384269&view=rev
Log:
RAVE-694: separate and move hmvc and content-services features under a separate
nested-dispatcher servlet, mounted on /dyn instead of /app
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
- copied unchanged from r1384249,
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Removed:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
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=1384269&r1=1384268&r2=1384269&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
Thu Sep 13 10:28:54 2012
@@ -50,9 +50,16 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- Handles all + nested requests into the application -->
+ <!-- Handles all requests into the application -->
<servlet>
<servlet-name>dispatcher</servlet-name>
+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Handles all routed/nested requests into the application -->
+ <servlet>
+ <servlet-name>nested-dispatcher</servlet-name>
<servlet-class>org.apache.rave.portal.web.mvc.servlet.NestedDispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -71,6 +78,11 @@
<url-pattern>/login</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>nested-dispatcher</servlet-name>
+ <url-pattern>/dyn/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
