------------------------------------------------------------ revno: 5631 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Wed 2011-12-28 07:38:22 +0100 message: downgraded to spring security 3.0.7 for now.. need to look more into migrating to spring security 3.1 modified: dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml dhis-2/pom.xml
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml 2011-12-27 13:25:50 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml 2011-12-28 06:38:22 +0000 @@ -2,7 +2,7 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:sec="http://www.springframework.org/schema/security"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd";> + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd";> <bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder" /> <bean id="usernameSaltSource" class="org.hisp.dhis.security.DefaultUsernameSaltSource" /> === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java 2011-12-27 15:00:09 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java 2011-12-28 06:38:22 +0000 @@ -37,7 +37,7 @@ * @version $Id: AbstractPrefixedAccessDecisionVoter.java 3160 2007-03-24 20:15:06Z torgeilo $ */ public abstract class AbstractPrefixedAccessDecisionVoter - implements AccessDecisionVoter<Object> + implements AccessDecisionVoter { private static final Log LOG = LogFactory.getLog( AbstractPrefixedAccessDecisionVoter.class ); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java 2011-12-27 15:00:09 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java 2011-12-28 06:38:22 +0000 @@ -45,7 +45,7 @@ * @version $Id: SimpleAccessVoter.java 6352 2008-11-20 15:49:52Z larshelg $ */ public class SimpleAccessVoter - implements AccessDecisionVoter<Object> + implements AccessDecisionVoter { private static final Log LOG = LogFactory.getLog( SimpleAccessVoter.class ); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2011-12-27 13:25:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2011-12-28 06:38:22 +0000 @@ -2,7 +2,7 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:sec="http://www.springframework.org/schema/security"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";> <bean id="mappedRedirectStrategy" class="org.hisp.dhis.security.MappedRedirectStrategy"> === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2011-12-27 13:13:46 +0000 +++ dhis-2/pom.xml 2011-12-28 06:38:22 +0000 @@ -789,7 +789,7 @@ <rootDir></rootDir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <spring.version>3.1.0.RELEASE</spring.version> - <spring.security.version>3.1.0.RELEASE</spring.security.version> + <spring.security.version>3.0.7.RELEASE</spring.security.version> <hibernate.version>3.6.9.Final</hibernate.version> </properties> </project>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
