From ca06b860025bad8d605ea2260164e8a2bb242d2b Mon Sep 17 00:00:00 2001 From: erik Date: Mon, 10 May 2010 10:33:00 +0000 Subject: [PATCH] align package names. --- .../authentication}/AbstractUserSet.java | 5 +++-- .../authentication}/Group.java | 2 +- .../authentication}/GroupSet.java | 2 +- .../authentication}/InMemoryGroupSet.java | 2 +- .../authentication}/InMemoryUserSet.java | 2 +- .../authentication}/JaasUserAccessor.java | 2 +- .../authentication}/NameValidator.java | 2 +- .../authentication}/RegexpNameValidator.java | 4 ++-- .../authentication}/User.java | 6 +++--- .../authentication}/UserAccessor.java | 2 +- .../authentication}/UserAdminInitializer.java | 2 +- .../authentication}/UserAdministration.java | 2 +- .../UserAdministrationImpl.java | 11 +++------- .../authentication}/UserMgtException.java | 2 +- .../authentication}/UserSet.java | 2 +- .../authentication}/jpa/JpaGroupSet.java | 6 +++--- .../authentication}/jpa/JpaUserSet.java | 10 +++++----- .../AbstractAuthorizationRule.java | 2 +- .../AbstractAuthorizationService.java | 2 +- .../authorization/AbstractUserCondition.java | 2 +- .../authorization/AnyUserCondition.java | 2 +- .../authorization/AuthorizationRule.java | 2 +- .../authorization/AuthorizationService.java | 2 +- .../DefaultAuthorizationService.java | 4 ++-- .../authorization/GroupUserCondition.java | 2 +- .../authorization/UrlAuthorizationRule.java | 2 +- .../security/authorization/UserCondition.java | 2 +- .../jpa/JpaAuthorizationService.java | 2 +- .../authentication}/InMemoryGroupSetTest.java | 6 +++++- .../authentication}/InMemoryUserSetTest.java | 12 +++++++++-- .../UserAdministrationImplTest.java | 14 +++++++++++-- .../authentication}/UsermgtTestUtils.java | 8 ++++++-- .../AuthorizationServiceTest.java | 2 +- .../authorization/TestAuthorizationRule.java | 2 +- .../authorization/TestUserAccessor.java | 20 +++++++++---------- .../UrlAuthorizationRuleTest.java | 2 +- ...test.org.wamblee.security.useraccessor.xml | 2 +- ...rg.wamblee.security.usermgtinitializer.xml | 4 ++-- 38 files changed, 91 insertions(+), 69 deletions(-) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/AbstractUserSet.java (94%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/Group.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/GroupSet.java (97%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/InMemoryGroupSet.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/InMemoryUserSet.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/JaasUserAccessor.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/NameValidator.java (95%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/RegexpNameValidator.java (95%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/User.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/UserAccessor.java (95%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/UserAdminInitializer.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/UserAdministration.java (99%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/UserAdministrationImpl.java (94%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/UserMgtException.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/UserSet.java (98%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/jpa/JpaGroupSet.java (95%) rename security/impl/src/main/java/org/wamblee/{usermgt => security/authentication}/jpa/JpaUserSet.java (95%) rename security/impl/src/test/java/org/wamblee/{usermgt => security/authentication}/InMemoryGroupSetTest.java (96%) rename security/impl/src/test/java/org/wamblee/{usermgt => security/authentication}/InMemoryUserSetTest.java (94%) rename security/impl/src/test/java/org/wamblee/{usermgt => security/authentication}/UserAdministrationImplTest.java (96%) rename security/impl/src/test/java/org/wamblee/{usermgt => security/authentication}/UsermgtTestUtils.java (86%) diff --git a/security/impl/src/main/java/org/wamblee/usermgt/AbstractUserSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/AbstractUserSet.java similarity index 94% rename from security/impl/src/main/java/org/wamblee/usermgt/AbstractUserSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/AbstractUserSet.java index cb9602a4..50635c1a 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/AbstractUserSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/AbstractUserSet.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import org.wamblee.security.encryption.MessageDigester; -import static org.wamblee.usermgt.UserMgtException.Reason.DUPLICATE_USER; + +import static org.wamblee.security.authentication.UserMgtException.Reason.*; /** * User set base class. diff --git a/security/impl/src/main/java/org/wamblee/usermgt/Group.java b/security/impl/src/main/java/org/wamblee/security/authentication/Group.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/Group.java rename to security/impl/src/main/java/org/wamblee/security/authentication/Group.java index b203c63d..ca77582f 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/Group.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/Group.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.io.Serializable; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/GroupSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/GroupSet.java similarity index 97% rename from security/impl/src/main/java/org/wamblee/usermgt/GroupSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/GroupSet.java index cc187a14..c6964a74 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/GroupSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/GroupSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.util.Set; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryGroupSet.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/InMemoryGroupSet.java index ce2d7b8b..b0fc90ba 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/InMemoryGroupSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryGroupSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.util.ArrayList; import java.util.List; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java index e048849d..6c296677 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/InMemoryUserSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/InMemoryUserSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import org.wamblee.security.encryption.MessageDigester; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java b/security/impl/src/main/java/org/wamblee/security/authentication/JaasUserAccessor.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java rename to security/impl/src/main/java/org/wamblee/security/authentication/JaasUserAccessor.java index ec7a25af..8387a600 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/JaasUserAccessor.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/JaasUserAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.security.AccessController; import java.security.Principal; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/NameValidator.java b/security/impl/src/main/java/org/wamblee/security/authentication/NameValidator.java similarity index 95% rename from security/impl/src/main/java/org/wamblee/usermgt/NameValidator.java rename to security/impl/src/main/java/org/wamblee/security/authentication/NameValidator.java index d2b189e0..b5935cb4 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/NameValidator.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/NameValidator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; /** * Validator of names. diff --git a/security/impl/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java b/security/impl/src/main/java/org/wamblee/security/authentication/RegexpNameValidator.java similarity index 95% rename from security/impl/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java rename to security/impl/src/main/java/org/wamblee/security/authentication/RegexpNameValidator.java index 8a774eb7..ebdd9131 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/RegexpNameValidator.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/RegexpNameValidator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; -import org.wamblee.usermgt.UserMgtException.Reason; +import org.wamblee.security.authentication.UserMgtException.Reason; /** * Validation of names based on a regular expression. diff --git a/security/impl/src/main/java/org/wamblee/usermgt/User.java b/security/impl/src/main/java/org/wamblee/security/authentication/User.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/User.java rename to security/impl/src/main/java/org/wamblee/security/authentication/User.java index 0e1c5453..03c15eea 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/User.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.io.Serializable; import java.util.Set; @@ -32,13 +32,13 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; +import org.wamblee.security.authentication.UserMgtException.Reason; import org.wamblee.security.encryption.MessageDigester; -import org.wamblee.usermgt.UserMgtException.Reason; /** * Represents a user. The methods for managing the groups of the user have * package scope. Managing the groups of the user should be done through the - * {@link org.wamblee.usermgt.UserAdministration} interface. + * {@link org.wamblee.security.authentication.UserAdministration} interface. */ @Entity @Table(name = "SEC_USER") diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserAccessor.java b/security/impl/src/main/java/org/wamblee/security/authentication/UserAccessor.java similarity index 95% rename from security/impl/src/main/java/org/wamblee/usermgt/UserAccessor.java rename to security/impl/src/main/java/org/wamblee/security/authentication/UserAccessor.java index 74ea55c9..61582945 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/UserAccessor.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/UserAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; /** * Interface for accessing the currently logged in user. diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java rename to security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java index 85f677ef..2168d891 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/UserAdminInitializer.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import org.apache.log4j.Logger; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserAdministration.java b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdministration.java similarity index 99% rename from security/impl/src/main/java/org/wamblee/usermgt/UserAdministration.java rename to security/impl/src/main/java/org/wamblee/security/authentication/UserAdministration.java index 28e05b9d..321481d0 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/UserAdministration.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdministration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.util.Set; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdministrationImpl.java similarity index 94% rename from security/impl/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java rename to security/impl/src/main/java/org/wamblee/security/authentication/UserAdministrationImpl.java index 3dc00e06..a06580cc 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/UserAdministrationImpl.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdministrationImpl.java @@ -13,14 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; - -import static org.wamblee.usermgt.UserMgtException.Reason.DUPLICATE_GROUP; -import static org.wamblee.usermgt.UserMgtException.Reason.DUPLICATE_USER; -import static org.wamblee.usermgt.UserMgtException.Reason.GROUP_STILL_OCCUPIED; -import static org.wamblee.usermgt.UserMgtException.Reason.TRIVIAL_RENAME; -import static org.wamblee.usermgt.UserMgtException.Reason.UNKNOWN_GROUP; -import static org.wamblee.usermgt.UserMgtException.Reason.UNKNOWN_USER; +package org.wamblee.security.authentication; + +import static org.wamblee.security.authentication.UserMgtException.Reason.*; import java.util.HashSet; import java.util.Set; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserMgtException.java b/security/impl/src/main/java/org/wamblee/security/authentication/UserMgtException.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/UserMgtException.java rename to security/impl/src/main/java/org/wamblee/security/authentication/UserMgtException.java index 588018ae..094d3a53 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/UserMgtException.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/UserMgtException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.util.EnumMap; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/UserSet.java similarity index 98% rename from security/impl/src/main/java/org/wamblee/usermgt/UserSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/UserSet.java index c8912a83..90b3f897 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/UserSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/UserSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.util.Set; diff --git a/security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaGroupSet.java similarity index 95% rename from security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaGroupSet.java index a9d579e2..5c076d72 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaGroupSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt.jpa; +package org.wamblee.security.authentication.jpa; import java.util.List; import java.util.Set; @@ -23,8 +23,8 @@ import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import org.wamblee.persistence.JpaMergeSupport; -import org.wamblee.usermgt.Group; -import org.wamblee.usermgt.GroupSet; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.GroupSet; /** * Group set backed by the database. diff --git a/security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaUserSet.java b/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java similarity index 95% rename from security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaUserSet.java rename to security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java index 12a5dabf..9f8edb1d 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaUserSet.java +++ b/security/impl/src/main/java/org/wamblee/security/authentication/jpa/JpaUserSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt.jpa; +package org.wamblee.security.authentication.jpa; import java.util.List; import java.util.Set; @@ -25,11 +25,11 @@ import javax.persistence.TypedQuery; import org.wamblee.cache.Cache; import org.wamblee.persistence.JpaMergeSupport; +import org.wamblee.security.authentication.AbstractUserSet; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.NameValidator; +import org.wamblee.security.authentication.User; import org.wamblee.security.encryption.MessageDigester; -import org.wamblee.usermgt.AbstractUserSet; -import org.wamblee.usermgt.Group; -import org.wamblee.usermgt.NameValidator; -import org.wamblee.usermgt.User; /** * User set backed by the database. diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java index b2baacce..69d51b9f 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java @@ -25,7 +25,7 @@ import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Version; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Represents an authorization rule to determine whether an operation is allowed diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationService.java b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationService.java index 8d79a95e..e6534551 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationService.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationService.java @@ -27,7 +27,7 @@ import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.persistence.Version; -import org.wamblee.usermgt.UserAccessor; +import org.wamblee.security.authentication.UserAccessor; /** * Service to determine if access to a certain resource is allowed. diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java index 30e174f7..e6bb53fc 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java @@ -25,7 +25,7 @@ import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Version; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Condition used to match a user against a specified set of users. diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java index c33eced3..58457c13 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AnyUserCondition.java @@ -19,7 +19,7 @@ package org.wamblee.security.authorization; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Matches any user. diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java b/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java index 812021b1..46ef04b9 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationRule.java @@ -15,7 +15,7 @@ */ package org.wamblee.security.authorization; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Represents an authorization rule to determine whether an operation is allowed diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationService.java b/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationService.java index 349ef757..c9e3de5d 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationService.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AuthorizationService.java @@ -15,7 +15,7 @@ */ package org.wamblee.security.authorization; -import org.wamblee.usermgt.UserAccessor; +import org.wamblee.security.authentication.UserAccessor; /** * Service to determine if access to a certain resource is allowed. diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java b/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java index 1e5abb99..2acc3cfd 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java @@ -26,8 +26,8 @@ import javax.persistence.OneToMany; import javax.persistence.OrderColumn; import javax.persistence.Transient; -import org.wamblee.usermgt.User; -import org.wamblee.usermgt.UserAccessor; +import org.wamblee.security.authentication.User; +import org.wamblee.security.authentication.UserAccessor; /** * Default implementation of an authorization service. To determine whether diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java index 5c3315b3..5b39387e 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java @@ -20,7 +20,7 @@ import javax.persistence.Column; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java b/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java index e782a18e..8e9d1353 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java @@ -30,7 +30,7 @@ import javax.persistence.OneToOne; import javax.persistence.Transient; import org.apache.log4j.Logger; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Utility base class for implementation of authentication rules based on the diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java index 7ce55cf9..7f52e0d1 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java @@ -15,7 +15,7 @@ */ package org.wamblee.security.authorization; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Condition used to match a user against a specified set of users. diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java b/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java index 57d29636..9683888f 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/jpa/JpaAuthorizationService.java @@ -20,13 +20,13 @@ import javax.persistence.NoResultException; import javax.persistence.NonUniqueResultException; import org.wamblee.persistence.JpaMergeSupport; +import org.wamblee.security.authentication.UserAccessor; import org.wamblee.security.authorization.AbstractAuthorizationService; import org.wamblee.security.authorization.AbstractAuthorizationRule; import org.wamblee.security.authorization.AuthorizationRule; import org.wamblee.security.authorization.AuthorizationService; import org.wamblee.security.authorization.DefaultAuthorizationService; import org.wamblee.security.authorization.Operation; -import org.wamblee.usermgt.UserAccessor; /** * Authorization service with persistent storage. This is a wrapper for diff --git a/security/impl/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java b/security/impl/src/test/java/org/wamblee/security/authentication/InMemoryGroupSetTest.java similarity index 96% rename from security/impl/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java rename to security/impl/src/test/java/org/wamblee/security/authentication/InMemoryGroupSetTest.java index 9a52241f..9ff7a4a6 100644 --- a/security/impl/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java +++ b/security/impl/src/test/java/org/wamblee/security/authentication/InMemoryGroupSetTest.java @@ -13,10 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import java.util.Set; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.GroupSet; +import org.wamblee.security.authentication.InMemoryGroupSet; + import junit.framework.TestCase; /** diff --git a/security/impl/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java b/security/impl/src/test/java/org/wamblee/security/authentication/InMemoryUserSetTest.java similarity index 94% rename from security/impl/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java rename to security/impl/src/test/java/org/wamblee/security/authentication/InMemoryUserSetTest.java index 5c885376..d7d26f22 100644 --- a/security/impl/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java +++ b/security/impl/src/test/java/org/wamblee/security/authentication/InMemoryUserSetTest.java @@ -13,13 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import junit.framework.TestCase; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.GroupSet; +import org.wamblee.security.authentication.InMemoryGroupSet; +import org.wamblee.security.authentication.InMemoryUserSet; +import org.wamblee.security.authentication.RegexpNameValidator; +import org.wamblee.security.authentication.User; +import org.wamblee.security.authentication.UserMgtException; +import org.wamblee.security.authentication.UserSet; +import org.wamblee.security.authentication.UserMgtException.Reason; import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.usermgt.UserMgtException.Reason; import java.sql.SQLException; diff --git a/security/impl/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java b/security/impl/src/test/java/org/wamblee/security/authentication/UserAdministrationImplTest.java similarity index 96% rename from security/impl/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java rename to security/impl/src/test/java/org/wamblee/security/authentication/UserAdministrationImplTest.java index 0a27865b..281684b4 100644 --- a/security/impl/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java +++ b/security/impl/src/test/java/org/wamblee/security/authentication/UserAdministrationImplTest.java @@ -13,15 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; import junit.framework.TestCase; import org.apache.log4j.Logger; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.GroupSet; +import org.wamblee.security.authentication.InMemoryGroupSet; +import org.wamblee.security.authentication.InMemoryUserSet; +import org.wamblee.security.authentication.RegexpNameValidator; +import org.wamblee.security.authentication.User; +import org.wamblee.security.authentication.UserAdministration; +import org.wamblee.security.authentication.UserAdministrationImpl; +import org.wamblee.security.authentication.UserMgtException; +import org.wamblee.security.authentication.UserSet; +import org.wamblee.security.authentication.UserMgtException.Reason; import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.usermgt.UserMgtException.Reason; import java.util.Set; diff --git a/security/impl/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java b/security/impl/src/test/java/org/wamblee/security/authentication/UsermgtTestUtils.java similarity index 86% rename from security/impl/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java rename to security/impl/src/test/java/org/wamblee/security/authentication/UsermgtTestUtils.java index a8e1dd51..c6bc3a3d 100644 --- a/security/impl/src/test/java/org/wamblee/usermgt/UsermgtTestUtils.java +++ b/security/impl/src/test/java/org/wamblee/security/authentication/UsermgtTestUtils.java @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.usermgt; +package org.wamblee.security.authentication; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.RegexpNameValidator; +import org.wamblee.security.authentication.User; +import org.wamblee.security.authentication.UserMgtException; +import org.wamblee.security.authentication.UserMgtException.Reason; import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.usermgt.UserMgtException.Reason; /** * User management test utilities. diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java b/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java index 8b1f1e15..4fbef86e 100644 --- a/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java +++ b/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java @@ -19,7 +19,7 @@ import junit.framework.TestCase; import static org.wamblee.security.authorization.AuthorizationResult.DENIED; import static org.wamblee.security.authorization.AuthorizationResult.GRANTED; -import org.wamblee.usermgt.UserAccessor; +import org.wamblee.security.authentication.UserAccessor; /** * Tests the authorization service. diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java b/security/impl/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java index 26cb4738..9eac9550 100644 --- a/security/impl/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java +++ b/security/impl/src/test/java/org/wamblee/security/authorization/TestAuthorizationRule.java @@ -22,7 +22,7 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.Transient; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Test authorization rule that also counts the number of times the rule diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java b/security/impl/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java index c4cadcc8..f65609ef 100644 --- a/security/impl/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java +++ b/security/impl/src/test/java/org/wamblee/security/authorization/TestUserAccessor.java @@ -17,18 +17,18 @@ package org.wamblee.security.authorization; import junit.framework.TestCase; +import org.wamblee.security.authentication.Group; +import org.wamblee.security.authentication.InMemoryGroupSet; +import org.wamblee.security.authentication.InMemoryUserSet; +import org.wamblee.security.authentication.RegexpNameValidator; +import org.wamblee.security.authentication.User; +import org.wamblee.security.authentication.UserAccessor; +import org.wamblee.security.authentication.UserAdministration; +import org.wamblee.security.authentication.UserAdministrationImpl; +import org.wamblee.security.authentication.UserMgtException; +import org.wamblee.security.authentication.UserMgtException.Reason; import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.usermgt.Group; -import org.wamblee.usermgt.InMemoryGroupSet; -import org.wamblee.usermgt.InMemoryUserSet; -import org.wamblee.usermgt.RegexpNameValidator; -import org.wamblee.usermgt.User; -import org.wamblee.usermgt.UserAccessor; -import org.wamblee.usermgt.UserAdministration; -import org.wamblee.usermgt.UserAdministrationImpl; -import org.wamblee.usermgt.UserMgtException; -import org.wamblee.usermgt.UserMgtException.Reason; /** * User access that always returns a user that belongs to a fixed group. diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java b/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java index b2353b89..1f7b6369 100644 --- a/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java +++ b/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java @@ -20,7 +20,7 @@ import static org.wamblee.security.authorization.AuthorizationResult.GRANTED; import static org.wamblee.security.authorization.AuthorizationResult.UNDECIDED; import static org.wamblee.security.authorization.AuthorizationResult.UNSUPPORTED_RESOURCE; -import org.wamblee.usermgt.User; +import org.wamblee.security.authentication.User; /** * Tests for the {@link org.wamblee.security.authorization.UrlAuthorizationRule} diff --git a/security/impl/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml b/security/impl/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml index e306d63a..414b2be9 100644 --- a/security/impl/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml +++ b/security/impl/src/test/resources/spring/test.org.wamblee.security.useraccessor.xml @@ -3,7 +3,7 @@ - diff --git a/security/impl/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml b/security/impl/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml index 54c9f360..0b603622 100644 --- a/security/impl/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml +++ b/security/impl/src/test/resources/spring/test.org.wamblee.security.usermgtinitializer.xml @@ -4,8 +4,8 @@ - + class="org.wamblee.security.authentication.UserAdminInitializer"> + -- 2.31.1