package rename for test libraries.

diff --git a/TODO.txt b/TODO.txt
index 24837472bbd047e56dd40376c2b0dd6f1d81a4f5..34c042a26faba0c81cb955875d3ccff2aeb6c8b0 100644 (file)
--- 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 fe684088639d59953dbd3c671923a85454e207f0..aa736302f622041f1e31569d182085accf27baae 100644 (file)
--- 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 2a0048e92037fa0d001da4546ec33f52d8f9b40f..9084a3f8433a41e099ad5802783a011e6276dc07 100644 (file)
--- 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 e5430fb6bd9d066f31e67f77fe5906ee34143b22..4a9ab5f0e0a9f78663966c40ff7804e366c7545a 100644 (file)
--- 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 d41500ac0cbccf481ea61264ad01216857202bc2..cf6d423522c88be94d6b9990fc6495bd67d4d147 100644 (file)
--- 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 a1bc3f7835b308885c8d20cae2ab5e942ff5ef94..d89b6a226a8332245a57ea6a74df12329f27f059 100644 (file)
--- 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 43daaaf25e457d767ee727ae430ec8acf01e3081..ea5036f2f8f08c78dcfca713958f3272dcf2ac8a 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
@@ -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 f73f706626fbed73464a8a28c5d5c1a26ba82d09..5b7f51d495981a426e9729bb76fbcaf0a65cc2c9 100644 (file)
--- 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 cc5f8b227079e2cd4a83ea08cdaea7167c2396a7..0caeed85e99f62a48cdb75b4797f50651282caae 100644 (file)
--- 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 61cdfb86cd08048615ece0a36dfda670e4e9fca8..d7df81aae2aefedccf4f145cf0e3af009e8195c3 100644 (file)
--- 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 9f3fc26b05263cf2e4630bae8b1e3c67da7eca57..fc941724e9a2b215edd45313ba435f4032c3a79b 100644 (file)
--- 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 5728b7f3c9be53c12cbc626ac702daf0189c1b52..a91ecb70b9b9c8ef960593d8be857e979c12d5be 100644 (file)
--- 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 b6fd991b237b09d2554dac239eed3283cf90d67b..9b184adbdf0b786257bf480c4c8be3a59e4b9cc7 100644 (file)
--- 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 29872d016b5b79e0735a4252e145adff71259ad3..81f64319e5bb6dc3f3a1860b5d8bffb8d87a2459 100644 (file)
--- 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 (file)
index 35638de..0000000
--- 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 (file)
index 0000000..9e39404
--- /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 1b6f67fa09a69e135ffc25a10621c834a69945be..d326fa029219bf1ad4ab55d011cffb0ae84144bb 100644 (file)
--- 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 e0fd8079fb8919e5d82a0ab6ff511747260f9149..f527770345370767c72d7d1946578ed9f2d1e74f 100644 (file)
--- 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 158bd6d8b8d8048ff8928e6c844681c0e6fac262..09389ef10059036d956705401d43a053614b70b7 100644 (file)
--- 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 505730ea5fb52035ecbca25b3307eb791b835ce0..8777cdbb941fb257ae7b6cb3d73422c331a3b5a3 100644 (file)
--- 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 12c82c41177b7fe9f66d239d1d642d4218c0a1b9..df5cb75f44810f4a318f1de694f8bc2f3f384c4d 100644 (file)
--- 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 b15d53b398a4381659a431b3988d4c2691954597..9bfa30f18a25ad41d8f8a7efc9d87896a7f63e90 100644 (file)
--- 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 3d8c7b8a0a23451c108a00c4320d9f169b8b2a7f..08de725c217b182bb9d2ba0261034d2c226fc6fb 100644 (file)
--- 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 b44ff7cce56e52ca6ae8622772782b9eaa7613aa..23db6d29e39aec2547f64d366acab984c4c8a75e 100644 (file)
--- 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 70ab8c5bb7b7dddb86889c6b5fd08256863f4677..da8ff158ab0e6160f6a5db1174f5d9229503436e 100755 (executable)
--- 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 ae7cd28aa78259d08f395056e20b2ae830b07613..f8ae4a99e559e33d53e9551d9f5cd56381b3e400 100644 (file)
--- 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 8427c1d8ce8ad9b26b6cb31ca85d982720060a6d..8f44094aa282825602d7b53a85249955b60f6ede 100644 (file)
--- 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 965a2b4f018e4ea8c81ff8b712b942b8aaa0cb45..21699ed80812e4f352c57751a5ebed01a4fbebbe 100644 (file)
--- 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 1afefd808046667b129f91de6cfafd4fcb36ea37..8be5ff7c3829093636cecbbf1ff95e41409b736f 100644 (file)
--- 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 07dbca0f64363988f18c76da9bd599ba55ee2865..c4e38f4d0a6e1c89325b3cbd1a675894675ac0ed 100644 (file)
--- 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 a41bf0850c4e97cf7cce1c5afb5dd2128acf06fb..adcea6d0bc55ebdaacd651853fccfba68b9a3cbc 100755 (executable)
--- 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 119c8c55efe6c05cf6cdfa60b59171cd101a12ac..26387962b17ffab39958bb49953b851eab81480d 100644 (file)
--- 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 31bcf1e2e090bf2e7522b0677e557086fd1728d0..a3044576f9f3afb7fc21ae0380d87dba4d960462 100644 (file)
--- 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 5f6e0416ee47b7731014766bd9c019d9077baa65..cc54799bc0ef5fcca63c11457e6751acc2d1669b 100644 (file)
--- 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 e4cdcfbf7ce3110a88c622f1328d90be22804326..331ea9a10390b11b88375b32dfbe714ce9e9f9e7 100644 (file)
--- 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 9914e2a1158db2a9d8257dc8f90cf86ace0b6193..dcafb4260011a277589235a003f44871d80e00bf 100644 (file)
--- 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 564e82461d61a09a80c74fe0003403727c9ca29b..bd62c054fcfc40381c485f9dbc8efc684ccee291 100644 (file)
--- 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 26bf6bbc1d75f8c9edb43fafcb5013529c8553ef..564163de296b6a5ae1f42c2566b8e6a510be431b 100644 (file)
--- 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 c97667b678642cbe6e2f6b73dcc561a07f2f6c0c..4a16dc06d0522c863ef98252719488df1a7e1ea5 100644 (file)
--- 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 548a3cdaebc1a8279ebaef779854807387925a99..3806dc2783bb23c69ba444b21f7c01bd13f3668c 100644 (file)
--- 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 979dde6f7c0189c5d4a53f709d610403218de996..3005512588ce7977c69e07eff61a88e0ef158127 100644 (file)
--- 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 b024e9785fa0c870d41fbf55be6fc77b4dc7dd9b..78f4436751cfb0f176e78437261cf50ed8367754 100644 (file)
--- 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 ce42d03273edc2a9a0c7ebf498616f05afb6573b..0342552e314a9153b264c01cf5733865dd3abb47 100644 (file)
--- 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 (file)
index 62979fb..0000000
--- 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 (file)
index 0000000..de5f415
--- /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 8f58bf4fc362733a8881b33ccd9c13241b48e876..49f8f8dbc144b64346e526aa702616b3fa6c7184 100644 (file)
--- a/test/enterprise/src/site/xdoc/index.xml
+++ b/test/enterprise/src/site/xdoc/index.xml
@@ -11,9 +11,9 @@
     <section name="Introduction">
       <p>Several utilities are provide for Java EE testing: </p>
       <ul>
