From 43995978f8779ea9fb686e8cb6f98516d8c2f2e5 Mon Sep 17 00:00:00 2001 From: erik Date: Mon, 10 May 2010 10:33:14 +0000 Subject: [PATCH] align package names. --- .../authentication}/jpa/JpaGroupSetTest.java | 7 +++--- .../jpa/JpaUserAdministrationTest.java | 22 ++++++++++--------- .../authentication}/jpa/JpaUserSetTest.java | 18 ++++++++------- .../jpa/SecurityPersistenceUnit.java | 2 +- .../jpa/JpaAuthorizationServiceTest.java | 2 +- .../test/resources/META-INF/persistence.xml | 4 ++-- 6 files changed, 30 insertions(+), 25 deletions(-) rename security/jpatest/src/test/java/org/wamblee/{usermgt => security/authentication}/jpa/JpaGroupSetTest.java (91%) rename security/jpatest/src/test/java/org/wamblee/{usermgt => security/authentication}/jpa/JpaUserAdministrationTest.java (87%) rename security/jpatest/src/test/java/org/wamblee/{usermgt => security/authentication}/jpa/JpaUserSetTest.java (93%) rename security/jpatest/src/test/java/org/wamblee/{usermgt => security/authentication}/jpa/SecurityPersistenceUnit.java (91%) 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 4ece0ba4..fe684088 100644 --- 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 e823d944..2e95c823 100644 --- 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 795bf597..f5b5fa10 100644 --- 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 8f3aeb8a..ce82c9ec 100644 --- 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 d67e09c4..2eac1c5b 100644 --- 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 6b69b34c..b89bb8d5 100644 --- a/security/jpatest/src/test/resources/META-INF/persistence.xml +++ b/security/jpatest/src/test/resources/META-INF/persistence.xml @@ -6,8 +6,8 @@ jdbc/security - org.wamblee.usermgt.User - org.wamblee.usermgt.Group + org.wamblee.security.authentication.User + org.wamblee.security.authentication.Group org.wamblee.security.authorization.AbstractUserCondition org.wamblee.security.authorization.AnyUserCondition org.wamblee.security.authorization.GroupUserCondition -- 2.31.1