X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fweb.xml;h=483e3a2a1fe338a13fd7f240941a0640154f342e;hb=0ebe6753b6569ff52b4ba86cd61c6e08a19e0c5f;hp=3e9d60b93f79db8e849b7c568306a5f34e1e33f3;hpb=b98bef7b2e743103c93e719ac5c18bf41858ec3a;p=gpl%2Fargeo-slc.git

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 3e9d60b93..483e3a2a1 100644
--- 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,6 +6,9 @@
 	<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>
@@ -21,6 +24,21 @@
 		<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>slcservice</servlet-name>
+		<url-pattern>*.service</url-pattern>
+	</servlet-mapping>
+ 
 	<!-- XSLT servlet -->
 	<servlet>
 		<servlet-name>xslt</servlet-name>
@@ -85,37 +103,26 @@
 		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
 	</context-param>
 
-	<!-- Log4j configContext loader config
-	<listener>
+	<!--  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>
+
+	<!--
+		Log4j configContext loader config <listener>
 		<display-name>Log4j</display-name>
 		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-	<context-param>
+		</listener> <context-param>
 		<param-name>log4jConfigLocation</param-name>
 		<param-value>/WEB-INF/classes/log4j.properties</param-value>
-	</context-param>
-	<context-param>
+		</context-param> <context-param>
 		<param-name>log4jRefreshInterval</param-name>
-		<param-value>5000</param-value>
-	</context-param>
- -->
-
-	<!--
-		Active MQ <context-param>
-		<param-name>org.apache.activemq.brokerURL</param-name>
-		<param-value>vm://localhost</param-value> </context-param>
-
-		<context-param>
-		<param-name>org.apache.activemq.embeddedBroker</param-name>
-		<param-value>false</param-value> </context-param> <servlet>
-		<servlet-name>MessageListenerServlet</servlet-name>
-		<servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
-		<load-on-startup>1</load-on-startup> </servlet> <servlet-mapping>
-		<servlet-name>MessageListenerServlet</servlet-name>
-		<url-pattern>/amq/*</url-pattern> </servlet-mapping> <filter>
-		<filter-name>session</filter-name>
-		<filter-class>org.apache.activemq.web.SessionFilter</filter-class>
-		</filter> <filter-mapping> <filter-name>session</filter-name>
-		<url-pattern>/amq/*</url-pattern> </filter-mapping>
+		<param-value>5000</param-value> </context-param>
 	-->
 </web-app>