Project

General

Profile

« Previous | Next » 

Revision a784f00f

Added by Katja Luther about 14 years ago

merge cate-development2 branch with trunk

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/GrantedAuthorityImpl.java
17 17
import javax.xml.bind.annotation.XmlType;
18 18

  
19 19
import org.hibernate.annotations.NaturalId;
20
import org.springframework.security.GrantedAuthority;
20
import org.springframework.security.core.GrantedAuthority;
21 21

  
22 22
@XmlAccessorType(XmlAccessType.FIELD)
23 23
@XmlType(name = "GrantedAuthority", propOrder = {

Also available in: Unified diff