(no commit message)

diff --git a/.classpath b/.classpath
index 67ca54148e9656a9670e4090b4dcbc5ecccb3474..10e62e07ec80039cf0b11476146871358f7499e0 100644 (file)
--- 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 3c7eb5c44eae7753984e7f2cd303cfccd2857edd..8d82bd26271f375f33b1901bad3ff27a40b444e7 100644 (file)
--- 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 fcd819f0573ce770d4e27544c04b4b2c0d99542e..cb0e848177798ab74dcb9278133864721be34a6a 100644 (file)
--- 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 0d34aa1c5fa0c92235afae620d748809821dd9e3..d4e2379c4fcaa1afe91937c2b72d197807937b08 100644 (file)
--- 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 a1879788b357bde847a53fd961e73272313a0b54..669baa527c36eedf81394dd87b7678c5ce9ce552 100644 (file)
--- 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 f7564424b9c364192035e1feb087e375e893b87b..0334ad7721735d8bde0e4c6c2e638909b0306d16 100644 (file)
--- 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 6a687f67bf97a533af3155c6e40ebd926cfe9229..140a904bcb6626cc7eaa0cefe36c54b4ed5f7bc9 100644 (file)
--- 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 1e4d9c9ad04c28c6c12158e359e8d2b9eecdb0f0..fd042bcab274136050b9f40653d5ff0e2dc7d109 100644 (file)
--- 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 a751a103c1335dd7b7eb7d62a489019a833c3889..100fad370439897447bb84c73755d60b9f05ee03 100644 (file)
--- 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 0e3c7592136334e553110d6317cd000cd7b83c0b..4154d6e467578f26b908e689e79d868466a29620 100644 (file)
--- 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 3bf919231020cde770b70e2467c2ee0297ef994f..c64f5718d132faaef8e872e5ca188ba47294145e 100644 (file)
--- 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 7baf09dbd783ff5de6d15f2a32ea53b0a3f64009..e9c97d3fcfc3b4a1ee16542247937af62832399f 100644 (file)
--- 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 0723b84133833ef261491e8a4df57076e8814f83..5e5871e4687bbc2d5446533c23f56b3ab39f11a1 100644 (file)
--- 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 939b5153d6a4df38334e642a34abfb9ee1bfb8e1..1af6e774849304270f707b028a148f27e12226f4 100644 (file)
--- 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 a7abe50d76a75dc6bbb8d61bd5ad0904373a17c5..bed0d9ef8d4b597c515dd8e8003cccdf5a1fa4b2 100644 (file)
--- 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 7ea41ba2ab8322213200747bc409bce20f613426..39280c60867b1e6d872c3a19002d1c8654c96d7f 100644 (file)
--- 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 4838f7c459919cb9d0a82d55eb9c615d9f6157e1..61bd98aee9ed934c418158fd62f2c776bc72fb9a 100644 (file)
--- 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 a373eb5c2fbe25dd765bef713a119431ad02ba12..e01f0865b722747b195f0f193f3ac8be44428c5d 100644 (file)
--- 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 a29695caae7e6fec71707d08be54076d7b231572..b56beacd9c9e7f1c4872a7957566758700d26fad 100644 (file)
--- 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 5b577cc418b9c3d96ee63795913d62703bea16bb..21bf1957d837fc569a009b97679207cbaf8f1935 100644 (file)
--- 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 0a7ba12ed45e1870be27893d99093829ad7409ca..e5e566ce311bffa32ca0ef7200189f54d1585865 100644 (file)
--- 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 2a35441a13c3dbf96cd67545a0385cba815ea21d..aefe418534eae33e3960be207738c37383e2e7fb 100644 (file)
--- 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 79fe857e78c55e5be22c658a41d1ac96f33eb21c..87219de06910bcf95eaeee380097efb39bb6d291 100644 (file)
--- 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 77409e38192c2688e21afeb029d4445a83bf6537..74a7ef7e44659b4f5dead4ea7e8203fd0325b106 100644 (file)
--- 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 0729b9cdb87ecc2e3d602baaab22b95d645700b1..8a55ba78d34eb053d959c9dd686ce247fc09a5c4 100644 (file)
--- 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 9e25caaf8785291a3cbecf2a1872e659cbd18258..6f18f3ab293e04b83a717ce1a8217fb0b9297d49 100644 (file)
--- 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 a35b505a24bbee3338672ffa2d0d3b4e81e102ee..a7cc6fe6b63dcf7f1e3cf14f8e08197091b01057 100644 (file)
--- 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 7fc0bd73e132eabf3e804de3b19cbd2c6b912479..4eec4cd3573445bfe59921978441e4485e4c1492 100644 (file)
--- 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 c534dafe8238c3aa94118532f14157d0b838fd04..0205aac4e49ecea39e51743f6bbf0fb253880433 100644 (file)
--- 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