align package names.

diff --git a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaGroupSetTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java
similarity index 91%
rename from security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaGroupSetTest.java
rename to security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java
index 4ece0ba43dcb239d3fa164ecfcce9e3d47242155..fe684088639d59953dbd3c671923a85454e207f0 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaGroupSetTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java
@@ -1,15 +1,16 @@
-package org.wamblee.usermgt.jpa;
+package org.wamblee.security.authentication.jpa;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 
 import org.junit.After;
 import org.junit.Before;
+import org.wamblee.security.authentication.GroupSet;
+import org.wamblee.security.authentication.InMemoryGroupSetTest;
+import org.wamblee.security.authentication.jpa.JpaGroupSet;
 import org.wamblee.support.persistence.JpaTester;
 import org.wamblee.support.persistence.TransactionProxyFactory;
 import org.wamblee.support.persistence.DatabaseUtils.JdbcUnitOfWork;
-import org.wamblee.usermgt.GroupSet;
-import org.wamblee.usermgt.InMemoryGroupSetTest;
 
 
 public class JpaGroupSetTest extends InMemoryGroupSetTest {

diff --git a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaUserAdministrationTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
similarity index 87%
rename from security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaUserAdministrationTest.java
rename to security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
index e823d94474606d8a3c3a7a4bd55f6823ccd8963b..2e95c823f096ad17e2116c3d01a42d5924c1d0d9 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaUserAdministrationTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.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.lang.reflect.Method;
 import java.sql.Connection;
@@ -23,23 +23,25 @@ import org.apache.commons.logging.LogFactory;
 import org.junit.Ignore;
 import org.wamblee.cache.EhCache;
 import org.wamblee.io.ClassPathResource;
+import org.wamblee.security.authentication.GroupSet;
+import org.wamblee.security.authentication.NameValidator;
+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.UserAdministrationImplTest;
+import org.wamblee.security.authentication.UserSet;
+import org.wamblee.security.authentication.jpa.JpaGroupSet;
+import org.wamblee.security.authentication.jpa.JpaUserSet;
 import org.wamblee.security.encryption.Md5HexMessageDigester;
 import org.wamblee.security.encryption.MessageDigester;
 import org.wamblee.support.persistence.JpaTester;
 import org.wamblee.support.persistence.TransactionProxyFactory;
 import org.wamblee.support.persistence.DatabaseUtils.JdbcUnitOfWork;
-import org.wamblee.usermgt.GroupSet;
-import org.wamblee.usermgt.NameValidator;
-import org.wamblee.usermgt.RegexpNameValidator;
-import org.wamblee.usermgt.User;
-import org.wamblee.usermgt.UserAdministration;
-import org.wamblee.usermgt.UserAdministrationImpl;
-import org.wamblee.usermgt.UserAdministrationImplTest;
-import org.wamblee.usermgt.UserSet;
 
 /**
  * User administration tests with persistence based on Hibernate. This executes
- * the same test cases as {@link org.wamblee.usermgt.UserAdministrationImplTest}
+ * the same test cases as {@link org.wamblee.security.authentication.UserAdministrationImplTest}
  * with in addition, one test case that executes all Hibernate test cases
  * separately with each test case in its own transaction.
  * 

diff --git a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaUserSetTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java
similarity index 93%
rename from security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaUserSetTest.java
rename to security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java
index 795bf597f313f2b6479a914e47fc7e8c6cbf63e6..f5b5fa10b43c6385ae3d742bbe7ac05b23c03880 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/JpaUserSetTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.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.sql.Connection;
 import java.sql.ResultSet;
@@ -21,18 +21,20 @@ import java.util.Set;
 
 import org.wamblee.cache.EhCache;
 import org.wamblee.io.ClassPathResource;
+import org.wamblee.security.authentication.Group;
+import org.wamblee.security.authentication.GroupSet;
+import org.wamblee.security.authentication.InMemoryUserSetTest;
+import org.wamblee.security.authentication.NameValidator;
+import org.wamblee.security.authentication.RegexpNameValidator;
+import org.wamblee.security.authentication.User;
+import org.wamblee.security.authentication.UserSet;
+import org.wamblee.security.authentication.jpa.JpaGroupSet;
+import org.wamblee.security.authentication.jpa.JpaUserSet;
 import org.wamblee.security.encryption.Md5HexMessageDigester;
 import org.wamblee.security.encryption.MessageDigester;
 import org.wamblee.support.persistence.JpaTester;
 import org.wamblee.support.persistence.TransactionProxyFactory;
 import org.wamblee.support.persistence.DatabaseUtils.JdbcUnitOfWork;
-import org.wamblee.usermgt.Group;
-import org.wamblee.usermgt.GroupSet;
-import org.wamblee.usermgt.InMemoryUserSetTest;
-import org.wamblee.usermgt.NameValidator;
-import org.wamblee.usermgt.RegexpNameValidator;
-import org.wamblee.usermgt.User;
-import org.wamblee.usermgt.UserSet;
 
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet}

diff --git a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/SecurityPersistenceUnit.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java
similarity index 91%
rename from security/jpatest/src/test/java/org/wamblee/usermgt/jpa/SecurityPersistenceUnit.java
rename to security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java
index 8f3aeb8a5e2c485eefd64db99b7b37164bb9a822..ce82c9ecc49062c3a9b45a45b4efe5dbe8e3e91d 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/usermgt/jpa/SecurityPersistenceUnit.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java
@@ -1,4 +1,4 @@
-package org.wamblee.usermgt.jpa;
+package org.wamblee.security.authentication.jpa;
 
 import org.dbunit.dataset.DataSetException;
 import org.dbunit.dataset.filter.ITableFilterSimple;

diff --git a/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java b/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java
index d67e09c4fd3975d5c314077af04a41ad85b37f56..2eac1c5b6ecb44839202b43bf8f4f7e127f6b589 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authorization/jpa/JpaAuthorizationServiceTest.java
@@ -20,6 +20,7 @@ import static org.wamblee.security.authorization.AuthorizationResult.*;
 import javax.persistence.EntityManager;
 
 import org.apache.log4j.Logger;
+import org.wamblee.security.authentication.jpa.SecurityPersistenceUnit;
 import org.wamblee.security.authorization.AllOperation;
 import org.wamblee.security.authorization.AuthorizationRule;
 import org.wamblee.security.authorization.AuthorizationService;
@@ -28,7 +29,6 @@ import org.wamblee.security.authorization.DefaultAuthorizationService;
 import org.wamblee.support.persistence.JpaTester;
 import org.wamblee.support.persistence.TransactionProxyFactory;
 import org.wamblee.support.persistence.JpaBuilder.JpaUnitOfWork;
-import org.wamblee.usermgt.jpa.SecurityPersistenceUnit;
 
 /**
  * Unit test for the persistent authorization service.

diff --git a/security/jpatest/src/test/resources/META-INF/persistence.xml b/security/jpatest/src/test/resources/META-INF/persistence.xml
index 6b69b34c7578c544202c39c2e4c2f2f927a1f6a7..b89bb8d532faa5dc28b754783a7ee45cdb7d458a 100644 (file)
--- a/security/jpatest/src/test/resources/META-INF/persistence.xml
+++ b/security/jpatest/src/test/resources/META-INF/persistence.xml
@@ -6,8 +6,8 @@
    <persistence-unit name="securitytest">
       <jta-data-source>jdbc/security</jta-data-source>
       
-      <class>org.wamblee.usermgt.User</class>
-      <class>org.wamblee.usermgt.Group</class>
+      <class>org.wamblee.security.authentication.User</class>
+      <class>org.wamblee.security.authentication.Group</class>
       <class>org.wamblee.security.authorization.AbstractUserCondition</class>
       <class>org.wamblee.security.authorization.AnyUserCondition</class>
       <class>org.wamblee.security.authorization.GroupUserCondition</class>