Remove old transition files

[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 ff217d5a522a419803eb610d58155eaae23a8170..06d6b4867777bc75cf765781236ff58f6548f425 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,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,7 +16,7 @@
                <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>
 
@@ -81,6 +69,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>
@@ -111,16 +114,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>