(no commit message)

diff --git a/.classpath b/.classpath
index 709e35be5180abeba4e7f11e59cc383f466190bc..67ca54148e9656a9670e4090b4dcbc5ecccb3474 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry kind="src" path="support/general/src/main/java"/>
+       <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"/>

diff --git a/crawler/basic/pom.xml b/crawler/basic/pom.xml
index efeb63a5572653ebee9d81a0fc9a0d98dcd0830a..5fc6299c3ba51f069a30ee91c8ec80dd7c5ff38c 100644 (file)
--- a/crawler/basic/pom.xml
+++ b/crawler/basic/pom.xml
@@ -17,7 +17,8 @@
   <dependencies>
     <dependency>
         <groupId>org.wamblee</groupId>
-        <artifactId>wamblee-support</artifactId>
+        <artifactId>wamblee-support-general</artifactId>
+        <version>0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/gps/pom.xml b/gps/pom.xml
index 18732e432a4941985be03dfbd43f8fd0555f6fb7..5fc635bc347ebe614368a38200c42adb7ffc7562 100644 (file)
--- a/gps/pom.xml
+++ b/gps/pom.xml
@@ -17,7 +17,8 @@
   <dependencies>
     <dependency>
         <groupId>org.wamblee</groupId>
-        <artifactId>wamblee-support</artifactId>
+        <artifactId>wamblee-support-general</artifactId>
+        <version>0.2-SNAPSHOT</version>
     </dependency>  
        <dependency>
       <groupId>jfree</groupId>

diff --git a/mythtv/monitor/pom.xml b/mythtv/monitor/pom.xml
index 8dffe8a15eee84516436e421861a288397f21923..7a159715c8f8b4172d155eca81057b2e5cb75616 100644 (file)
--- a/mythtv/monitor/pom.xml
+++ b/mythtv/monitor/pom.xml
@@ -18,7 +18,8 @@
   <dependencies>
     <dependency>
         <groupId>org.wamblee</groupId>
-        <artifactId>wamblee-support</artifactId>
+        <artifactId>wamblee-support-general</artifactId>
+        <version>0.2-SNAPSHOT</version>
     </dependency>
        <dependency>
          <groupId>javax.servlet</groupId>

diff --git a/security/pom.xml b/security/pom.xml
index 9d6264bf9c661fe02285b2fc15ffbb4f0f4eeebf..3715b2f62fe8b89a9797ff97af2f5eb3ebf06bf7 100644 (file)
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -18,12 +18,14 @@
     
     <dependency>
       <groupId>org.wamblee</groupId>
-      <artifactId>wamblee-support</artifactId>
+      <artifactId>wamblee-support-general</artifactId>
+      <version>0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.wamblee</groupId>
-      <artifactId>wamblee-support</artifactId>
+      <artifactId>wamblee-support-general</artifactId>
       <type>test-jar</type>
+      <version>0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.wamblee</groupId>

diff --git a/socketproxy/pom.xml b/socketproxy/pom.xml
index c8b534f0504be4b722f11c861da0737032d934ec..aa172f7b7fe76e855fdf67feb841abf441256acf 100644 (file)
--- a/socketproxy/pom.xml
+++ b/socketproxy/pom.xml
@@ -18,7 +18,8 @@
   <dependencies>
     <dependency>
       <groupId>org.wamblee</groupId>
-      <artifactId>wamblee-support</artifactId>
+      <artifactId>wamblee-support-general</artifactId>
+      <version>0.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/support/src/main/java/org/wamblee/cache/Cache.java b/support/general/src/main/java/org/wamblee/cache/Cache.java
similarity index 100%
rename from support/src/main/java/org/wamblee/cache/Cache.java
rename to support/general/src/main/java/org/wamblee/cache/Cache.java

diff --git a/support/src/main/java/org/wamblee/cache/CachedObject.java b/support/general/src/main/java/org/wamblee/cache/CachedObject.java
similarity index 100%
rename from support/src/main/java/org/wamblee/cache/CachedObject.java
rename to support/general/src/main/java/org/wamblee/cache/CachedObject.java