-        <li><a href="apidocs/org/wamblee/support/package-summary.html">Basic Support</a></li>
-        <li><a href="apidocs/org/wamblee/support/jndi/package-summary.html">JNDI</a></li>
-        <li><a href="apidocs/org/wamblee/support/persistence/package-summary.html">Persistence</a></li>
+        <li><a href="apidocs/org/wamblee/test/transactionspackage-summary.html">transactions</a></li>
+        <li><a href="apidocs/org/wamblee/test/jndi/package-summary.html">jndi</a></li>
+        <li><a href="apidocs/org/wamblee/test/persistence/package-summary.html">Persistence</a></li>
       </ul>
     </section>
 

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 28081e98eee60dff7e42365de84fee4aad0a54cc..099135ea237b301f056a30658efa2983aa558621 100644 (file)
--- 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 c0638148447e82f53df25df37faccb29f24686cb..a0ae2d83f6cbc8bab9b7ac61b3c164bf6effb717 100644 (file)
--- 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 e986964efb779a431519ae109217e3ef241bc9a3..9a8b205ad0a2ebe0e0372c01b1a66c190644a11e 100644 (file)
--- 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 b7770b0a53ff6d6ecaa4578fc8d5e3cbc8874432..a8ff4f41d472f269c78581a3d0092e771e6d2478 100644 (file)
--- 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 7974529753c03f6c1e32685150c839004a701053..12f3923c8fcfe13aef1ad09e7e73e4ea4157abd6 100644 (file)
--- 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 85a581ee3cc436851da38e0410f62bf70b0da2da..b7b318390f5731409b728f1032dbdd25a04a4ac5 100644 (file)
--- 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 ca91e87f344737b1fc084f96ba87ad0584d389cf..a1ad9823d64f0d676c08b5754b0395798d50d89d 100644 (file)
--- 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 f7dd128a275c65643238c0299c78b41cb05b08da..42c2378fbfc9c5ec61f614f5b78dfead7d7909e7 100644 (file)
--- 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 649508e658b76f0431284a5984d75568a7a743e1..737455ce77ae6f0c75fa149172452342a739f254 100644 (file)
--- 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 5b1b278b20788afc33498dbad98426db80b1a130..ca90304a9af8e2f60065fcff7ae6062131344264 100644 (file)
--- 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 e0a337fe352e4a0a54e61e22f60691b4b85232b3..4fee6b25ee5896318b922ae0ab8aa2a9b447981d 100644 (file)
--- 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 286c8757bb81248a2f6622ac6ffd00dbb6854f24..288cb8dddf2d1866d393ab4f91c59fae437cfc69 100644 (file)
--- 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 0e9dbe48f0583b5c14773170cf77904d6857e810..c2f87977708964c7bd42089f7e40c381f24f09d3 100644 (file)
--- 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 c25288134cfebdb600707af77e185d4992529cf5..bebde3e048f83e08c77beb347940ad00978054d0 100644 (file)
--- a/test/enterprise/src/test/resources/META-INF/persistence.xml
+++ b/test/enterprise/src/test/resources/META-INF/persistence.xml
@@ -5,7 +5,7 @@
        <persistence-unit name="org.wamblee.jee.support-test"
                transaction-type="JTA">
                <jta-data-source>wamblee/support/test</jta-data-source>
