X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2FWEB-INF%2Fweb.xml;h=9e0a7528086ac9e9e4c1cf8d0a6058b41a8d9e04;hb=a52e5c9b1cca9109f159b90f3eda439ed6077f04;hp=a2822ad477264aac5036398640a540deda4c4337;hpb=057d80065bad948930426f87b9a2eb1d4cab3e14;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
index a2822ad47..9e0a75280 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@
 	<!-- Remoting -->
 	<servlet>
 		<servlet-name>remoting</servlet-name>
-		<servlet-class>org.argeo.server.jackrabbit.webdav.ExtendedDispatcherServlet</servlet-class>
+		<servlet-class>org.argeo.jackrabbit.remote.ExtendedDispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextClass</param-name>
 			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
@@ -40,14 +40,77 @@
 		<url-pattern>/remoting/*</url-pattern>
 	</servlet-mapping>
 
+	<servlet-mapping>
+		<servlet-name>remoting</servlet-name>
+		<url-pattern>/pub/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- XML remoting
+	<servlet>
+		<servlet-name>xmlremoting</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>xmlremoting</servlet-name>
+		<url-pattern>*.jcr</url-pattern>
+	</servlet-mapping>
+ -->
+ 
+	<!-- WEBDAV servlet -->
+	<servlet>
+		<servlet-name>webdav</servlet-name>
+		<servlet-class>org.argeo.jackrabbit.remote.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>/webdav/*</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>webdav</servlet-name>
+		<url-pattern>/public/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- JCR-MANAGER servlet
+	<servlet>
+		<servlet-name>jcr-manager</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-manager</servlet-name>
+		<url-pattern>/jcr-manager/*</url-pattern>
+	</servlet-mapping>
+ -->
+
 	<!--  Security -->
-<!--	<filter>-->
-<!--		<filter-name>springSecurityFilterChain</filter-name>-->
-<!--		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>-->
-<!--	</filter>-->
-<!---->
-<!--	<filter-mapping>-->
-<!--		<filter-name>springSecurityFilterChain</filter-name>-->
-<!--		<url-pattern>/*</url-pattern>-->
-<!--	</filter-mapping>-->
+	<filter>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 </web-app>