diff --git a/support/src/main/java/org/wamblee/cache/EhCache.java b/support/general/src/main/java/org/wamblee/cache/EhCache.java
similarity index 100%
rename from support/src/main/java/org/wamblee/cache/EhCache.java
rename to support/general/src/main/java/org/wamblee/cache/EhCache.java

diff --git a/support/src/main/java/org/wamblee/cache/ForeverCache.java b/support/general/src/main/java/org/wamblee/cache/ForeverCache.java
similarity index 100%
rename from support/src/main/java/org/wamblee/cache/ForeverCache.java
rename to support/general/src/main/java/org/wamblee/cache/ForeverCache.java

diff --git a/support/src/main/java/org/wamblee/cache/ZeroCache.java b/support/general/src/main/java/org/wamblee/cache/ZeroCache.java
similarity index 100%
rename from support/src/main/java/org/wamblee/cache/ZeroCache.java
rename to support/general/src/main/java/org/wamblee/cache/ZeroCache.java

diff --git a/support/src/main/java/org/wamblee/cache/package.html b/support/general/src/main/java/org/wamblee/cache/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/cache/package.html
rename to support/general/src/main/java/org/wamblee/cache/package.html

diff --git a/support/src/main/java/org/wamblee/concurrency/JvmLock.java b/support/general/src/main/java/org/wamblee/concurrency/JvmLock.java
similarity index 100%
rename from support/src/main/java/org/wamblee/concurrency/JvmLock.java
rename to support/general/src/main/java/org/wamblee/concurrency/JvmLock.java

diff --git a/support/src/main/java/org/wamblee/concurrency/Lock.java b/support/general/src/main/java/org/wamblee/concurrency/Lock.java
similarity index 100%
rename from support/src/main/java/org/wamblee/concurrency/Lock.java
rename to support/general/src/main/java/org/wamblee/concurrency/Lock.java

diff --git a/support/src/main/java/org/wamblee/concurrency/LockAdvice.java b/support/general/src/main/java/org/wamblee/concurrency/LockAdvice.java
similarity index 100%
rename from support/src/main/java/org/wamblee/concurrency/LockAdvice.java
rename to support/general/src/main/java/org/wamblee/concurrency/LockAdvice.java

diff --git a/support/src/main/java/org/wamblee/concurrency/ReadWriteLock.java b/support/general/src/main/java/org/wamblee/concurrency/ReadWriteLock.java
similarity index 100%
rename from support/src/main/java/org/wamblee/concurrency/ReadWriteLock.java
rename to support/general/src/main/java/org/wamblee/concurrency/ReadWriteLock.java

diff --git a/support/src/main/java/org/wamblee/concurrency/package.html b/support/general/src/main/java/org/wamblee/concurrency/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/concurrency/package.html
rename to support/general/src/main/java/org/wamblee/concurrency/package.html

diff --git a/support/src/main/java/org/wamblee/conditions/AndCondition.java b/support/general/src/main/java/org/wamblee/conditions/AndCondition.java
similarity index 100%
rename from support/src/main/java/org/wamblee/conditions/AndCondition.java
rename to support/general/src/main/java/org/wamblee/conditions/AndCondition.java

diff --git a/support/src/main/java/org/wamblee/conditions/Condition.java b/support/general/src/main/java/org/wamblee/conditions/Condition.java
similarity index 100%
rename from support/src/main/java/org/wamblee/conditions/Condition.java
rename to support/general/src/main/java/org/wamblee/conditions/Condition.java

diff --git a/support/src/main/java/org/wamblee/conditions/FixedCondition.java b/support/general/src/main/java/org/wamblee/conditions/FixedCondition.java
similarity index 100%
rename from support/src/main/java/org/wamblee/conditions/FixedCondition.java
rename to support/general/src/main/java/org/wamblee/conditions/FixedCondition.java

diff --git a/support/src/main/java/org/wamblee/conditions/OrCondition.java b/support/general/src/main/java/org/wamblee/conditions/OrCondition.java
similarity index 100%
rename from support/src/main/java/org/wamblee/conditions/OrCondition.java
rename to support/general/src/main/java/org/wamblee/conditions/OrCondition.java

diff --git a/support/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java b/support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java
similarity index 100%
rename from support/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java
rename to support/general/src/main/java/org/wamblee/conditions/PropertyRegexCondition.java

