Remove stub now that depth is implemented

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.webapp.war / WEB-INF / web.xml

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 34a837fbf2e64a4e187a7d438fe2f9dcb220bdd4..bf49c0964472eaa8656274014d1a4b317a22db54 100644 (file)
--- 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,18 +6,29 @@
        <display-name>SLC Web Application</display-name>
 
        <!-- SERVICE servlet -->
-       <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-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>
+               <servlet-name>slcservice</servlet-name>
                <url-pattern>*.service</url-pattern>
        </servlet-mapping>
 
@@ -70,6 +81,21 @@
                <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>jcr</servlet-name>
+               <url-pattern>*.jcr</url-pattern>
+       </servlet-mapping>
+
        <!-- General -->
        <context-param>
                <param-name>contextConfigLocation</param-name>
@@ -96,6 +122,11 @@
                <url-pattern>/*</url-pattern>
        </filter-mapping>
 
+       <context-param>
+               <param-name>argeo.security.systemKey</param-name>
+               <param-value>argeo</param-value>
+       </context-param>
+
        <!--
                Log4j configContext loader config <listener>
                <display-name>Log4j</display-name>