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 f224ae562a046db9df89d8b6d7f5118b4356f92a..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
@@ -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,9 @@
                <url-pattern>/dist/*</url-pattern>
        </servlet-mapping>
 
-       <!-- RIA servlet -->
+       <!-- JCR servlet -->
        <servlet>
-               <servlet-name>ria</servlet-name>
+               <servlet-name>jcr</servlet-name>
                <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
                <init-param>
                        <param-name>contextClass</param-name>
@@ -81,8 +80,8 @@
                <load-on-startup>1</load-on-startup>
        </servlet>
        <servlet-mapping>
-               <servlet-name>ria</servlet-name>
-               <url-pattern>*.ria</url-pattern>
+               <servlet-name>jcr</servlet-name>
+               <url-pattern>*.jcr</url-pattern>
        </servlet-mapping>
 
        <!-- General -->
@@ -111,15 +110,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>