diff --git a/support/src/main/java/org/wamblee/conditions/package.html b/support/general/src/main/java/org/wamblee/conditions/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/conditions/package.html
rename to support/general/src/main/java/org/wamblee/conditions/package.html

diff --git a/support/src/main/java/org/wamblee/general/BeanFactory.java b/support/general/src/main/java/org/wamblee/general/BeanFactory.java
similarity index 100%
rename from support/src/main/java/org/wamblee/general/BeanFactory.java
rename to support/general/src/main/java/org/wamblee/general/BeanFactory.java

diff --git a/support/src/main/java/org/wamblee/general/BeanFactoryException.java b/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java
similarity index 100%
rename from support/src/main/java/org/wamblee/general/BeanFactoryException.java
rename to support/general/src/main/java/org/wamblee/general/BeanFactoryException.java

diff --git a/support/src/main/java/org/wamblee/general/BeanKernel.java b/support/general/src/main/java/org/wamblee/general/BeanKernel.java
similarity index 100%
rename from support/src/main/java/org/wamblee/general/BeanKernel.java
rename to support/general/src/main/java/org/wamblee/general/BeanKernel.java

diff --git a/support/src/main/java/org/wamblee/general/ClassLoaderUtils.java b/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java
similarity index 100%
rename from support/src/main/java/org/wamblee/general/ClassLoaderUtils.java
rename to support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java

diff --git a/support/src/main/java/org/wamblee/general/Pair.java b/support/general/src/main/java/org/wamblee/general/Pair.java
similarity index 100%
rename from support/src/main/java/org/wamblee/general/Pair.java
rename to support/general/src/main/java/org/wamblee/general/Pair.java

diff --git a/support/src/main/java/org/wamblee/general/SpringBeanFactory.java b/support/general/src/main/java/org/wamblee/general/SpringBeanFactory.java
similarity index 100%
rename from support/src/main/java/org/wamblee/general/SpringBeanFactory.java
rename to support/general/src/main/java/org/wamblee/general/SpringBeanFactory.java

diff --git a/support/src/main/java/org/wamblee/general/package.html b/support/general/src/main/java/org/wamblee/general/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/general/package.html
rename to support/general/src/main/java/org/wamblee/general/package.html

diff --git a/support/src/main/java/org/wamblee/io/ClassPathResource.java b/support/general/src/main/java/org/wamblee/io/ClassPathResource.java
similarity index 100%
rename from support/src/main/java/org/wamblee/io/ClassPathResource.java
rename to support/general/src/main/java/org/wamblee/io/ClassPathResource.java

diff --git a/support/src/main/java/org/wamblee/io/DirectoryMonitor.java b/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java
similarity index 100%
rename from support/src/main/java/org/wamblee/io/DirectoryMonitor.java
rename to support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java

diff --git a/support/src/main/java/org/wamblee/io/FileResource.java b/support/general/src/main/java/org/wamblee/io/FileResource.java
similarity index 100%
rename from support/src/main/java/org/wamblee/io/FileResource.java
rename to support/general/src/main/java/org/wamblee/io/FileResource.java

diff --git a/support/src/main/java/org/wamblee/io/InputResource.java b/support/general/src/main/java/org/wamblee/io/InputResource.java
similarity index 100%
rename from support/src/main/java/org/wamblee/io/InputResource.java
rename to support/general/src/main/java/org/wamblee/io/InputResource.java

diff --git a/support/src/main/java/org/wamblee/io/SimpleProcess.java b/support/general/src/main/java/org/wamblee/io/SimpleProcess.java
similarity index 100%
rename from support/src/main/java/org/wamblee/io/SimpleProcess.java
rename to support/general/src/main/java/org/wamblee/io/SimpleProcess.java

diff --git a/support/src/main/java/org/wamblee/io/StreamResource.java b/support/general/src/main/java/org/wamblee/io/StreamResource.java
similarity index 100%
rename from support/src/main/java/org/wamblee/io/StreamResource.java
rename to support/general/src/main/java/org/wamblee/io/StreamResource.java