-               <class>org.wamblee.support.persistence.MyEntity</class>
+               <class>org.wamblee.test.persistence.MyEntity</class>
                <properties>
                        <!--
                                <property name="toplink.ddl-generation"

diff --git a/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java b/test/hibernate/src/main/java/org/wamblee/test/persistence/hibernate/HibernateJpaCustomizer.java
similarity index 92%
rename from test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java
rename to test/hibernate/src/main/java/org/wamblee/test/persistence/hibernate/HibernateJpaCustomizer.java
index 923d0c225106793f4c5fb2a7fb99ffadf3633f93..fd576dbe6a962026eb5247185080cf4684a1f4c6 100644 (file)
--- a/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java
+++ b/test/hibernate/src/main/java/org/wamblee/test/persistence/hibernate/HibernateJpaCustomizer.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.hibernate;
-
-import org.dbunit.dataset.filter.ITableFilterSimple;
-
-import org.wamblee.support.persistence.JpaCustomizer;
-import org.wamblee.support.persistence.PersistenceUnitDescription;
+package org.wamblee.test.persistence.hibernate;
 
 import java.util.Map;
 
+import org.dbunit.dataset.filter.ITableFilterSimple;
+import org.wamblee.test.persistence.JpaCustomizer;
+import org.wamblee.test.persistence.PersistenceUnitDescription;
+
 /**
  * 
  * @author $author$

diff --git a/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java b/test/hibernate/src/main/java/org/wamblee/test/persistence/hibernate/HibernateTables.java
similarity index 95%
rename from test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java
rename to test/hibernate/src/main/java/org/wamblee/test/persistence/hibernate/HibernateTables.java
index f58ea8e98d4c0b21ab019813c52571024ab75d6b..e5caab198f4e30f4eec0a351e7faab339e6602e3 100644 (file)
--- a/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java
+++ b/test/hibernate/src/main/java/org/wamblee/test/persistence/hibernate/HibernateTables.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.hibernate;
+package org.wamblee.test.persistence.hibernate;
 
 import org.dbunit.dataset.DataSetException;
 import org.dbunit.dataset.filter.ITableFilterSimple;

diff --git a/test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer
deleted file mode 100644 (file)
index d057634..0000000
--- a/test/hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.wamblee.support.persistence.hibernate.HibernateJpaCustomizer

diff --git a/test/hibernate/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer b/test/hibernate/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer
new file mode 100644 (file)
index 0000000..5d36390
--- /dev/null
+++ b/test/hibernate/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer
@@ -0,0 +1 @@
+org.wamblee.test.persistence.hibernate.HibernateJpaCustomizer

diff --git a/test/jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java b/test/jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink/DatabaseUtilsTest.java
similarity index 87%
rename from test/jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java
rename to test/jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink/DatabaseUtilsTest.java
index c45ea93ce0fe272f6f4ec85c981635ec37074203..dcf314a0a2e021ea9630f20cfa32ed9f311619c6 100644 (file)
--- a/test/jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java
+++ b/test/jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink/DatabaseUtilsTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.toplink;
+package org.wamblee.test.persistence.eclipselink;
 
-import org.wamblee.support.persistence.DatabaseUtilsTestBase;
+import org.wamblee.test.persistence.DatabaseUtilsTestBase;
 
 /**
  * 

diff --git a/test/jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java b/test/jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink/MyEntityExampleTest.java
similarity index 87%
rename from test/jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java
rename to test/jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink/MyEntityExampleTest.java
index 8d60e75ef36d299dbe1c42f3875a737c09f9791d..4d5b78c2f428a2e57ea0c0b7b1d4b24cb901660c 100644 (file)
--- a/test/jpatest-toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java
+++ b/test/jpatest-eclipselink/src/test/java/org/wamblee/test/persistence/eclipselink/MyEntityExampleTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.toplink;
+package org.wamblee.test.persistence.eclipselink;
 
-import org.wamblee.support.persistence.MyEntityExampleTestBase;
+import org.wamblee.test.persistence.MyEntityExampleTestBase;
 
 /**
  * This class shows an example of how to test an entity using jpa.

diff --git a/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java b/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java
deleted file mode 100644 (file)
index df057b5..0000000
--- a/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.wamblee.support.persistence.hibernate;
-
-import org.wamblee.support.persistence.TransactionProxyFactoryTestBase;
-
-public class TransactionProxyFactoryTest extends
-    TransactionProxyFactoryTestBase {
-
-}

diff --git a/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java b/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/DatabaseUtilsTest.java
similarity index 87%
rename from test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java
rename to test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/DatabaseUtilsTest.java
index 6059c9563401bc8c61c1654608eb591c33201e4c..31dae6c30e658b0c82ef562151120bcbe68fcb6b 100644 (file)
--- a/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java
+++ b/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/DatabaseUtilsTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.hibernate;
+package org.wamblee.test.persistence.hibernate;
 
-import org.wamblee.support.persistence.DatabaseUtilsTestBase;
+import org.wamblee.test.persistence.DatabaseUtilsTestBase;
 
 /**
  * 

diff --git a/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java b/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/MyEntityExampleTest.java
similarity index 87%
rename from test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java
rename to test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/MyEntityExampleTest.java
index 3ac32a5dbc01a2a78ab5f5a5229e91d83ee69db4..39550ea408760bfcfa9179f78304bdcf042456e0 100644 (file)
--- a/test/jpatest-hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java
+++ b/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/MyEntityExampleTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.hibernate;
+package org.wamblee.test.persistence.hibernate;
 
-import org.wamblee.support.persistence.MyEntityExampleTestBase;
+import org.wamblee.test.persistence.MyEntityExampleTestBase;
 
 /**
  * This class shows an example of how to test an entity using jpa.

diff --git a/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/TransactionProxyFactoryTest.java b/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/TransactionProxyFactoryTest.java
new file mode 100644 (file)
index 0000000..725f33a
--- /dev/null
+++ b/test/jpatest-hibernate/src/test/java/org/wamblee/test/persistence/hibernate/TransactionProxyFactoryTest.java
@@ -0,0 +1,8 @@
+package org.wamblee.test.persistence.hibernate;
+
+import org.wamblee.test.persistence.TransactionProxyFactoryTestBase;
+
+public class TransactionProxyFactoryTest extends
+    TransactionProxyFactoryTestBase {
+
+}

diff --git a/test/jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java b/test/jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink/DatabaseUtilsTest.java
similarity index 87%
rename from test/jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java
rename to test/jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink/DatabaseUtilsTest.java
index 3fbf2f20927b2e1d83ecce994074e0b87e337135..5d6efb3a73627e2d73c385175db48d0cd7ddc933 100644 (file)
--- a/test/jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java
+++ b/test/jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink/DatabaseUtilsTest.java
@@ -13,9 +13,9 @@
  * 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.toplink;
 
-import org.wamblee.support.persistence.DatabaseUtilsTestBase;
+import org.wamblee.test.persistence.DatabaseUtilsTestBase;
 
 /**
  * 

diff --git a/test/jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java b/test/jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink/MyEntityExampleTest.java
similarity index 87%
rename from test/jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java
rename to test/jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink/MyEntityExampleTest.java
index e95afb8fc556b2432300538f36274e6b3a809e7b..6f26783d76978f5b4665470071aff4a61e8d81bf 100644 (file)
--- a/test/jpatest-eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java
+++ b/test/jpatest-toplink-essentials/src/test/java/org/wamblee/test/persistence/toplink/MyEntityExampleTest.java
@@ -13,9 +13,9 @@
  * 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.toplink;
 
-import org.wamblee.support.persistence.MyEntityExampleTestBase;
+import org.wamblee.test.persistence.MyEntityExampleTestBase;
 
 /**
  * This class shows an example of how to test an entity using jpa.

diff --git a/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java b/test/toplink-essentials/src/main/java/org/wamblee/test/persistence/toplink/ToplinkJpaCustomizer.java
similarity index 92%
rename from test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java
rename to test/toplink-essentials/src/main/java/org/wamblee/test/persistence/toplink/ToplinkJpaCustomizer.java
index da40441cd3de35cb2cef7818291c4e8975e24334..a624f35c828bb5406de010c9b4b85c5cde3779c4 100644 (file)
--- a/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java
+++ b/test/toplink-essentials/src/main/java/org/wamblee/test/persistence/toplink/ToplinkJpaCustomizer.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.toplink;
+package org.wamblee.test.persistence.toplink;
 
 import java.io.File;
 import java.util.Map;
 
 import org.dbunit.dataset.filter.ITableFilterSimple;
 import org.wamblee.io.FileSystemUtils;
-import org.wamblee.support.persistence.JpaCustomizer;
-import org.wamblee.support.persistence.PersistenceUnitDescription;
+import org.wamblee.test.persistence.JpaCustomizer;
+import org.wamblee.test.persistence.PersistenceUnitDescription;
 
 /**
  * 

diff --git a/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java b/test/toplink-essentials/src/main/java/org/wamblee/test/persistence/toplink/ToplinkTables.java
similarity index 95%
rename from test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java
rename to test/toplink-essentials/src/main/java/org/wamblee/test/persistence/toplink/ToplinkTables.java
index 4a99d7de001e4b758e7fc89432c6d7e77c3f7bf2..c456a40c835e0a1f5a9c2788da9cf8077d4902d1 100644 (file)
--- a/test/toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java
+++ b/test/toplink-essentials/src/main/java/org/wamblee/test/persistence/toplink/ToplinkTables.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.support.persistence.toplink;
+package org.wamblee.test.persistence.toplink;
 
 import org.dbunit.dataset.DataSetException;
 import org.dbunit.dataset.filter.ITableFilterSimple;

diff --git a/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer
deleted file mode 100644 (file)
index 82d1265..0000000
--- a/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.wamblee.support.persistence.toplink.ToplinkJpaCustomizer

diff --git a/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer b/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer
new file mode 100644 (file)
index 0000000..c1735a4
--- /dev/null
+++ b/test/toplink-essentials/src/main/resources/META-INF/services/org.wamblee.test.persistence.JpaCustomizer
@@ -0,0 +1 @@
+org.wamblee.test.persistence.toplink.ToplinkJpaCustomizer