Improve OSGi Boot

[lgpl/argeo-commons.git] / server / modules / org.argeo.jackrabbit.webapp / WEB-INF / web.xml

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 68ba7592b58a00de9bf9b88a7a37dc33fd01c946..e24236b4125a15d351c0c46b0c3043a179867030 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
@@ -40,14 +40,72 @@
                <url-pattern>/remoting/*</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/webdav/*</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>