diff --git a/support/src/main/java/org/wamblee/io/package.html b/support/general/src/main/java/org/wamblee/io/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/io/package.html
rename to support/general/src/main/java/org/wamblee/io/package.html

diff --git a/support/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java b/support/general/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java
similarity index 100%
rename from support/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java
rename to support/general/src/main/java/org/wamblee/observer/DefaultObserverNotifier.java

diff --git a/support/src/main/java/org/wamblee/observer/Observable.java b/support/general/src/main/java/org/wamblee/observer/Observable.java
similarity index 100%
rename from support/src/main/java/org/wamblee/observer/Observable.java
rename to support/general/src/main/java/org/wamblee/observer/Observable.java

diff --git a/support/src/main/java/org/wamblee/observer/Observer.java b/support/general/src/main/java/org/wamblee/observer/Observer.java
similarity index 100%
rename from support/src/main/java/org/wamblee/observer/Observer.java
rename to support/general/src/main/java/org/wamblee/observer/Observer.java

diff --git a/support/src/main/java/org/wamblee/observer/ObserverNotifier.java b/support/general/src/main/java/org/wamblee/observer/ObserverNotifier.java
similarity index 100%
rename from support/src/main/java/org/wamblee/observer/ObserverNotifier.java
rename to support/general/src/main/java/org/wamblee/observer/ObserverNotifier.java

diff --git a/support/src/main/java/org/wamblee/observer/package.html b/support/general/src/main/java/org/wamblee/observer/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/observer/package.html
rename to support/general/src/main/java/org/wamblee/observer/package.html

diff --git a/support/src/main/java/org/wamblee/persistence/AbstractPersistent.java b/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java
similarity index 100%
rename from support/src/main/java/org/wamblee/persistence/AbstractPersistent.java
rename to support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java

diff --git a/support/src/main/java/org/wamblee/persistence/Persistent.java b/support/general/src/main/java/org/wamblee/persistence/Persistent.java
similarity index 100%
rename from support/src/main/java/org/wamblee/persistence/Persistent.java
rename to support/general/src/main/java/org/wamblee/persistence/Persistent.java

diff --git a/support/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java b/support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java
similarity index 100%
rename from support/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java
rename to support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateMappingFiles.java

diff --git a/support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java b/support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
similarity index 100%
rename from support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
rename to support/general/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java

diff --git a/support/src/main/java/org/wamblee/persistence/hibernate/package.html b/support/general/src/main/java/org/wamblee/persistence/hibernate/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/persistence/hibernate/package.html
rename to support/general/src/main/java/org/wamblee/persistence/hibernate/package.html

diff --git a/support/src/main/java/org/wamblee/persistence/package.html b/support/general/src/main/java/org/wamblee/persistence/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/persistence/package.html
rename to support/general/src/main/java/org/wamblee/persistence/package.html

diff --git a/support/src/main/java/org/wamblee/xml/ClasspathUriResolver.java b/support/general/src/main/java/org/wamblee/xml/ClasspathUriResolver.java
similarity index 100%
rename from support/src/main/java/org/wamblee/xml/ClasspathUriResolver.java
rename to support/general/src/main/java/org/wamblee/xml/ClasspathUriResolver.java

diff --git a/support/src/main/java/org/wamblee/xml/DomUtils.java b/support/general/src/main/java/org/wamblee/xml/DomUtils.java
similarity index 100%
rename from support/src/main/java/org/wamblee/xml/DomUtils.java
rename to support/general/src/main/java/org/wamblee/xml/DomUtils.java

diff --git a/support/src/main/java/org/wamblee/xml/XMLException.java b/support/general/src/main/java/org/wamblee/xml/XMLException.java
similarity index 100%
rename from support/src/main/java/org/wamblee/xml/XMLException.java
rename to support/general/src/main/java/org/wamblee/xml/XMLException.java

diff --git a/support/src/main/java/org/wamblee/xml/XslTransformer.java b/support/general/src/main/java/org/wamblee/xml/XslTransformer.java
similarity index 100%
rename from support/src/main/java/org/wamblee/xml/XslTransformer.java
rename to support/general/src/main/java/org/wamblee/xml/XslTransformer.java

