From cb91054f35281c6fc5619f93ff71df46bf4686b9 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Sat, 17 Jul 2010 12:40:46 +0000 Subject: [PATCH] package rename for test libraries. --- TODO.txt | 2 +- .../authentication/jpa/JpaGroupSetTest.java | 6 +++--- .../jpa/JpaUserAdministrationTest.java | 2 +- .../authentication/jpa/JpaUserSetTest.java | 6 +++--- .../jpa/SecurityPersistenceUnit.java | 2 +- .../jpa/UserAdministrationTester.java | 6 +++--- .../jpa/JpaAuthorizationServiceTest.java | 4 ++-- .../org/wamblee/cdi/BeanManagerLookupTest.java | 2 +- .../wamblee/cdi/InjectorFactoryBuilderTest.java | 2 +- .../java/org/wamblee/cdi/SimpleInjectorTest.java | 2 +- .../system/components/DatabaseComponent.java | 7 +++---- .../components/DatabaseComponentFactory.java | 3 +-- .../eclipselink/EclipselinkJpaCustomizer.java | 13 ++++++------- .../eclipselink/EclipselinkTables.java | 2 +- ...org.wamblee.support.persistence.JpaCustomizer | 1 - .../org.wamblee.test.persistence.JpaCustomizer | 1 + .../{support => test}/jndi/JndiProxyFactory.java | 2 +- .../jndi/StubInitialContext.java | 2 +- .../jndi/StubInitialContextFactory.java | 2 +- .../{support => test}/jndi/package-info.java | 2 +- .../persistence/AbstractDatabase.java | 2 +- .../persistence/AbstractDatabaseProvider.java | 2 +- .../persistence/CompositeJpaCustomizer.java | 2 +- .../persistence/CompositeJpaTables.java | 2 +- .../{support => test}/persistence/Database.java | 2 +- .../persistence/DatabaseBuilder.java | 2 +- .../persistence/DatabaseDescription.java | 2 +- .../persistence/DatabaseProvider.java | 2 +- .../persistence/DatabaseStarter.java | 2 +- .../persistence/DatabaseUtils.java | 2 +- .../persistence/DerbyDatabase.java | 2 +- .../persistence/DerbyDatabaseProvider.java | 2 +- .../persistence/ExternalDatabase.java | 2 +- .../persistence/ExternalDatabaseProvider.java | 2 +- .../persistence/JpaBuilder.java | 4 ++-- .../persistence/JpaCustomizer.java | 2 +- .../persistence/JpaCustomizerBuilder.java | 2 +- .../{support => test}/persistence/JpaTester.java | 4 ++-- .../persistence/PersistenceUnitDescription.java | 2 +- .../persistence/TransactionProxyFactory.java | 6 +++--- ...org.wamblee.support.persistence__database.jpg | Bin ...rg.wamblee.support.persistence__jpatester.jpg | Bin .../persistence/package-info.java | 2 +- .../ThreadSpecificProxyFactory.java | 2 +- .../transactions}/package-info.java | 4 ++-- ....wamblee.support.persistence.DatabaseProvider | 2 -- ...org.wamblee.test.persistence.DatabaseProvider | 2 ++ test/enterprise/src/site/xdoc/index.xml | 6 +++--- .../jndi/JndiProxyFactoryTest.java | 6 ++++-- .../jndi/StubInitiaContextFactoryTest.java | 3 ++- .../persistence/DatabaseBuilderTest.java | 8 +++++--- .../persistence/DatabaseUtilsLeakTest.java | 5 ++++- .../persistence/DatabaseUtilsTestBase.java | 15 ++++++++------- .../persistence/DerbyDatabaseTest.java | 6 +++--- .../persistence/ExternalDatabaseTest.java | 10 +++++----- .../{support => test}/persistence/MyEntity.java | 2 +- .../persistence/MyEntityExampleTestBase.java | 7 +++++-- .../persistence/MyPersistenceUnit.java | 4 ++-- .../{support => test}/persistence/MyTables.java | 2 +- .../TransactionProxyFactoryTestBase.java | 6 ++++-- .../ThreadSpecificProxyFactoryTest.java | 3 ++- .../src/test/resources/META-INF/persistence.xml | 2 +- .../hibernate/HibernateJpaCustomizer.java | 11 +++++------ .../persistence/hibernate/HibernateTables.java | 2 +- ...org.wamblee.support.persistence.JpaCustomizer | 1 - .../org.wamblee.test.persistence.JpaCustomizer | 1 + .../eclipselink}/DatabaseUtilsTest.java | 4 ++-- .../eclipselink}/MyEntityExampleTest.java | 4 ++-- .../hibernate/TransactionProxyFactoryTest.java | 8 -------- .../persistence/hibernate/DatabaseUtilsTest.java | 4 ++-- .../hibernate/MyEntityExampleTest.java | 4 ++-- .../hibernate/TransactionProxyFactoryTest.java | 8 ++++++++ .../persistence/toplink}/DatabaseUtilsTest.java | 4 ++-- .../toplink}/MyEntityExampleTest.java | 4 ++-- .../toplink/ToplinkJpaCustomizer.java | 6 +++--- .../persistence/toplink/ToplinkTables.java | 2 +- ...org.wamblee.support.persistence.JpaCustomizer | 1 - .../org.wamblee.test.persistence.JpaCustomizer | 1 + 78 files changed, 145 insertions(+), 134 deletions(-) rename test/eclipselink/src/main/java/org/wamblee/{support => test}/persistence/eclipselink/EclipselinkJpaCustomizer.java (91%) rename test/eclipselink/src/main/java/org/wamblee/{support => test}/persistence/eclipselink/EclipselinkTables.java (95%) delete mode 100644 test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer create mode 100644 test/eclipselink/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer rename test/enterprise/src/main/java/org/wamblee/{support => test}/jndi/JndiProxyFactory.java (99%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/jndi/StubInitialContext.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/jndi/StubInitialContextFactory.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/jndi/package-info.java (96%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/AbstractDatabase.java (99%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/AbstractDatabaseProvider.java (96%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/CompositeJpaCustomizer.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/CompositeJpaTables.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/Database.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DatabaseBuilder.java (99%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DatabaseDescription.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DatabaseProvider.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DatabaseStarter.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DatabaseUtils.java (99%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DerbyDatabase.java (99%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/DerbyDatabaseProvider.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/ExternalDatabase.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/ExternalDatabaseProvider.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/JpaBuilder.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/JpaCustomizer.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/JpaCustomizerBuilder.java (97%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/JpaTester.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/PersistenceUnitDescription.java (96%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/TransactionProxyFactory.java (96%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__database.jpg (100%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__jpatester.jpg (100%) rename test/enterprise/src/main/java/org/wamblee/{support => test}/persistence/package-info.java (99%) rename test/enterprise/src/main/java/org/wamblee/{support => test/transactions}/ThreadSpecificProxyFactory.java (98%) rename test/enterprise/src/main/java/org/wamblee/{support => test/transactions}/package-info.java (84%) delete mode 100644 test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider create mode 100644 test/enterprise/src/main/resources/META-INF/services/org.wamblee.test.persistence.DatabaseProvider rename test/enterprise/src/test/java/org/wamblee/{support => test}/jndi/JndiProxyFactoryTest.java (93%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/jndi/StubInitiaContextFactoryTest.java (97%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/DatabaseBuilderTest.java (86%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/DatabaseUtilsLeakTest.java (79%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/DatabaseUtilsTestBase.java (88%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/DerbyDatabaseTest.java (91%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/ExternalDatabaseTest.java (88%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/MyEntity.java (96%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/MyEntityExampleTestBase.java (92%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/MyPersistenceUnit.java (90%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/MyTables.java (96%) rename test/enterprise/src/test/java/org/wamblee/{support => test}/persistence/TransactionProxyFactoryTestBase.java (93%) rename test/enterprise/src/test/java/org/wamblee/{support => test/transactions}/ThreadSpecificProxyFactoryTest.java (96%) rename test/hibernate/src/main/java/org/wamblee/{support => test}/persistence/hibernate/HibernateJpaCustomizer.java (92%) rename test/hibernate/src/main/java/org/wamblee/{support => test}/persistence/hibernate/HibernateTables.java (95%) delete mode 100644 test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer create mode 100644 test/hibernate/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer rename test/{jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink => jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink}/DatabaseUtilsTest.java (87%) rename test/{jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink => jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink}/MyEntityExampleTest.java (87%) delete mode 100644 test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java rename test/jpatest-hibernate/src/test/java/org/wamblee/{support => test}/persistence/hibernate/DatabaseUtilsTest.java (87%) rename test/jpatest-hibernate/src/test/java/org/wamblee/{support => test}/persistence/hibernate/MyEntityExampleTest.java (87%) create mode 100644 test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/TransactionProxyFactoryTest.java rename test/{jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink => jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink}/DatabaseUtilsTest.java (87%) rename test/{jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink => jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink}/MyEntityExampleTest.java (87%) rename test/toplink-essentials/src/main/java/org/wamblee/{support => test}/persistence/toplink/ToplinkJpaCustomizer.java (92%) rename test/toplink-essentials/src/main/java/org/wamblee/{support => test}/persistence/toplink/ToplinkTables.java (95%) delete mode 100644 test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer create mode 100644 test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer diff --git a/TODO.txt b/TODO.txt index 24837472..34c042a2 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,7 +5,7 @@ * DatabaseUtils: deletion of tables must be more generic First drop all constraints then drop all tables. Or use JPA to drop the tables but that is a short-term solution - +* rsync --delete the generated site instead of copying them. * update mythtv project for java ee 6 * reimplement photos application using wicket diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java index fe684088..aa736302 100644 --- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java +++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaGroupSetTest.java @@ -8,9 +8,9 @@ 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.test.persistence.JpaTester; +import org.wamblee.test.persistence.TransactionProxyFactory; +import org.wamblee.test.persistence.DatabaseUtils.JdbcUnitOfWork; public class JpaGroupSetTest extends InMemoryGroupSetTest { diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java index 2a0048e9..9084a3f8 100644 --- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java +++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wamblee.security.authentication.UserAdministration; import org.wamblee.security.authentication.UserAdministrationImplTest; -import org.wamblee.support.persistence.DatabaseUtils.JdbcUnitOfWork; +import org.wamblee.test.persistence.DatabaseUtils.JdbcUnitOfWork; /** * User administration tests with persistence based on Hibernate. This executes diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java index e5430fb6..4a9ab5f0 100644 --- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java +++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java @@ -30,9 +30,9 @@ 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.support.persistence.JpaTester; -import org.wamblee.support.persistence.TransactionProxyFactory; -import org.wamblee.support.persistence.DatabaseUtils.JdbcUnitOfWork; +import org.wamblee.test.persistence.JpaTester; +import org.wamblee.test.persistence.TransactionProxyFactory; +import org.wamblee.test.persistence.DatabaseUtils.JdbcUnitOfWork; /** * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet} diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java index d41500ac..cf6d4235 100644 --- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java +++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/SecurityPersistenceUnit.java @@ -1,6 +1,6 @@ package org.wamblee.security.authentication.jpa; -import org.wamblee.support.persistence.PersistenceUnitDescription; +import org.wamblee.test.persistence.PersistenceUnitDescription; public class SecurityPersistenceUnit extends PersistenceUnitDescription { diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java index a1bc3f78..d89b6a22 100644 --- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java +++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java @@ -27,9 +27,9 @@ import org.wamblee.security.authentication.User; import org.wamblee.security.authentication.UserAdministration; import org.wamblee.security.authentication.UserAdministrationImpl; import org.wamblee.security.authentication.UserSet; -import org.wamblee.support.persistence.JpaTester; -import org.wamblee.support.persistence.PersistenceUnitDescription; -import org.wamblee.support.persistence.TransactionProxyFactory; +import org.wamblee.test.persistence.JpaTester; +import org.wamblee.test.persistence.PersistenceUnitDescription; +import org.wamblee.test.persistence.TransactionProxyFactory; /** * Setup of a security repository for unit test. This provides all the necessary wiring 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 43daaaf2..ea5036f2 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 @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.wamblee.security.authentication.jpa.SecurityPersistenceUnit; import org.wamblee.security.authorization.AuthorizationService; import org.wamblee.security.authorization.AuthorizationServiceTest; -import org.wamblee.support.persistence.JpaTester; -import org.wamblee.support.persistence.TransactionProxyFactory; +import org.wamblee.test.persistence.JpaTester; +import org.wamblee.test.persistence.TransactionProxyFactory; /** * Unit test for the persistent authorization service. diff --git a/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java b/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java index f73f7066..5b7f51d4 100644 --- a/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java +++ b/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java @@ -22,7 +22,7 @@ import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import org.junit.Test; -import org.wamblee.support.jndi.StubInitialContextFactory; +import org.wamblee.test.jndi.StubInitialContextFactory; public class BeanManagerLookupTest extends BaseTestFixture { diff --git a/support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java b/support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java index cc5f8b22..0caeed85 100644 --- a/support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java +++ b/support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java @@ -22,7 +22,7 @@ import javax.naming.InitialContext; import org.junit.Test; import org.wamblee.inject.InjectorFactory; import org.wamblee.inject.InjectorFactoryBuilder; -import org.wamblee.support.jndi.StubInitialContextFactory; +import org.wamblee.test.jndi.StubInitialContextFactory; public class InjectorFactoryBuilderTest extends BaseTestFixture { diff --git a/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java b/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java index 61cdfb86..d7df81aa 100644 --- a/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java +++ b/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.wamblee.inject.Injector; import org.wamblee.inject.InjectorFactory; import org.wamblee.inject.SimpleInjector; -import org.wamblee.support.jndi.StubInitialContextFactory; +import org.wamblee.test.jndi.StubInitialContextFactory; public class SimpleInjectorTest extends BaseTestFixture { diff --git a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java index 9f3fc26b..fc941724 100644 --- a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java +++ b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponent.java @@ -15,16 +15,15 @@ */ package org.wamblee.system.components; -import org.wamblee.support.persistence.Database; -import org.wamblee.support.persistence.DerbyDatabase; +import java.util.Properties; import org.wamblee.system.components.ORMappingConfig.DatabaseType; import org.wamblee.system.core.AbstractComponent; import org.wamblee.system.core.DefaultProvidedInterface; import org.wamblee.system.core.ProvidedInterface; import org.wamblee.system.core.Scope; - -import java.util.Properties; +import org.wamblee.test.persistence.Database; +import org.wamblee.test.persistence.DerbyDatabase; /** * diff --git a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java index 5728b7f3..a91ecb70 100644 --- a/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java +++ b/system/general/src/test/java/org/wamblee/system/components/DatabaseComponentFactory.java @@ -15,9 +15,8 @@ */ package org.wamblee.system.components; -import org.wamblee.support.persistence.DatabaseBuilder; - import org.wamblee.system.container.Container; +import org.wamblee.test.persistence.DatabaseBuilder; /** * diff --git a/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java b/test/eclipselink/src/main/java/org/wamblee/test/persistence/eclipselink/EclipselinkJpaCustomizer.java similarity index 91% rename from test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java rename to test/eclipselink/src/main/java/org/wamblee/test/persistence/eclipselink/EclipselinkJpaCustomizer.java index b6fd991b..9b184adb 100644 --- a/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java +++ b/test/eclipselink/src/main/java/org/wamblee/test/persistence/eclipselink/EclipselinkJpaCustomizer.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence.eclipselink; - -import org.dbunit.dataset.filter.ITableFilterSimple; - -import org.wamblee.io.FileSystemUtils; -import org.wamblee.support.persistence.JpaCustomizer; -import org.wamblee.support.persistence.PersistenceUnitDescription; +package org.wamblee.test.persistence.eclipselink; import java.io.File; import java.util.Map; +import org.dbunit.dataset.filter.ITableFilterSimple; +import org.wamblee.io.FileSystemUtils; +import org.wamblee.test.persistence.JpaCustomizer; +import org.wamblee.test.persistence.PersistenceUnitDescription; + /** * * @author $author$ diff --git a/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java b/test/eclipselink/src/main/java/org/wamblee/test/persistence/eclipselink/EclipselinkTables.java similarity index 95% rename from test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java rename to test/eclipselink/src/main/java/org/wamblee/test/persistence/eclipselink/EclipselinkTables.java index 29872d01..81f64319 100644 --- a/test/eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java +++ b/test/eclipselink/src/main/java/org/wamblee/test/persistence/eclipselink/EclipselinkTables.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence.eclipselink; +package org.wamblee.test.persistence.eclipselink; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.filter.ITableFilterSimple; diff --git a/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer deleted file mode 100644 index 35638de1..00000000 --- a/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.wamblee.support.persistence.eclipselink.EclipselinkJpaCustomizer diff --git a/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer b/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer new file mode 100644 index 00000000..9e394041 --- /dev/null +++ b/test/eclipselink/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer @@ -0,0 +1 @@ +org.wamblee.test.persistence.eclipselink.EclipselinkJpaCustomizer diff --git a/test/enterprise/src/main/java/org/wamblee/support/jndi/JndiProxyFactory.java b/test/enterprise/src/main/java/org/wamblee/test/jndi/JndiProxyFactory.java similarity index 99% rename from test/enterprise/src/main/java/org/wamblee/support/jndi/JndiProxyFactory.java rename to test/enterprise/src/main/java/org/wamblee/test/jndi/JndiProxyFactory.java index 1b6f67fa..d326fa02 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/jndi/JndiProxyFactory.java +++ b/test/enterprise/src/main/java/org/wamblee/test/jndi/JndiProxyFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.jndi; +package org.wamblee.test.jndi; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java b/test/enterprise/src/main/java/org/wamblee/test/jndi/StubInitialContext.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java rename to test/enterprise/src/main/java/org/wamblee/test/jndi/StubInitialContext.java index e0fd8079..f5277703 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java +++ b/test/enterprise/src/main/java/org/wamblee/test/jndi/StubInitialContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.jndi; +package org.wamblee.test.jndi; import java.util.HashMap; import java.util.Map; diff --git a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java b/test/enterprise/src/main/java/org/wamblee/test/jndi/StubInitialContextFactory.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java rename to test/enterprise/src/main/java/org/wamblee/test/jndi/StubInitialContextFactory.java index 158bd6d8..09389ef1 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContextFactory.java +++ b/test/enterprise/src/main/java/org/wamblee/test/jndi/StubInitialContextFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.jndi; +package org.wamblee.test.jndi; import java.util.Hashtable; diff --git a/test/enterprise/src/main/java/org/wamblee/support/jndi/package-info.java b/test/enterprise/src/main/java/org/wamblee/test/jndi/package-info.java similarity index 96% rename from test/enterprise/src/main/java/org/wamblee/support/jndi/package-info.java rename to test/enterprise/src/main/java/org/wamblee/test/jndi/package-info.java index 505730ea..8777cdbb 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/jndi/package-info.java +++ b/test/enterprise/src/main/java/org/wamblee/test/jndi/package-info.java @@ -20,4 +20,4 @@ * {@link JndiProxyFactory} provides a proxy that transparently delegates to an object in the * JNDI tree. */ -package org.wamblee.support.jndi; \ No newline at end of file +package org.wamblee.test.jndi; \ No newline at end of file diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/AbstractDatabase.java similarity index 99% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/AbstractDatabase.java index 12c82c41..df5cb75f 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabase.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/AbstractDatabase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/AbstractDatabaseProvider.java similarity index 96% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/AbstractDatabaseProvider.java index b15d53b3..9bfa30f1 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/AbstractDatabaseProvider.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/AbstractDatabaseProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.List; /** diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/CompositeJpaCustomizer.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/CompositeJpaCustomizer.java index 3d8c7b8a..08de725c 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaCustomizer.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/CompositeJpaCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.List; import java.util.Map; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/CompositeJpaTables.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/CompositeJpaTables.java index b44ff7cc..23db6d29 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/CompositeJpaTables.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/CompositeJpaTables.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.ArrayList; import java.util.List; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/Database.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/Database.java index 70ab8c5b..da8ff158 100755 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/Database.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/Database.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import javax.sql.DataSource; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseBuilder.java similarity index 99% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseBuilder.java index ae7cd28a..f8ae4a99 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseBuilder.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.ArrayList; import java.util.Arrays; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseDescription.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseDescription.java index 8427c1d8..8f44094a 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseDescription.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseDescription.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; /** * Description of a specific database. diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseProvider.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseProvider.java index 965a2b4f..21699ed8 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseProvider.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; /** * Database provider. This database provider represents a particular type of diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseStarter.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseStarter.java index 1afefd80..8be5ff7c 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseStarter.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseStarter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; /** * This class is used for starting the database as a main program. diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseUtils.java similarity index 99% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseUtils.java index 07dbca0f..c4e38f4d 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DatabaseUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DerbyDatabase.java similarity index 99% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DerbyDatabase.java index a41bf085..adcea6d0 100755 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DerbyDatabase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.io.File; import java.io.PrintWriter; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/DerbyDatabaseProvider.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/DerbyDatabaseProvider.java index 119c8c55..26387962 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabaseProvider.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/DerbyDatabaseProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.Arrays; import java.util.List; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/ExternalDatabase.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/ExternalDatabase.java index 31bcf1e2..a3044576 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabase.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/ExternalDatabase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; /** diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/ExternalDatabaseProvider.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/ExternalDatabaseProvider.java index 5f6e0416..cc54799b 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/ExternalDatabaseProvider.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/ExternalDatabaseProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.Arrays; import java.util.List; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaBuilder.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/JpaBuilder.java index e4cdcfbf..331ea9a1 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaBuilder.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.Map; import java.util.TreeMap; @@ -26,7 +26,7 @@ import javax.persistence.EntityTransaction; import javax.persistence.Persistence; import javax.persistence.PersistenceException; -import org.wamblee.support.jndi.StubInitialContextFactory; +import org.wamblee.test.jndi.StubInitialContextFactory; /** * Utility for building an appropriately configured EntityManagerFactory. The diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaCustomizer.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/JpaCustomizer.java index 9914e2a1..dcafb426 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizer.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.Map; import java.util.ServiceLoader; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaCustomizerBuilder.java similarity index 97% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/JpaCustomizerBuilder.java index 564e8246..bd62c054 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaCustomizerBuilder.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaCustomizerBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.util.ArrayList; import java.util.List; diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java index 26bf6bbc..564163de 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/JpaTester.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.sql.DataSource; import org.dbunit.IDatabaseTester; -import org.wamblee.support.jndi.StubInitialContextFactory; +import org.wamblee.test.jndi.StubInitialContextFactory; /** * This class is the entry point for JPA tests. Test code should construct a diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/PersistenceUnitDescription.java similarity index 96% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/PersistenceUnitDescription.java index c97667b6..4a16dc06 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/PersistenceUnitDescription.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/PersistenceUnitDescription.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; /** diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/TransactionProxyFactory.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/TransactionProxyFactory.java similarity index 96% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/TransactionProxyFactory.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/TransactionProxyFactory.java index 548a3cda..3806dc27 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/TransactionProxyFactory.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/TransactionProxyFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.lang.reflect.InvocationHandler; @@ -23,8 +23,8 @@ import java.lang.reflect.Proxy; import javax.persistence.EntityManager; -import org.wamblee.support.ThreadSpecificProxyFactory; -import org.wamblee.support.persistence.JpaBuilder.JpaUnitOfWork; +import org.wamblee.test.persistence.JpaBuilder.JpaUnitOfWork; +import org.wamblee.test.transactions.ThreadSpecificProxyFactory; /** * This utility makes sure that each invocation on a certain interface is diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__database.jpg b/test/enterprise/src/main/java/org/wamblee/test/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__database.jpg similarity index 100% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__database.jpg rename to test/enterprise/src/main/java/org/wamblee/test/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__database.jpg diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__jpatester.jpg b/test/enterprise/src/main/java/org/wamblee/test/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__jpatester.jpg similarity index 100% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__jpatester.jpg rename to test/enterprise/src/main/java/org/wamblee/test/persistence/doc-files/Class_Diagram__org.wamblee.support.persistence__jpatester.jpg diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java b/test/enterprise/src/main/java/org/wamblee/test/persistence/package-info.java similarity index 99% rename from test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java rename to test/enterprise/src/main/java/org/wamblee/test/persistence/package-info.java index 979dde6f..30055125 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/persistence/package-info.java +++ b/test/enterprise/src/main/java/org/wamblee/test/persistence/package-info.java @@ -244,6 +244,6 @@ * * */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; diff --git a/test/enterprise/src/main/java/org/wamblee/support/ThreadSpecificProxyFactory.java b/test/enterprise/src/main/java/org/wamblee/test/transactions/ThreadSpecificProxyFactory.java similarity index 98% rename from test/enterprise/src/main/java/org/wamblee/support/ThreadSpecificProxyFactory.java rename to test/enterprise/src/main/java/org/wamblee/test/transactions/ThreadSpecificProxyFactory.java index b024e978..78f44367 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/ThreadSpecificProxyFactory.java +++ b/test/enterprise/src/main/java/org/wamblee/test/transactions/ThreadSpecificProxyFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support; +package org.wamblee.test.transactions; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/test/enterprise/src/main/java/org/wamblee/support/package-info.java b/test/enterprise/src/main/java/org/wamblee/test/transactions/package-info.java similarity index 84% rename from test/enterprise/src/main/java/org/wamblee/support/package-info.java rename to test/enterprise/src/main/java/org/wamblee/test/transactions/package-info.java index ce42d032..0342552e 100644 --- a/test/enterprise/src/main/java/org/wamblee/support/package-info.java +++ b/test/enterprise/src/main/java/org/wamblee/test/transactions/package-info.java @@ -14,6 +14,6 @@ * limitations under the License. */ /** - * This package provides basic support utilities for test tools. + * This package provides basic support utilities for testing with transactions. */ -package org.wamblee.support; \ No newline at end of file +package org.wamblee.test.transactions; \ No newline at end of file diff --git a/test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider b/test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider deleted file mode 100644 index 62979fb3..00000000 --- a/test/enterprise/src/main/resources/META-INF/services/org.wamblee.support.persistence.DatabaseProvider +++ /dev/null @@ -1,2 +0,0 @@ -org.wamblee.support.persistence.DerbyDatabaseProvider -org.wamblee.support.persistence.ExternalDatabaseProvider diff --git a/test/enterprise/src/main/resources/META-INF/services/org.wamblee.test.persistence.DatabaseProvider b/test/enterprise/src/main/resources/META-INF/services/org.wamblee.test.persistence.DatabaseProvider new file mode 100644 index 00000000..de5f415b --- /dev/null +++ b/test/enterprise/src/main/resources/META-INF/services/org.wamblee.test.persistence.DatabaseProvider @@ -0,0 +1,2 @@ +org.wamblee.test.persistence.DerbyDatabaseProvider +org.wamblee.test.persistence.ExternalDatabaseProvider diff --git a/test/enterprise/src/site/xdoc/index.xml b/test/enterprise/src/site/xdoc/index.xml index 8f58bf4f..49f8f8db 100644 --- a/test/enterprise/src/site/xdoc/index.xml +++ b/test/enterprise/src/site/xdoc/index.xml @@ -11,9 +11,9 @@

Several utilities are provide for Java EE testing:

diff --git a/test/enterprise/src/test/java/org/wamblee/support/jndi/JndiProxyFactoryTest.java b/test/enterprise/src/test/java/org/wamblee/test/jndi/JndiProxyFactoryTest.java similarity index 93% rename from test/enterprise/src/test/java/org/wamblee/support/jndi/JndiProxyFactoryTest.java rename to test/enterprise/src/test/java/org/wamblee/test/jndi/JndiProxyFactoryTest.java index 28081e98..099135ea 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/jndi/JndiProxyFactoryTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/jndi/JndiProxyFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.jndi; +package org.wamblee.test.jndi; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -23,7 +23,9 @@ import javax.naming.InitialContext; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.wamblee.support.jndi.JndiProxyFactory.JndiWiringException; +import org.wamblee.test.jndi.JndiProxyFactory; +import org.wamblee.test.jndi.StubInitialContextFactory; +import org.wamblee.test.jndi.JndiProxyFactory.JndiWiringException; public class JndiProxyFactoryTest { diff --git a/test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java b/test/enterprise/src/test/java/org/wamblee/test/jndi/StubInitiaContextFactoryTest.java similarity index 97% rename from test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java rename to test/enterprise/src/test/java/org/wamblee/test/jndi/StubInitiaContextFactoryTest.java index c0638148..a0ae2d83 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/jndi/StubInitiaContextFactoryTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/jndi/StubInitiaContextFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.jndi; +package org.wamblee.test.jndi; import static junit.framework.Assert.*; @@ -25,6 +25,7 @@ import javax.naming.NamingException; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.wamblee.test.jndi.StubInitialContextFactory; public class StubInitiaContextFactoryTest { diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseBuilderTest.java similarity index 86% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseBuilderTest.java index e986964e..9a8b205a 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseBuilderTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseBuilderTest.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import org.junit.Test; -import org.wamblee.support.persistence.DatabaseBuilder; -import org.wamblee.support.persistence.DatabaseDescription; +import org.wamblee.test.persistence.Database; +import org.wamblee.test.persistence.DatabaseBuilder; +import org.wamblee.test.persistence.DatabaseDescription; + import static junit.framework.TestCase.*; public class DatabaseBuilderTest { diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsLeakTest.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseUtilsLeakTest.java similarity index 79% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsLeakTest.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseUtilsLeakTest.java index b7770b0a..a8ff4f41 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsLeakTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseUtilsLeakTest.java @@ -1,4 +1,4 @@ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import static junit.framework.Assert.*; @@ -7,6 +7,9 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.wamblee.test.persistence.Database; +import org.wamblee.test.persistence.DatabaseBuilder; +import org.wamblee.test.persistence.DatabaseUtils; public class DatabaseUtilsLeakTest { diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseUtilsTestBase.java similarity index 88% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseUtilsTestBase.java index 79745297..12f3923c 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/DatabaseUtilsTestBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import static junit.framework.Assert.assertEquals; @@ -25,12 +25,13 @@ import org.dbunit.dataset.ITable; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.wamblee.support.persistence.Database; -import org.wamblee.support.persistence.DatabaseBuilder; -import org.wamblee.support.persistence.DatabaseUtils; -import org.wamblee.support.persistence.JpaBuilder; -import org.wamblee.support.persistence.PersistenceUnitDescription; -import org.wamblee.support.persistence.JpaBuilder.JpaUnitOfWork; +import org.wamblee.test.persistence.Database; +import org.wamblee.test.persistence.DatabaseBuilder; +import org.wamblee.test.persistence.DatabaseUtils; +import org.wamblee.test.persistence.JpaBuilder; +import org.wamblee.test.persistence.JpaCustomizerBuilder; +import org.wamblee.test.persistence.PersistenceUnitDescription; +import org.wamblee.test.persistence.JpaBuilder.JpaUnitOfWork; public class DatabaseUtilsTestBase { private Database db; diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/DerbyDatabaseTest.java similarity index 91% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/DerbyDatabaseTest.java index 85a581ee..b7b31839 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/DerbyDatabaseTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/DerbyDatabaseTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.sql.Connection; @@ -22,8 +22,8 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.wamblee.support.persistence.Database; -import org.wamblee.support.persistence.DatabaseBuilder; +import org.wamblee.test.persistence.Database; +import org.wamblee.test.persistence.DatabaseBuilder; public class DerbyDatabaseTest { diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/ExternalDatabaseTest.java similarity index 88% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/ExternalDatabaseTest.java index ca91e87f..a1ad9823 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/ExternalDatabaseTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/ExternalDatabaseTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import java.sql.Connection; import javax.sql.DataSource; import org.junit.Test; -import org.wamblee.support.persistence.Database; -import org.wamblee.support.persistence.DatabaseBuilder; -import org.wamblee.support.persistence.DatabaseProvider; -import org.wamblee.support.persistence.ExternalDatabase; +import org.wamblee.test.persistence.Database; +import org.wamblee.test.persistence.DatabaseBuilder; +import org.wamblee.test.persistence.DatabaseProvider; +import org.wamblee.test.persistence.ExternalDatabase; import static junit.framework.TestCase.*; diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyEntity.java similarity index 96% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/MyEntity.java index f7dd128a..42c2378f 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntity.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyEntityExampleTestBase.java similarity index 92% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/MyEntityExampleTestBase.java index 649508e6..737455ce 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyEntityExampleTestBase.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyEntityExampleTestBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import static junit.framework.Assert.*; @@ -24,7 +24,10 @@ import org.dbunit.dataset.ITable; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.wamblee.support.persistence.JpaBuilder.JpaUnitOfWork; +import org.wamblee.test.persistence.DatabaseUtils; +import org.wamblee.test.persistence.JpaBuilder; +import org.wamblee.test.persistence.JpaTester; +import org.wamblee.test.persistence.JpaBuilder.JpaUnitOfWork; /** * This class shows an example of how to test an entity using jpa. diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyPersistenceUnit.java similarity index 90% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/MyPersistenceUnit.java index 5b1b278b..ca90304a 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyPersistenceUnit.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyPersistenceUnit.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; -import org.wamblee.support.persistence.PersistenceUnitDescription; +import org.wamblee.test.persistence.PersistenceUnitDescription; /** * This class describes the persistence unit that we are testing. diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java similarity index 96% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java index e0a337fe..4fee6b25 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/MyTables.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.filter.ITableFilterSimple; diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/TransactionProxyFactoryTestBase.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/TransactionProxyFactoryTestBase.java similarity index 93% rename from test/enterprise/src/test/java/org/wamblee/support/persistence/TransactionProxyFactoryTestBase.java rename to test/enterprise/src/test/java/org/wamblee/test/persistence/TransactionProxyFactoryTestBase.java index 286c8757..288cb8dd 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/TransactionProxyFactoryTestBase.java +++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/TransactionProxyFactoryTestBase.java @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support.persistence; +package org.wamblee.test.persistence; import javax.persistence.EntityManager; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.wamblee.support.persistence.JpaBuilder.JpaUnitOfWork; +import org.wamblee.test.persistence.JpaTester; +import org.wamblee.test.persistence.TransactionProxyFactory; +import org.wamblee.test.persistence.JpaBuilder.JpaUnitOfWork; import static junit.framework.TestCase.*; import static org.mockito.Mockito.*; diff --git a/test/enterprise/src/test/java/org/wamblee/support/ThreadSpecificProxyFactoryTest.java b/test/enterprise/src/test/java/org/wamblee/test/transactions/ThreadSpecificProxyFactoryTest.java similarity index 96% rename from test/enterprise/src/test/java/org/wamblee/support/ThreadSpecificProxyFactoryTest.java rename to test/enterprise/src/test/java/org/wamblee/test/transactions/ThreadSpecificProxyFactoryTest.java index 0e9dbe48..c2f87977 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/ThreadSpecificProxyFactoryTest.java +++ b/test/enterprise/src/test/java/org/wamblee/test/transactions/ThreadSpecificProxyFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.support; +package org.wamblee.test.transactions; import static junit.framework.Assert.*; import static org.mockito.Matchers.*; @@ -22,6 +22,7 @@ import static org.mockito.Mockito.*; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.wamblee.test.transactions.ThreadSpecificProxyFactory; public class ThreadSpecificProxyFactoryTest { diff --git a/test/enterprise/src/test/resources/META-INF/persistence.xml b/test/enterprise/src/test/resources/META-INF/persistence.xml index c2528813..bebde3e0 100644 --- a/test/enterprise/src/test/resources/META-INF/persistence.xml +++ b/test/enterprise/src/test/resources/META-INF/persistence.xml @@ -5,7 +5,7 @@ wamblee/support/test - org.wamblee.support.persistence.MyEntity + org.wamblee.test.persistence.MyEntity