align package names.

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 cb9602a4cd2f7f4fe520e2ab8c1f5da8838068e1..50635c1aae374c37907d47768900c5d3b4bcd0ed 100644 (file)
--- 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 b203c63d20dfb74d0e89536400f3761726306622..ca77582fcd8cefc96f3430d263b8719a30ac44c5 100644 (file)
--- 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 cc187a14d0d64a5f33a6d4c51866f70afc5cc498..c6964a74467de5caaa0bcf2cd1dc58259d83fc67 100644 (file)
--- 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 ce2d7b8b1206ee2cf456e4fc62ade5c5fb42954b..b0fc90baecb1a3cb0c907443b2afa914b8179006 100644 (file)
--- 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 e048849d81f0bdacc06f4df080f335208a2a1c92..6c29667728a80201b0025ca669d6e31f88140a99 100644 (file)
--- 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 ec7a25afa36892557a9449be073833ce28dff816..8387a6004fae8dd5b33a790fe472ea9dc6575adb 100644 (file)
--- 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 d2b189e051cba0e7a9cdc5bf828505b5d139d127..b5935cb40ef7f9a32629e0312b49514d1c3319c4 100644 (file)
--- 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 8a774eb7b5e9c60e2cb13284ee050cd20b321c4d..ebdd91317bd8d4294ea05e7601f7d7e23e789deb 100644 (file)
--- 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 0e1c545394a7d0031c067c8f8fcf92d9a7a7f9eb..03c15eea9297c6296b0a21f8bd2fae93fec9bded 100644 (file)
--- 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 74ea55c9f41cafc6f31b50c637425920a5ddff07..61582945655674df68356a23c7b8b8e5b802d4c5 100644 (file)
--- 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 85f677ef3998fdb1fda35440c7c01f3a11563e3a..2168d891c1522b8bb58b6043b4f7f20258f0149e 100644 (file)
--- 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 28e05b9db7f33527122202b5e2dcfb9c607161e2..321481d0d79313b5035131c7f41eac8272449792 100644 (file)
--- 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 3dc00e06838e709b36a2e7af914d31d24aadda87..a06580cce8545f5c5f137213f31bba68764fca53 100644 (file)
--- 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 588018aef136da31aca43df165f2adbeecb41caa..094d3a53ce868f7130b2fe3f90eb79784f4b9365 100644 (file)
--- 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 c8912a839b18a6b43eded6a230714d176c8dc1f0..90b3f8977b6075453594d5246b8b05d9d9968717 100644 (file)
--- 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 a9d579e2b89a76561a319058cb9f168e780124bd..5c076d72083a33d8651e3c7ae0379211b83fbdc3 100644 (file)
--- 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 12a5dabfa17692bc85ca115722b7e92af60a9456..9f8edb1dfa653393493e38897829fbe633f115a1 100644 (file)
--- 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 b2baacce6ff74e4dbea5212e5305bbedf1c0930b..69d51b9ff28d728128dc544446b28f98a6bcce28 100644 (file)
--- 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 8d79a95ec9ec8598d5fae2c66376c85c6219fb29..e653455182677ec99d11e709003544a0338c3e61 100644 (file)
--- 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 30e174f7e988bdc8826b9f94d5df08535652461a..e6bb53fce2d170e2e2ba828934db198de8f44d16 100644 (file)
--- 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 c33eced369d533689c5c8079153d4bf1cb1801b8..58457c1324a36a0758d9065f4e1077c508194308 100644 (file)
--- 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 812021b10dcdda7dbea27fee762f31a2a41f104d..46ef04b95dcf748034de3a42204be6fff7d1554a 100644 (file)
--- 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 349ef757c0076def4f8814333b18b3d6df8f7c16..c9e3de5d2c2d7dfb9aa7f04150980157edfe4c8c 100644 (file)
--- 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 1e5abb99c0e28cf9cc95b67e7187f0215c98efd6..2acc3cfd3f1ac6c7d67442edcff014b6f7341d48 100644 (file)
--- 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 5c3315b341507029d425c1551266cf4d41984b88..5b39387e41823982eb2ecbb9b54bd2c06feccf13 100644 (file)
--- 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 e782a18e5c3c09485c6cc606be9aa1b6d3d885ec..8e9d1353be37aeffee066ddd55cf1a189f3e3b35 100644 (file)
--- 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 7ce55cf96f8acf9bce93bc8a09d3e9af3e5a8315..7f52e0d1958cb54937ad3a9a4e39dbba11aab841 100644 (file)
--- 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 57d29636c06cb261cb4d2e5e175b7706a37d4add..9683888f93df6420f8daabd2189a0a331b79e4f4 100644 (file)
--- 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 9a52241f69f7c9cb7654eeb2d170b8d0c87d87ec..9ff7a4a655fed3ec5aa40453f0e698ff1fb53695 100644 (file)
--- 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 5c885376091c066c372481e7c931eb59d9f4acfb..d7d26f22f6fb1cb5ae86bb5c52c2266ce7b5aba5 100644 (file)
--- 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 0a27865b525841b83d58c02ac9e69f289e2465a0..281684b4c01db15d66b807e74fa210855b08662d 100644 (file)
--- 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 a8e1dd5154f33f1123160d7eb9acfc232bd530ee..c6bc3a3df26344ac48c5b0b99c8c4ae4620e7bf9 100644 (file)
--- 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 8b1f1e1521b216e0b8db1697921b28fd463757fa..4fbef86e0c2ad11ed8add64c2fe042cdeefe9352 100644 (file)
--- 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 26cb4738c77a1bbec6754257232a7bc71e08020f..9eac9550c8323e66d47e0e16e0cbda42884bd39c 100644 (file)
--- 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 c4cadcc851236d27e779f3fa6ab55a6d5df1ee17..f65609efd439caf7c9cf3d8cefd405f16989b351 100644 (file)
--- 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 b2353b89f9a1286591fab1259fddb3584beaa7e3..1f7b63697ff63187509e83d531e9aa38d3491142 100644 (file)
--- 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 e306d63a76820d3a04548bac31454bb46b935b62..414b2be99255821f7b8807d4b229976fada4da7c 100644 (file)
--- 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 @@
 
 <beans>
     
-    <bean id="org.wamblee.usermgt.UserAccessor"
+    <bean id="org.wamblee.security.authentication.UserAccessor"
         class="org.wamblee.security.authorization.TestUserAccessor">
         
     </bean>

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 54c9f360f16d9326663e1a3efdae1f09032e1a91..0b603622a3e075e22117c1d2e93f2bf4ca485ca3 100644 (file)
--- 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 @@
  <beans> 
      
      <bean id="usermgtInitializer"
-         class="org.wamblee.usermgt.UserAdminInitializer">
-         <constructor-arg><ref local="org.wamblee.usermgt.UserAdministration"/></constructor-arg>
+         class="org.wamblee.security.authentication.UserAdminInitializer">
+         <constructor-arg><ref local="org.wamblee.security.authentication.UserAdministration"/></constructor-arg>
          <!-- users -->
          <constructor-arg>
              <list>