diff --git a/support/src/main/java/org/wamblee/xml/package.html b/support/general/src/main/java/org/wamblee/xml/package.html
similarity index 100%
rename from support/src/main/java/org/wamblee/xml/package.html
rename to support/general/src/main/java/org/wamblee/xml/package.html

diff --git a/support/src/main/resources/log4j.properties b/support/general/src/main/resources/log4j.properties
similarity index 100%
rename from support/src/main/resources/log4j.properties
rename to support/general/src/main/resources/log4j.properties

diff --git a/support/src/test/java/org/wamblee/cache/CachedObjectTest.java b/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/cache/CachedObjectTest.java
rename to support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java

diff --git a/support/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java b/support/general/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java
similarity index 100%
rename from support/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java
rename to support/general/src/test/java/org/wamblee/concurrency/AbstractLockTestCase.java

diff --git a/support/src/test/java/org/wamblee/concurrency/JvmLockTest.java b/support/general/src/test/java/org/wamblee/concurrency/JvmLockTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/concurrency/JvmLockTest.java
rename to support/general/src/test/java/org/wamblee/concurrency/JvmLockTest.java

diff --git a/support/src/test/java/org/wamblee/concurrency/LockAdviceTest.java b/support/general/src/test/java/org/wamblee/concurrency/LockAdviceTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/concurrency/LockAdviceTest.java
rename to support/general/src/test/java/org/wamblee/concurrency/LockAdviceTest.java

diff --git a/support/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java b/support/general/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java
rename to support/general/src/test/java/org/wamblee/concurrency/ReadWriteLockTest.java

diff --git a/support/src/test/java/org/wamblee/conditions/AndConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/conditions/AndConditionTest.java
rename to support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java

diff --git a/support/src/test/java/org/wamblee/conditions/GreaterThanCondition.java b/support/general/src/test/java/org/wamblee/conditions/GreaterThanCondition.java
similarity index 100%
rename from support/src/test/java/org/wamblee/conditions/GreaterThanCondition.java
rename to support/general/src/test/java/org/wamblee/conditions/GreaterThanCondition.java

diff --git a/support/src/test/java/org/wamblee/conditions/LessThanCondition.java b/support/general/src/test/java/org/wamblee/conditions/LessThanCondition.java
similarity index 100%
rename from support/src/test/java/org/wamblee/conditions/LessThanCondition.java
rename to support/general/src/test/java/org/wamblee/conditions/LessThanCondition.java

diff --git a/support/src/test/java/org/wamblee/conditions/OrConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/OrConditionTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/conditions/OrConditionTest.java
rename to support/general/src/test/java/org/wamblee/conditions/OrConditionTest.java

diff --git a/support/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java
rename to support/general/src/test/java/org/wamblee/conditions/PropertyRegexConditionTest.java

diff --git a/support/src/test/java/org/wamblee/conditions/TestBean.java b/support/general/src/test/java/org/wamblee/conditions/TestBean.java
similarity index 100%
rename from support/src/test/java/org/wamblee/conditions/TestBean.java
rename to support/general/src/test/java/org/wamblee/conditions/TestBean.java

diff --git a/support/src/test/java/org/wamblee/general/BeanKernelTest.java b/support/general/src/test/java/org/wamblee/general/BeanKernelTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/general/BeanKernelTest.java
rename to support/general/src/test/java/org/wamblee/general/BeanKernelTest.java

diff --git a/support/src/test/java/org/wamblee/general/PairTest.java b/support/general/src/test/java/org/wamblee/general/PairTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/general/PairTest.java
rename to support/general/src/test/java/org/wamblee/general/PairTest.java

diff --git a/support/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java b/support/general/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java
rename to support/general/src/test/java/org/wamblee/general/SpringBeanFactoryTest.java

diff --git a/support/src/test/java/org/wamblee/general/TestBeanFactory.java b/support/general/src/test/java/org/wamblee/general/TestBeanFactory.java
similarity index 100%
rename from support/src/test/java/org/wamblee/general/TestBeanFactory.java
rename to support/general/src/test/java/org/wamblee/general/TestBeanFactory.java

