Project

General

Profile

« Previous | Next » 

Revision 02954990

Added by Ben Clark over 15 years ago

Major changes to the cdmlib default term loading and initialization, plus free-text search of Taxa (by name) and DescriptionElementBase elements as part of #476

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
15 15 
import org.springframework.security.providers.dao.SaltSource;
16 16 
import org.springframework.security.providers.dao.UserCache;
17 17 
import org.springframework.security.providers.dao.cache.NullUserCache;
18 
import org.springframework.security.providers.dao.salt.ReflectionSaltSource;
19 
import org.springframework.security.providers.encoding.Md5PasswordEncoder;
18 20 
import org.springframework.security.providers.encoding.PasswordEncoder;
19 21 
import org.springframework.security.userdetails.GroupManager;
20 22 
import org.springframework.security.userdetails.UserDetails;
......
37 39
38 40 
	protected IGroupDao groupDao;
39 41
40 
	private SaltSource saltSource;
42 
	private SaltSource saltSource = new ReflectionSaltSource();
41 43
42 
	private PasswordEncoder passwordEncoder;
44 
	private PasswordEncoder passwordEncoder = new Md5PasswordEncoder();
43 45
44 46 
	private AuthenticationManager authenticationManager;
45 47
......
51 53 
		this.userCache = userCache;
52 54 
	}
53 55
54 
	//@Autowired
56 
	@Autowired(required = false)
55 57 
	public void setPasswordEncoder(PasswordEncoder passwordEncoder) {
58
56 59 
		this.passwordEncoder = passwordEncoder;
57 60 
	}
58 61 

  		




  59
  
  
    
	//@Autowired


  		




  
  62
  
    
	@Autowired


  		




  60
  63
  
    
	public void setSaltSource(SaltSource saltSource) {


  		




  61
  64
  
    
		this.saltSource = saltSource;


  		




  62
  65
  
    
	}


  		




  63
  66
  
    
	


  		




  64
  
  
    
	//@Autowired


  		




  
  67
  
    
	@Autowired


  		




  65
  68
  
    
	public void setAuthenticationManager(AuthenticationManager authenticationManager) {


  		




  66
  69
  
    
		this.authenticationManager = authenticationManager;


  		




  67
  70
  
    
	}


  		




  68
  71
  
    
	


  		




  69
  
  
    
	//@Autowired


  		




  
  72
  
    
	@Autowired


  		




  70
  73
  
    
	public void setUserDao(IUserDao userDao) {


  		




  71
  74
  
    
		this.userDao = userDao;


  		




  72
  75
  
    
	}


  		




  73
  76
  
    
	


  		




  74
  
  
    
	//@Autowired


  		




  
  77
  
    
	@Autowired


  		




  75
  78
  
    
	public void setGroupDao(IGroupDao groupDao) {


  		




  76
  79
  
    
		this.groupDao = groupDao;


  		




  77
  80
  
    
	}


  		












Also available in:  Unified diff