From 6baa1546bf990db7c66e9837bbb23f1070bf81e0 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Mon, 31 Mar 2008 20:21:32 +0000
Subject: [PATCH]
---
.classpath | 6 ++----
crawler/kiss/pom.xml | 5 +++++
.../kiss/main/StandaloneCrawlerBeanFactory.java | 2 +-
.../crawler/kiss/spring/CrawlerBeanFactory.java | 2 +-
mythtv/monitor/pom.xml | 5 +++++
.../java/org/wamblee/mythtv/MythtvBeanFactory.java | 2 +-
security/pom.xml | 12 ++++++++++++
.../authorization/AuthorizationServiceTest.java | 4 ++--
.../org/wamblee/usermgt/InMemoryGroupSetTest.java | 4 ++--
.../org/wamblee/usermgt/InMemoryUserSetTest.java | 4 ++--
.../wamblee/usermgt/UserAdministrationImplTest.java | 4 ++--
.../wamblee/usermgt/UsermgtSpringConfigFiles.java | 2 +-
.../usermgt/hibernate/HibernateGroupSetTest.java | 2 +-
.../hibernate/HibernateUserAdministrationTest.java | 2 +-
.../spring/test.org.wamblee.security.usermgt.xml | 2 +-
.../org/wamblee/xml/ClasspathUriResolverTest.java | 3 ++-
.../org/wamblee/concurrency/spring}/LockAdvice.java | 3 ++-
.../wamblee/general/spring}/SpringBeanFactory.java | 5 ++++-
.../persistence/hibernate/HibernateMappingFiles.java | 0
.../persistence/hibernate/HibernateSupport.java | 0
.../org/wamblee/persistence/hibernate/package.html | 0
.../wamblee/concurrency/spring}/LockAdviceTest.java | 5 ++++-
.../general/spring}/SpringBeanFactoryTest.java | 4 +++-
.../org/wamblee/general/spring}/TestBeanFactory.java | 2 +-
.../org/wamblee/test/spring}/HibernateExporter.java | 2 +-
.../org/wamblee/test/spring}/HibernateUpdater.java | 2 +-
.../org/wamblee/test/spring}/HibernateUtils.java | 2 +-
.../org/wamblee/test/spring}/SpringConfigFiles.java | 2 +-
.../org/wamblee/test/spring}/SpringTestCase.java | 2 +-
.../wamblee/test/spring}/TestSpringBeanFactory.java | 2 +-
.../test/spring}/TestTransactionCallback.java | 2 +-
.../TestTransactionCallbackWithoutResult.java | 2 +-
32 files changed, 63 insertions(+), 33 deletions(-)
rename support/{general/src/main/java/org/wamblee/concurrency => spring/src/main/java/org/wamblee/concurrency/spring}/LockAdvice.java (95%)
rename support/{general/src/main/java/org/wamblee/general => spring/src/main/java/org/wamblee/general/spring}/SpringBeanFactory.java (95%)
rename support/{general => spring}/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java (100%)
rename support/{general => spring}/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java (100%)
rename support/{general => spring}/src/main/java/org/wamblee/persistence/hibernate/package.html (100%)
rename support/{general/src/test/java/org/wamblee/concurrency => spring/src/test/java/org/wamblee/concurrency/spring}/LockAdviceTest.java (92%)
rename support/{general/src/test/java/org/wamblee/general => spring/src/test/java/org/wamblee/general/spring}/SpringBeanFactoryTest.java (95%)
rename support/{general/src/test/java/org/wamblee/general => spring/src/test/java/org/wamblee/general/spring}/TestBeanFactory.java (95%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/HibernateExporter.java (97%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/HibernateUpdater.java (97%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/HibernateUtils.java (98%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/SpringConfigFiles.java (97%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/SpringTestCase.java (99%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/TestSpringBeanFactory.java (98%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/TestTransactionCallback.java (94%)
rename support/{general/src/test/java/org/wamblee/test => spring/src/test/java/org/wamblee/test/spring}/TestTransactionCallbackWithoutResult.java (91%)
diff --git a/.classpath b/.classpath
index 67ca5414..10e62e07 100644
--- a/.classpath
+++ b/.classpath
@@ -4,10 +4,8 @@
<classpathentry kind="src" path="support/general/src/test/java"/>
<classpathentry excluding="**" kind="src" output="support/general/src/main/resources" path="support/general/src/main/resources"/>
<classpathentry excluding="**" kind="src" output="support/general/src/test/resources" path="support/general/src/test/resources"/>
- <classpathentry kind="src" path="support/src/main/java"/>
- <classpathentry kind="src" path="support/src/test/java"/>
- <classpathentry excluding="**" kind="src" output="support/src/main/resources" path="support/src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="support/src/test/resources" path="support/src/test/resources"/>
+ <classpathentry kind="src" path="support/spring/src/main/java"/>
+ <classpathentry kind="src" path="support/spring/src/test/java"/>
<classpathentry kind="src" path="system/general/src/main/java"/>
<classpathentry kind="src" path="system/general/src/test/java"/>
<classpathentry kind="src" path="system/spring/src/main/java"/>
diff --git a/crawler/kiss/pom.xml b/crawler/kiss/pom.xml
index 3c7eb5c4..8d82bd26 100644
--- a/crawler/kiss/pom.xml
+++ b/crawler/kiss/pom.xml
@@ -19,6 +19,11 @@
<dependency>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-crawler-basic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-support-spring</artifactId>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-email</groupId>
diff --git a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java
index fcd819f0..cb0e8481 100644
--- a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java
+++ b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/StandaloneCrawlerBeanFactory.java
@@ -16,7 +16,7 @@
package org.wamblee.crawler.kiss.main;
-import org.wamblee.general.SpringBeanFactory;
+import org.wamblee.general.spring.SpringBeanFactory;
/**
* Bean factory used for the standalone crawler application.
diff --git a/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java
index 0d34aa1c..d4e2379c 100644
--- a/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java
+++ b/crawler/kissweb/src/main/java/org/wamblee/crawler/kiss/spring/CrawlerBeanFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.wamblee.crawler.kiss.spring;
-import org.wamblee.general.SpringBeanFactory;
+import org.wamblee.general.spring.SpringBeanFactory;
/**
diff --git a/mythtv/monitor/pom.xml b/mythtv/monitor/pom.xml
index a1879788..669baa52 100644
--- a/mythtv/monitor/pom.xml
+++ b/mythtv/monitor/pom.xml
@@ -20,6 +20,11 @@
<groupId>org.wamblee</groupId>
<artifactId>wamblee-support-general</artifactId>
<version>0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-support-spring</artifactId>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
index f7564424..0334ad77 100644
--- a/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
+++ b/mythtv/monitor/src/main/java/org/wamblee/mythtv/MythtvBeanFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.wamblee.mythtv;
-import org.wamblee.general.SpringBeanFactory;
+import org.wamblee.general.spring.SpringBeanFactory;
/**
diff --git a/security/pom.xml b/security/pom.xml
index 6a687f67..140a904b 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -27,6 +27,18 @@
<type>test-jar</type>
<version>0.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-support-spring</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-support-spring</artifactId>
+ <type>test-jar</type>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-hibernate-jpa</artifactId>
diff --git a/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
index 1e4d9c9a..fd042bca 100644
--- a/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
+++ b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
@@ -20,8 +20,8 @@ import static org.wamblee.security.authorization.AuthorizationResult.DENIED;
import static org.wamblee.security.authorization.AuthorizationResult.GRANTED;
import org.wamblee.persistence.hibernate.HibernateMappingFiles;
-import org.wamblee.test.SpringConfigFiles;
-import org.wamblee.test.SpringTestCase;
+import org.wamblee.test.spring.SpringTestCase;
+import org.wamblee.test.spring.SpringConfigFiles;
import org.wamblee.usermgt.UserAccessor;
/**
diff --git a/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java
index a751a103..100fad37 100644
--- a/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java
@@ -20,8 +20,8 @@ import java.sql.SQLException;
import java.util.Set;
import org.wamblee.persistence.hibernate.HibernateMappingFiles;
-import org.wamblee.test.SpringConfigFiles;
-import org.wamblee.test.SpringTestCase;
+import org.wamblee.test.spring.SpringTestCase;
+import org.wamblee.test.spring.SpringConfigFiles;
/**
* Tests the inmemory group set. Intended to be subclassed for other
diff --git a/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java
index 0e3c7592..4154d6e4 100644
--- a/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java
@@ -21,8 +21,8 @@ import java.util.Set;
import org.wamblee.persistence.hibernate.HibernateMappingFiles;
import org.wamblee.security.encryption.Md5HexMessageDigester;
-import org.wamblee.test.SpringConfigFiles;
-import org.wamblee.test.SpringTestCase;
+import org.wamblee.test.spring.SpringTestCase;
+import org.wamblee.test.spring.SpringConfigFiles;
import org.wamblee.usermgt.UserMgtException.Reason;
/**
diff --git a/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java b/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java
index 3bf91923..c64f5718 100644
--- a/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java
@@ -21,8 +21,8 @@ import java.util.Set;
import org.apache.log4j.Logger;
import org.wamblee.persistence.hibernate.HibernateMappingFiles;
import org.wamblee.security.encryption.Md5HexMessageDigester;
-import org.wamblee.test.SpringConfigFiles;
-import org.wamblee.test.SpringTestCase;
+import org.wamblee.test.spring.SpringConfigFiles;
+import org.wamblee.test.spring.SpringTestCase;
import org.wamblee.usermgt.UserMgtException.Reason;
/**
diff --git a/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java b/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java
index 7baf09db..e9c97d3f 100644
--- a/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java
+++ b/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java
@@ -18,7 +18,7 @@ package org.wamblee.usermgt;
import java.util.Collections;
-import org.wamblee.test.SpringConfigFiles;
+import org.wamblee.test.spring.SpringConfigFiles;
/**
* Spring config files for user management.
diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
index 0723b841..5e5871e4 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.wamblee.general.BeanKernel;
-import org.wamblee.test.TestTransactionCallback;
+import org.wamblee.test.spring.TestTransactionCallback;
import org.wamblee.usermgt.GroupSet;
import org.wamblee.usermgt.InMemoryGroupSetTest;
import org.wamblee.usermgt.UsermgtHibernateMappingFiles;
diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
index 939b5153..1af6e774 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wamblee.cache.Cache;
import org.wamblee.general.BeanKernel;
-import org.wamblee.test.TestTransactionCallbackWithoutResult;
+import org.wamblee.test.spring.TestTransactionCallbackWithoutResult;
import org.wamblee.usermgt.UserAdministration;
import org.wamblee.usermgt.UserAdministrationImplTest;
import org.wamblee.usermgt.UsermgtHibernateMappingFiles;
diff --git a/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml b/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml
index a7abe50d..bed0d9ef 100644
--- a/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml
+++ b/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml
@@ -71,7 +71,7 @@
<bean id="usermanagement-lock" class="org.wamblee.concurrency.JvmLock"/>
- <bean id="usermanagement-lock-advice" class="org.wamblee.concurrency.LockAdvice">
+ <bean id="usermanagement-lock-advice" class="org.wamblee.concurrency.spring.LockAdvice">
<constructor-arg><ref bean="usermanagement-lock"/></constructor-arg>
</bean>
diff --git a/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
index 7ea41ba2..39280c60 100644
--- a/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
+++ b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
@@ -25,7 +25,8 @@ import javax.xml.transform.stream.StreamSource;
import junit.framework.TestCase;
-import org.springframework.core.io.ClassPathResource;
+
+import org.wamblee.io.ClassPathResource;
import org.wamblee.io.FileSystemUtils;
/**
diff --git a/support/general/src/main/java/org/wamblee/concurrency/LockAdvice.java b/support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java
similarity index 95%
rename from support/general/src/main/java/org/wamblee/concurrency/LockAdvice.java
rename to support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java
index 4838f7c4..61bd98ae 100644
--- a/support/general/src/main/java/org/wamblee/concurrency/LockAdvice.java
+++ b/support/spring/src/main/java/org/wamblee/concurrency/spring/LockAdvice.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.wamblee.concurrency;
+package org.wamblee.concurrency.spring;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
+import org.wamblee.concurrency.Lock;
/**
* Locking advice. This automatically synchronized an object using a given lock.
diff --git a/support/general/src/main/java/org/wamblee/general/SpringBeanFactory.java b/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
similarity index 95%
rename from support/general/src/main/java/org/wamblee/general/SpringBeanFactory.java
rename to support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
index a373eb5c..e01f0865 100644
--- a/support/general/src/main/java/org/wamblee/general/SpringBeanFactory.java
+++ b/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java
@@ -13,12 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wamblee.general;
+package org.wamblee.general.spring;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.access.BeanFactoryLocator;
import org.springframework.beans.factory.access.BeanFactoryReference;
import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
+import org.wamblee.general.BeanFactory;
+import org.wamblee.general.BeanFactoryException;
+import org.wamblee.general.BeanKernel;
/**
* Bean factory which uses Spring. This bean factory cannot be configured
diff --git a/support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java b/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java
similarity index 100%
rename from support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java
rename to support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java
diff --git a/support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java b/support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
similarity index 100%
rename from support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
rename to support/spring/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
diff --git a/support/general/src/main/java/org/wamblee/persistence/hibernate/package.html b/support/spring/src/main/java/org/wamblee/persistence/hibernate/package.html
similarity index 100%
rename from support/general/src/main/java/org/wamblee/persistence/hibernate/package.html
rename to support/spring/src/main/java/org/wamblee/persistence/hibernate/package.html
diff --git a/support/general/src/test/java/org/wamblee/concurrency/LockAdviceTest.java b/support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java
similarity index 92%
rename from support/general/src/test/java/org/wamblee/concurrency/LockAdviceTest.java
rename to support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java
index a29695ca..b56beacd 100644
--- a/support/general/src/test/java/org/wamblee/concurrency/LockAdviceTest.java
+++ b/support/spring/src/test/java/org/wamblee/concurrency/spring/LockAdviceTest.java
@@ -14,9 +14,12 @@
* limitations under the License.
*/
-package org.wamblee.concurrency;
+package org.wamblee.concurrency.spring;
import org.springframework.aop.framework.ProxyFactoryBean;
+import org.wamblee.concurrency.AbstractLockTestCase;
+import org.wamblee.concurrency.JvmLock;
+import org.wamblee.concurrency.spring.LockAdvice;
import org.wamblee.test.TimingUtils;
/**
diff --git a/support/general/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java b/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
similarity index 95%
rename from support/general/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java
rename to support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
index 5b577cc4..21bf1957 100644
--- a/support/general/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java
+++ b/support/spring/src/test/java/org/wamblee/general/spring/SpringBeanFactoryTest.java
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package org.wamblee.general;
+package org.wamblee.general.spring;
+
+import org.wamblee.general.BeanFactoryException;
import junit.framework.TestCase;
diff --git a/support/general/src/test/java/org/wamblee/general/TestBeanFactory.java b/support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java
similarity index 95%
rename from support/general/src/test/java/org/wamblee/general/TestBeanFactory.java
rename to support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java
index 0a7ba12e..e5e566ce 100644
--- a/support/general/src/test/java/org/wamblee/general/TestBeanFactory.java
+++ b/support/spring/src/test/java/org/wamblee/general/spring/TestBeanFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.wamblee.general;
+package org.wamblee.general.spring;
/**
* Test bean factory.
diff --git a/support/general/src/test/java/org/wamblee/test/HibernateExporter.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java
similarity index 97%
rename from support/general/src/test/java/org/wamblee/test/HibernateExporter.java
rename to support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java
index 2a35441a..aefe4185 100644
--- a/support/general/src/test/java/org/wamblee/test/HibernateExporter.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/HibernateExporter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.wamblee.test;
+package org.wamblee.test.spring;
import java.io.File;
import java.io.IOException;
diff --git a/support/general/src/test/java/org/wamblee/test/HibernateUpdater.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java
similarity index 97%
rename from support/general/src/test/java/org/wamblee/test/HibernateUpdater.java
rename to support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java
index 79fe857e..87219de0 100644
--- a/support/general/src/test/java/org/wamblee/test/HibernateUpdater.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUpdater.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.wamblee.test;
+package org.wamblee.test.spring;
import java.io.File;
import java.io.IOException;
diff --git a/support/general/src/test/java/org/wamblee/test/HibernateUtils.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java
similarity index 98%
rename from support/general/src/test/java/org/wamblee/test/HibernateUtils.java
rename to support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java
index 77409e38..74a7ef7e 100644
--- a/support/general/src/test/java/org/wamblee/test/HibernateUtils.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.wamblee.test;
+package org.wamblee.test.spring;
import java.io.File;
import java.io.FileFilter;
diff --git a/support/general/src/test/java/org/wamblee/test/SpringConfigFiles.java b/support/spring/src/test/java/org/wamblee/test/spring/SpringConfigFiles.java
similarity index 97%
rename from support/general/src/test/java/org/wamblee/test/SpringConfigFiles.java
rename to support/spring/src/test/java/org/wamblee/test/spring/SpringConfigFiles.java
index 0729b9cd..8a55ba78 100644
--- a/support/general/src/test/java/org/wamblee/test/SpringConfigFiles.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/SpringConfigFiles.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.wamblee.test;
+package org.wamblee.test.spring;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/support/general/src/test/java/org/wamblee/test/SpringTestCase.java b/support/spring/src/test/java/org/wamblee/test/spring/SpringTestCase.java
similarity index 99%
rename from support/general/src/test/java/org/wamblee/test/SpringTestCase.java
rename to support/spring/src/test/java/org/wamblee/test/spring/SpringTestCase.java
index 9e25caaf..6f18f3ab 100644
--- a/support/general/src/test/java/org/wamblee/test/SpringTestCase.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/SpringTestCase.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.wamblee.test;
+package org.wamblee.test.spring;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git a/support/general/src/test/java/org/wamblee/test/TestSpringBeanFactory.java b/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
similarity index 98%
rename from support/general/src/test/java/org/wamblee/test/TestSpringBeanFactory.java
rename to support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
index a35b505a..a7cc6fe6 100644
--- a/support/general/src/test/java/org/wamblee/test/TestSpringBeanFactory.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/TestSpringBeanFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wamblee.test;
+package org.wamblee.test.spring;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
diff --git a/support/general/src/test/java/org/wamblee/test/TestTransactionCallback.java b/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java
similarity index 94%
rename from support/general/src/test/java/org/wamblee/test/TestTransactionCallback.java
rename to support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java
index 7fc0bd73..4eec4cd3 100644
--- a/support/general/src/test/java/org/wamblee/test/TestTransactionCallback.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallback.java
@@ -1,4 +1,4 @@
-package org.wamblee.test;
+package org.wamblee.test.spring;
import java.util.Map;
diff --git a/support/general/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java b/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java
similarity index 91%
rename from support/general/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java
rename to support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java
index c534dafe..0205aac4 100644
--- a/support/general/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/TestTransactionCallbackWithoutResult.java
@@ -1,4 +1,4 @@
-package org.wamblee.test;
+package org.wamblee.test.spring;
/**
* Transaction callback for testing. The test will fail if any type of exception
--
2.31.1