diff --git a/support/src/test/java/org/wamblee/io/ClassPathResourceTest.java b/support/general/src/test/java/org/wamblee/io/ClassPathResourceTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/ClassPathResourceTest.java
rename to support/general/src/test/java/org/wamblee/io/ClassPathResourceTest.java

diff --git a/support/src/test/java/org/wamblee/io/DirectoryMonitorTest.java b/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/DirectoryMonitorTest.java
rename to support/general/src/test/java/org/wamblee/io/DirectoryMonitorTest.java

diff --git a/support/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java b/support/general/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java
rename to support/general/src/test/java/org/wamblee/io/DirectoryMonitorTestProgram.java

diff --git a/support/src/test/java/org/wamblee/io/FileResourceTest.java b/support/general/src/test/java/org/wamblee/io/FileResourceTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/FileResourceTest.java
rename to support/general/src/test/java/org/wamblee/io/FileResourceTest.java

diff --git a/support/src/test/java/org/wamblee/io/FileSystemUtils.java b/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/FileSystemUtils.java
rename to support/general/src/test/java/org/wamblee/io/FileSystemUtils.java

diff --git a/support/src/test/java/org/wamblee/io/StreamResourceTest.java b/support/general/src/test/java/org/wamblee/io/StreamResourceTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/StreamResourceTest.java
rename to support/general/src/test/java/org/wamblee/io/StreamResourceTest.java

diff --git a/support/src/test/java/org/wamblee/io/TestData.java b/support/general/src/test/java/org/wamblee/io/TestData.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/TestData.java
rename to support/general/src/test/java/org/wamblee/io/TestData.java

diff --git a/support/src/test/java/org/wamblee/io/TestResource.java b/support/general/src/test/java/org/wamblee/io/TestResource.java
similarity index 100%
rename from support/src/test/java/org/wamblee/io/TestResource.java
rename to support/general/src/test/java/org/wamblee/io/TestResource.java

diff --git a/support/src/test/java/org/wamblee/observer/ObservableTest.java b/support/general/src/test/java/org/wamblee/observer/ObservableTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/observer/ObservableTest.java
rename to support/general/src/test/java/org/wamblee/observer/ObservableTest.java

diff --git a/support/src/test/java/org/wamblee/persistence/Database.java b/support/general/src/test/java/org/wamblee/persistence/Database.java
similarity index 100%
rename from support/src/test/java/org/wamblee/persistence/Database.java
rename to support/general/src/test/java/org/wamblee/persistence/Database.java

diff --git a/support/src/test/java/org/wamblee/persistence/DatabaseStarter.java b/support/general/src/test/java/org/wamblee/persistence/DatabaseStarter.java
similarity index 100%
rename from support/src/test/java/org/wamblee/persistence/DatabaseStarter.java
rename to support/general/src/test/java/org/wamblee/persistence/DatabaseStarter.java

diff --git a/support/src/test/java/org/wamblee/persistence/DerbyDatabase.java b/support/general/src/test/java/org/wamblee/persistence/DerbyDatabase.java
similarity index 100%
rename from support/src/test/java/org/wamblee/persistence/DerbyDatabase.java
rename to support/general/src/test/java/org/wamblee/persistence/DerbyDatabase.java

diff --git a/support/src/test/java/org/wamblee/persistence/OracleDatabase.java b/support/general/src/test/java/org/wamblee/persistence/OracleDatabase.java
similarity index 100%
rename from support/src/test/java/org/wamblee/persistence/OracleDatabase.java
rename to support/general/src/test/java/org/wamblee/persistence/OracleDatabase.java

diff --git a/support/src/test/java/org/wamblee/test/AssertionUtils.java b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/AssertionUtils.java
rename to support/general/src/test/java/org/wamblee/test/AssertionUtils.java

diff --git a/support/src/test/java/org/wamblee/test/EventTracker.java b/support/general/src/test/java/org/wamblee/test/EventTracker.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/EventTracker.java
rename to support/general/src/test/java/org/wamblee/test/EventTracker.java

diff --git a/support/src/test/java/org/wamblee/test/HibernateExporter.java b/support/general/src/test/java/org/wamblee/test/HibernateExporter.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/HibernateExporter.java
rename to support/general/src/test/java/org/wamblee/test/HibernateExporter.java

