X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fweb.xml;h=e4341a78b31060958b98d108f9a163e136dd8201;hb=4262cb85637c48319fc914ae5f251b44d4791f86;hp=ff217d5a522a419803eb610d58155eaae23a8170;hpb=7efacbb6a17cd98979833f3c427ddeb940869d5c;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
index ff217d5a5..e4341a78b 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -6,20 +6,8 @@
 	<display-name>SLC Web Application</display-name>
 
 	<!-- SERVICE servlet -->
-
-	<!--
-		refactoring with annotation <servlet>
-		<servlet-name>slc-service</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param> <param-name>contextClass</param-name>
-		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-		</init-param> <load-on-startup>1</load-on-startup> </servlet>
-
-		<servlet-mapping> <servlet-name>slc-service</servlet-name>
-		<url-pattern>*.service</url-pattern> </servlet-mapping>
-	-->
 	<servlet>
-		<servlet-name>slcservice</servlet-name>
+		<servlet-name>slc-service</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
@@ -28,13 +16,13 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>slcservice</servlet-name>
+		<servlet-name>slc-service</servlet-name>
 		<url-pattern>*.service</url-pattern>
 	</servlet-mapping>
 
-	<!-- XSLT servlet -->
+	<!-- DOC servlet : Rendering result view  -->
 	<servlet>
-		<servlet-name>xslt</servlet-name>
+		<servlet-name>doc</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
@@ -43,32 +31,75 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>xslt</servlet-name>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.xls</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.pdf</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
 		<url-pattern>*.xslt</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.xml</url-pattern>
+	</servlet-mapping>
 
-	<!-- DOC servlet -->
+	<!-- PROVISIONING servlet -->
 	<servlet>
-		<servlet-name>doc</servlet-name>
+		<servlet-name>provisioning</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
 			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
 		</init-param>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>provisioning</servlet-name>
+		<url-pattern>/dist/*</url-pattern>
+	</servlet-mapping>
 
+	<!-- JCR servlet -->
+	<servlet>
+		<servlet-name>jcr</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
 	<servlet-mapping>
-		<servlet-name>doc</servlet-name>
-		<url-pattern>*.xls</url-pattern>
+		<servlet-name>jcr</servlet-name>
+		<url-pattern>*.jcr</url-pattern>
 	</servlet-mapping>
+
+	<!-- WEBDAV servlet -->
+	<servlet>
+		<servlet-name>webdav</servlet-name>
+		<servlet-class>org.argeo.server.jackrabbit.webdav.ExtendedDispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+		<init-param>
+			<param-name>dispatchOptionsRequest</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
 	<servlet-mapping>
-		<servlet-name>doc</servlet-name>
-		<url-pattern>*.pdf</url-pattern>
+		<servlet-name>webdav</servlet-name>
+		<url-pattern>/default/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- PROVISIONING servlet -->
+	<!-- JCR-MANAGER servlet -->
 	<servlet>
-		<servlet-name>provisioning</servlet-name>
+		<servlet-name>jcr-manager</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
@@ -76,9 +107,10 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
+
 	<servlet-mapping>
-		<servlet-name>provisioning</servlet-name>
-		<url-pattern>/dist/*</url-pattern>
+		<servlet-name>jcr-manager</servlet-name>
+		<url-pattern>/jcr-manager/*</url-pattern>
 	</servlet-mapping>
 
 	<!-- General -->
@@ -111,16 +143,4 @@
 		<param-name>argeo.security.systemKey</param-name>
 		<param-value>argeo</param-value>
 	</context-param>
-	
-	<!--
-		Log4j configContext loader config <listener>
-		<display-name>Log4j</display-name>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-		</listener> <context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/classes/log4j.properties</param-value>
-		</context-param> <context-param>
-		<param-name>log4jRefreshInterval</param-name>
-		<param-value>5000</param-value> </context-param>
-	-->
 </web-app>