X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fweb.xml;h=8ffca90ac76f9467865d453a2f13517d1e28a84c;hb=db1963471057ebe27425f8a6939ecc080667caee;hp=f224ae562a046db9df89d8b6d7f5118b4356f92a;hpb=ee152aa8c21d0ea363d2087413d29bc5eeb35099;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 f224ae562..8ffca90ac 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
@@ -15,7 +15,6 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-
 	<servlet-mapping>
 		<servlet-name>slc-service</servlet-name>
 		<url-pattern>*.service</url-pattern>
@@ -70,9 +69,44 @@
 		<url-pattern>/dist/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- RIA servlet -->
+	<!-- 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>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>webdav</servlet-name>
+		<url-pattern>/default/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- JCR-MANAGER servlet -->
 	<servlet>
-		<servlet-name>ria</servlet-name>
+		<servlet-name>jcr-manager</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
@@ -80,9 +114,10 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
+
 	<servlet-mapping>
-		<servlet-name>ria</servlet-name>
-		<url-pattern>*.ria</url-pattern>
+		<servlet-name>jcr-manager</servlet-name>
+		<url-pattern>/jcr-manager/*</url-pattern>
 	</servlet-mapping>
 
 	<!-- General -->
@@ -111,15 +146,8 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-	<!--
-		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>
-	-->
+	<context-param>
+		<param-name>argeo.security.systemKey</param-name>
+		<param-value>argeo</param-value>
+	</context-param>
 </web-app>