diff --git a/support/src/test/java/org/wamblee/test/HibernateUpdater.java b/support/general/src/test/java/org/wamblee/test/HibernateUpdater.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/HibernateUpdater.java
rename to support/general/src/test/java/org/wamblee/test/HibernateUpdater.java

diff --git a/support/src/test/java/org/wamblee/test/HibernateUtils.java b/support/general/src/test/java/org/wamblee/test/HibernateUtils.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/HibernateUtils.java
rename to support/general/src/test/java/org/wamblee/test/HibernateUtils.java

diff --git a/support/src/test/java/org/wamblee/test/SpringConfigFiles.java b/support/general/src/test/java/org/wamblee/test/SpringConfigFiles.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/SpringConfigFiles.java
rename to support/general/src/test/java/org/wamblee/test/SpringConfigFiles.java

diff --git a/support/src/test/java/org/wamblee/test/SpringTestCase.java b/support/general/src/test/java/org/wamblee/test/SpringTestCase.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/SpringTestCase.java
rename to support/general/src/test/java/org/wamblee/test/SpringTestCase.java

diff --git a/support/src/test/java/org/wamblee/test/TestSpringBeanFactory.java b/support/general/src/test/java/org/wamblee/test/TestSpringBeanFactory.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/TestSpringBeanFactory.java
rename to support/general/src/test/java/org/wamblee/test/TestSpringBeanFactory.java

diff --git a/support/src/test/java/org/wamblee/test/TestTransactionCallback.java b/support/general/src/test/java/org/wamblee/test/TestTransactionCallback.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/TestTransactionCallback.java
rename to support/general/src/test/java/org/wamblee/test/TestTransactionCallback.java

diff --git a/support/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java b/support/general/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java
rename to support/general/src/test/java/org/wamblee/test/TestTransactionCallbackWithoutResult.java

diff --git a/support/src/test/java/org/wamblee/test/TimingUtils.java b/support/general/src/test/java/org/wamblee/test/TimingUtils.java
similarity index 100%
rename from support/src/test/java/org/wamblee/test/TimingUtils.java
rename to support/general/src/test/java/org/wamblee/test/TimingUtils.java

diff --git a/support/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java b/support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java
rename to support/general/src/test/java/org/wamblee/xml/ClasspathUriResolverTest.java

diff --git a/support/src/test/java/org/wamblee/xml/XmlUtils.java b/support/general/src/test/java/org/wamblee/xml/XmlUtils.java
similarity index 100%
rename from support/src/test/java/org/wamblee/xml/XmlUtils.java
rename to support/general/src/test/java/org/wamblee/xml/XmlUtils.java

diff --git a/support/src/test/java/org/wamblee/xml/XslTransformerTest.java b/support/general/src/test/java/org/wamblee/xml/XslTransformerTest.java
similarity index 100%
rename from support/src/test/java/org/wamblee/xml/XslTransformerTest.java
rename to support/general/src/test/java/org/wamblee/xml/XslTransformerTest.java

diff --git a/support/src/test/resources/org/wamblee/cache/ehcache.xml b/support/general/src/test/resources/org/wamblee/cache/ehcache.xml
similarity index 100%
rename from support/src/test/resources/org/wamblee/cache/ehcache.xml
rename to support/general/src/test/resources/org/wamblee/cache/ehcache.xml

diff --git a/support/src/test/resources/org/wamblee/general/beanRefContext.xml b/support/general/src/test/resources/org/wamblee/general/beanRefContext.xml
similarity index 100%
rename from support/src/test/resources/org/wamblee/general/beanRefContext.xml
rename to support/general/src/test/resources/org/wamblee/general/beanRefContext.xml

diff --git a/support/src/test/resources/org/wamblee/general/beankernel-wrong.properties b/support/general/src/test/resources/org/wamblee/general/beankernel-wrong.properties
similarity index 100%
rename from support/src/test/resources/org/wamblee/general/beankernel-wrong.properties
rename to support/general/src/test/resources/org/wamblee/general/beankernel-wrong.properties

diff --git a/support/src/test/resources/org/wamblee/general/beankernel.properties b/support/general/src/test/resources/org/wamblee/general/beankernel.properties
similarity index 100%
rename from support/src/test/resources/org/wamblee/general/beankernel.properties
rename to support/general/src/test/resources/org/wamblee/general/beankernel.properties

