adapt vaadin to new package structure for persistence.permission

diff --git a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
index 70e1f5db61be59739075cf958bff6c78ea9d0737..fb7dd1b3838a6afcf727d6d2fc758f7ca6d16a79 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
+++ b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
@@ -45,8 +45,8 @@ import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.taxonGraph.AbstractHibernateTaxonGraphProcessor;
 import eu.etaxonomy.cdm.persistence.dao.taxonGraph.TaxonGraphException;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
+import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
+import eu.etaxonomy.cdm.persistence.permission.Role;
 import eu.etaxonomy.cdm.vaadin.model.registration.KindOfUnitTerms;
 import eu.etaxonomy.cdm.vaadin.permission.RolesAndPermissions;
 

diff --git a/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/GrantedAuthorityRevokingRegistrationUpdateLister.java b/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/GrantedAuthorityRevokingRegistrationUpdateLister.java
index 85a08d158b36d66ddcfc474001f71094d7bd7970..42a7cb1c35700d686cd5a428b84eda161df59073 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/GrantedAuthorityRevokingRegistrationUpdateLister.java
+++ b/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/GrantedAuthorityRevokingRegistrationUpdateLister.java
@@ -43,7 +43,7 @@ import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.permission.Group;
 import eu.etaxonomy.cdm.model.permission.User;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
+import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
 
 /**
  * This Hibernate {@link PostUpdateEventListener} is responsible for

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/RolesAndPermissions.java b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/RolesAndPermissions.java
index 290c6577f78389a7d2696425ef40e42891f1a41d..73e139220ce1a18187b1b3b590fd284dd074db4e 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/permission/RolesAndPermissions.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/permission/RolesAndPermissions.java
@@ -10,7 +10,7 @@ package eu.etaxonomy.cdm.vaadin.permission;
 
 import java.util.UUID;
 
-import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
+import eu.etaxonomy.cdm.persistence.permission.Role;
 
 /**
  * Provides the Roles required by the

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUIDefaults.java b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUIDefaults.java
index 55fada59608050894bd6b1d420fea2ddc2914d4f..fa04b8db0d7c95de1ea0a8e152686a24608c84e6 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUIDefaults.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUIDefaults.java
@@ -17,7 +17,7 @@ import java.util.List;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
+import eu.etaxonomy.cdm.persistence.permission.Role;
 import eu.etaxonomy.cdm.vaadin.permission.RolesAndPermissions;
 
 /**

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/StartRegistrationPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/StartRegistrationPresenter.java
index 11ae85e2b5e69c485fd1d6927fd9fcac74f890b3..8de2775fd8d0b6bf18cb0a28bffe8e1417195ccd 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/StartRegistrationPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/StartRegistrationPresenter.java
@@ -33,8 +33,8 @@ import eu.etaxonomy.cdm.format.reference.ReferenceEllypsisFormatter;
 import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.Operation;
+import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
+import eu.etaxonomy.cdm.persistence.permission.Operation;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.ref.TypedEntityReference;
 import eu.etaxonomy.cdm.service.CdmFilterablePagingProviderFactory;

diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java
index 127ac1be3ac50e08fe6d879297239a6b41820b18..16a88bed1ec9cd2498badcd559a177c6f58779dc 100644 (file)
--- a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java
+++ b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java
@@ -24,7 +24,7 @@ import eu.etaxonomy.cdm.debug.PersistentContextAnalyzer;
 import eu.etaxonomy.cdm.model.ICdmEntityUuidCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.permission.CRUD;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
+import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
 import eu.etaxonomy.cdm.service.CdmBeanItemContainerFactory;
 import eu.etaxonomy.cdm.service.CdmFilterablePagingProviderFactory;
 import eu.etaxonomy.cdm.service.CdmStore;