move PermissionDeniedException into correct package

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmSecurityHibernateInterceptor.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmSecurityHibernateInterceptor.java
index 2ec16b907f0de49ec989ce484ad41e23ca7fa544..50f7af9a8be9c662c066f6c19625237198e66cec 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmSecurityHibernateInterceptor.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmSecurityHibernateInterceptor.java
@@ -27,13 +27,13 @@ import org.hibernate.type.Type;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.CdmBaseType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.IPublishable;
 import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.permission.Operation;
 import eu.etaxonomy.cdm.persistence.permission.ICdmPermissionEvaluator;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.permission.Role;
 import eu.etaxonomy.cdm.persistence.permission.TargetEntityStates;
 

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PermissionDeniedException.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/PermissionDeniedException.java
similarity index 87%
rename from cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PermissionDeniedException.java
rename to cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/PermissionDeniedException.java
index 78325f8bf378b92d21ac10cafd5ce0b3b99f8983..cfa715a27e0e324844ed169fbe0289bc928b9c84 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PermissionDeniedException.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/PermissionDeniedException.java
@@ -1,5 +1,12 @@
-
-package eu.etaxonomy.cdm.database;
+/**
+* Copyright (C) 2009 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.cdm.persistence.permission;
 
 import java.util.EnumSet;
 
@@ -11,7 +18,6 @@ import org.springframework.security.core.Authentication;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.permission.Operation;
-import eu.etaxonomy.cdm.persistence.permission.Role;
 
 /**
  * @author andreas
@@ -43,7 +49,6 @@ public class PermissionDeniedException extends HibernateException {
     }
 
     public PermissionDeniedException(Authentication authentication, Role[] roles) {
-
         super("Permission denied for '" + authentication.getName()
                 + "' none of the roles '" + roles + "' found in authentication.");
     }

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/SecurityExceptionUtils.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/SecurityExceptionUtils.java
index 756ff8faba1a842d005c31d315a3b749688d0be8..349cb1192ca8cd0676fc4b7b9019d80f1fe87899 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/SecurityExceptionUtils.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/permission/SecurityExceptionUtils.java
@@ -2,8 +2,6 @@ package eu.etaxonomy.cdm.persistence.permission;
 
 import org.springframework.security.access.AccessDeniedException;
 
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
-
 /**
  * This utility class helps finding security related exceptions in Throwables.
  *

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/RegistrationDTOController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/RegistrationDTOController.java
index f0664cc3a287a487f74b26967bcbbe9deeea0f88..95cf5c8c4fdcf4806559f6fd51a092e5c75a4fa6 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/RegistrationDTOController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/RegistrationDTOController.java
@@ -34,9 +34,9 @@ import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
 import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.registration.IRegistrationWorkingSetService;
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.name.Registration;
 import eu.etaxonomy.cdm.model.name.RegistrationStatus;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/IRegistrationWorkingSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/IRegistrationWorkingSetService.java
index 421596ffb20797800ef6ecb5f8b6b527e167f8b6..eef686cf516906682399403d7ca046a917c410ab 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/IRegistrationWorkingSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/IRegistrationWorkingSetService.java
@@ -18,9 +18,9 @@ import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
 import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.name.Registration;
 import eu.etaxonomy.cdm.model.name.RegistrationStatus;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java
index 2271e4d918de1cc072b54d8d2e7c75df0aa2619c..a21cdcaf03172312c2f9d7c7b7498d9b933befa1 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/registration/RegistrationWorkingSetService.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
 import eu.etaxonomy.cdm.api.util.UserHelper;
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.format.reference.ReferenceEllypsisFormatter;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.Registration;
@@ -50,6 +49,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.cdm.persistence.dao.initializer.EntityInitStrategy;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/util/CdmUserHelper.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/util/CdmUserHelper.java
index ceb75b1aa361b4d2ec59a216670b1622466123b1..bda59632085fbe5a61706809cf21f978405294aa 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/util/CdmUserHelper.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/util/CdmUserHelper.java
@@ -32,7 +32,6 @@ import org.springframework.transaction.TransactionStatus;
 
 import eu.etaxonomy.cdm.api.application.CdmRepository;
 import eu.etaxonomy.cdm.api.application.RunAsAuthenticator;
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.ICdmEntityUuidCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.permission.CRUD;
@@ -42,6 +41,7 @@ import eu.etaxonomy.cdm.model.permission.User;
 import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
 import eu.etaxonomy.cdm.persistence.permission.CdmAuthorityParsingException;
 import eu.etaxonomy.cdm.persistence.permission.ICdmPermissionEvaluator;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.permission.Role;
 
 /**

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java
index ac944626fc9b7615faa11b106e20c61d252a45e7..2d1f4a3b9fbdfb4f3506bf62cb65ca460e3e88ea 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java
@@ -41,7 +41,6 @@ import org.unitils.dbunit.annotation.DataSet;
 import org.unitils.spring.annotation.SpringBean;
 import org.unitils.spring.annotation.SpringBeanByType;
 
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
@@ -65,6 +64,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
 import eu.etaxonomy.cdm.persistence.permission.CdmAuthorityParsingException;
 import eu.etaxonomy.cdm.persistence.permission.ICdmPermissionEvaluator;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java
index ec6d9e73d6c9aa98f6cdef74818a3bd8a8b0c5f7..184eef851629c9fc944469723c5c06dd91fe0743 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java
@@ -26,10 +26,10 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.unitils.dbunit.annotation.DataSet;
 import org.unitils.spring.annotation.SpringBeanByType;
 
-import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.permission.Group;
 import eu.etaxonomy.cdm.model.permission.User;
+import eu.etaxonomy.cdm.persistence.permission.PermissionDeniedException;
 import eu.etaxonomy.cdm.persistence.permission.Role;
 
 /**