Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / IUserService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IUserService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IUserService.java
index 1b404a0ade687a5010a7b1b4a59464e24a85dde3..ee2a2abbac10a2a9ef324f4e1ce74ef575bc880a 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IUserService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IUserService.java
@@ -18,7 +18,7 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;\r
 import org.springframework.security.provisioning.UserDetailsManager;\r
 \r
 import org.springframework.security.core.userdetails.UsernameNotFoundException;\r
 import org.springframework.security.provisioning.UserDetailsManager;\r
 \r

-import eu.etaxonomy.cdm.model.rights.User;\r
+import eu.etaxonomy.cdm.model.permission.User;\r

 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r