X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fsecurity.xml;h=245cd09086c4880993e0c6b27f5be3e7e0664ddf;hb=ef9526b977a7cd42bafa433ec6739ec09f0f2a7d;hp=35397ad70748a7e5e08702d3a40ac1b8085ed8b6;hpb=ff9d53c89ae7c9e7617d3297d2f82508a6c0acbb;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
index 35397ad70..245cd0908 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
@@ -1,21 +1,21 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
-	<http realm="User Interface" >
-		<intercept-url pattern="/**" access="ROLE_USER,ROLE_ADMIN" />
-		<http-basic />
-		<anonymous />
-	</http>
+	<bean id="authenticationEntryPoint"
+		class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+		<property name="loginFormUrl"
+			value="http://localhost/org.argeo.security.webapp/getCredentials.ria" />
+		<property name="forceHttps" value="false" />
+	</bean>
 
-	<authentication-provider>
-		<user-service>
-			<user name="mbaudier" password="mbaudier" authorities="ROLE_USER,ROLE_ADMIN" />
-			<user name="cdujeu" password="cdujeu" authorities="ROLE_USER" />
-			<user name="test" password="test" authorities="ROLE_USER" />
-			<user name="demo" password="demo" authorities="ROLE_USER" />
-		</user-service>
-	</authentication-provider>
-
-</beans:beans>
+	<security:http entry-point-ref="authenticationEntryPoint">
+		<security:intercept-url pattern="**"
+			access="ROLE_USER,ROLE_ADMIN" />
+		<!-- <security:http-basic /> -->
+	</security:http>
+</beans>
\ No newline at end of file