(no commit message)

diff --git a/build/delegator.xml b/build/delegator.xml
index b14dc90652c8efed707248ee0c7e6c0ad59cdbbe..ec28ca2fb295c69370cb29d994ec6906d1b44828 100644 (file)
--- a/build/delegator.xml
+++ b/build/delegator.xml
@@ -45,6 +45,19 @@ Executing target '@{target}' for @{proj}
        <target name="init_delegator" depends="init_directory_properties,import_header">
        </target>
        
+       
+       <target name="deps" depends="init_delegator" description="download dependencies">
+               <antcall target="delegator">
+                       <param name="targets" value="deps"/>
+               </antcall>
+       </target>
+       
+       <target name="clean-deps" depends="init_delegator" description="download dependencies">
+               <antcall target="delegator">
+                       <param name="targets" value="clean-deps"/>
+               </antcall>
+       </target>
+       
        <target name="clean" depends="init_delegator" description="Clean all targets">
                <antcall target="delegator">
                        <param name="targets" value="clean"/>

diff --git a/build/trailer.xml b/build/trailer.xml
index 0692cb9f0de46ff2323a1eb7704268123b11fbf7..106b4d6ec2196279b2d0244a0277f7d8e1d5cb81 100644 (file)
--- a/build/trailer.xml
+++ b/build/trailer.xml
@@ -59,12 +59,15 @@
 </target>
 
 <target name="clean-deps" depends="init_directory_properties">
-  <delete dir="${external.lib.dir}"/>
-  <mkdir dir="${external.lib.dir}"/>
-  <delete dir="${test.lib.dir}"/>
-  <mkdir dir="${test.lib.dir}"/>
-  <delete dir="${ant.downloaded.lib.dir}"/>
-  <mkdir dir="${ant.downloaded.lib.dir}"/>
+  <delete>
+    <fileset dir="${external.lib.dir}" includes="*"/>
+  </delete>
+  <delete>
+    <fileset dir="${test.lib.dir}" includes="*"/>
+  </delete>
+  <delete>
+    <fileset dir="${ant.downloaded.lib.dir}" includes="*"/>
+  </delete>
 </target>
 
 <!-- ============================================================================

diff --git a/build.xml b/support/build.xml
similarity index 83%
rename from build.xml
rename to support/build.xml
index d2fdcf3a9a8b6bcdb6870d9a88b648e05075239e..54ac0f1149915a4db19be73bee6223852dfaab82 100644 (file)
--- a/build.xml
+++ b/support/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE project [
-    <!ENTITY header SYSTEM "file:build/header.xml">
-    <!ENTITY trailer SYSTEM "file:build/trailer.xml">
+    <!ENTITY header SYSTEM "file:../build/header.xml">
+    <!ENTITY trailer SYSTEM "file:../build/trailer.xml">
 ]>
 
 <project name="support" default="jar" basedir=".">
@@ -11,7 +11,7 @@
        <!-- =============================================================================== -->
        <!-- Include the build header defining general properties                            -->
        <!-- =============================================================================== -->
-    <property name="project.home" value="."/>
+    <property name="project.home" value=".."/>
     <property name="module.name" value="support" />
 
    &header;

diff --git a/conf/properties/log4j.properties b/support/conf/properties/log4j.properties
similarity index 100%
rename from conf/properties/log4j.properties
rename to support/conf/properties/log4j.properties

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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