diff --git a/support/src/test/resources/org/wamblee/general/spring1.xml b/support/general/src/test/resources/org/wamblee/general/spring1.xml
similarity index 100%
rename from support/src/test/resources/org/wamblee/general/spring1.xml
rename to support/general/src/test/resources/org/wamblee/general/spring1.xml

diff --git a/support/src/test/resources/org/wamblee/io/myresource.txt b/support/general/src/test/resources/org/wamblee/io/myresource.txt
similarity index 100%
rename from support/src/test/resources/org/wamblee/io/myresource.txt
rename to support/general/src/test/resources/org/wamblee/io/myresource.txt

diff --git a/support/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml b/support/general/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml
rename to support/general/src/test/resources/org/wamblee/xml/output-reportToHtml-report.xml

diff --git a/support/src/test/resources/org/wamblee/xml/report.xml b/support/general/src/test/resources/org/wamblee/xml/report.xml
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/report.xml
rename to support/general/src/test/resources/org/wamblee/xml/report.xml

diff --git a/support/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl
rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml-invalid.xsl

diff --git a/support/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl
rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml-nonwellformed.xsl

diff --git a/support/src/test/resources/org/wamblee/xml/reportToHtml.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml.xsl
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/reportToHtml.xsl
rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml.xsl

diff --git a/support/src/test/resources/org/wamblee/xml/reportToHtml2.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToHtml2.xsl
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/reportToHtml2.xsl
rename to support/general/src/test/resources/org/wamblee/xml/reportToHtml2.xsl

diff --git a/support/src/test/resources/org/wamblee/xml/reportToText.xsl b/support/general/src/test/resources/org/wamblee/xml/reportToText.xsl
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/reportToText.xsl
rename to support/general/src/test/resources/org/wamblee/xml/reportToText.xsl

diff --git a/support/src/test/resources/org/wamblee/xml/utilities.xsl b/support/general/src/test/resources/org/wamblee/xml/utilities.xsl
similarity index 100%
rename from support/src/test/resources/org/wamblee/xml/utilities.xsl
rename to support/general/src/test/resources/org/wamblee/xml/utilities.xsl

diff --git a/support/pom.xml b/support/pom.xml
index 952d7a4c1bd5091b4cd4bb541265378266a78655..4238bc3d9d36dde343be26411c71c85a6f90d546 100644 (file)
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -11,81 +11,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.wamblee</groupId>
   <artifactId>wamblee-support</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>wamblee.org support library</name>
   <url>http://wamblee.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbyclient</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbynet</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-hibernate3</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.wamblee</groupId>
-      <artifactId>wamblee-hibernate-jpa</artifactId>
-    </dependency>
-       <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-    </dependency>
-    <!-- should be possible to remove the dependence on log4j -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.wamblee</groupId>
-      <artifactId>wamblee-hibernate-jpa</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-    </dependency>
-
-  </dependencies>
 
+  <modules>
+    <module>general</module>
+    <module>spring</module>
+  </modules>
 </project>

diff --git a/system/general/pom.xml b/system/general/pom.xml
index 190d45ca7d4e345a3e3a4bc8c9340fdfb660c647..4f770c4331b9648fbdc12b745eb02f2758b30784 100644 (file)
--- a/system/general/pom.xml
+++ b/system/general/pom.xml
@@ -21,8 +21,9 @@
     </dependency>
     <dependency>
       <groupId>org.wamblee</groupId>
-      <artifactId>wamblee-support</artifactId>
+      <artifactId>wamblee-support-general</artifactId>
       <type>test-jar</type>
+      <version>0.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/system/spring/pom.xml b/system/spring/pom.xml
index 5119243e1e8d60cb68cebcedbc35df0cb21dec2f..29f796f5aba05e4c7e368eb38935331e8f1e37f7 100644 (file)
--- a/system/spring/pom.xml
+++ b/system/spring/pom.xml
@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>org.wamblee</groupId>
-            <artifactId>wamblee-support</artifactId>
+            <artifactId>wamblee-support-general</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>