Project

General

Profile

« Previous | Next » 

Revision a784f00f

Added by Katja Luther over 14 years ago

merge cate-development2 branch with trunk

View differences:

cdmlib-services/src/main/resources/eu/etaxonomy/cdm/defaultSecurityContext.xml
7 7 
    http://www.springframework.org/schema/context
8 8 
    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
9 9
10 
    <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
10 
    <bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
11 11 
        <property name="providers">
12 12 
            <list>
13 13 
                <ref local="daoAuthenticationProvider"/>
......
15 15 
        </property>
16 16 
    </bean>
17 17
18 
    <bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
18 
    <bean id="daoAuthenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
19 19 
        <property name="userDetailsService" ref="userService"/>
20 20 
        <property name="saltSource" ref="saltSource"/>
21 21 
        <property name="passwordEncoder" ref="passwordEncoder"/>
22 22 
    </bean>
23 23
24 
    <bean id="passwordEncoder" class="org.springframework.security.providers.encoding.Md5PasswordEncoder"/>
24 
    <bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder"/>
25 25
26 
    <bean id="saltSource" class="org.springframework.security.providers.dao.salt.ReflectionSaltSource">
26 
    <bean id="saltSource" class="org.springframework.security.authentication.dao.ReflectionSaltSource">
27 27 
        <property name="userPropertyToUse" value="getUsername"/>
28 28 
    </bean>
29 29

Also available in: Unified diff