From fb4deb496257c78d4711aab48191dd9a0678798a Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Tue, 14 Mar 2006 20:01:25 +0000
Subject: [PATCH]

---
 build/delegator.xml                               | 13 +++++++++++++
 build/trailer.xml                                 | 15 +++++++++------
 build.xml => support/build.xml                    |  6 +++---
 .../conf}/properties/log4j.properties             |  0
 {src => support/src}/org/wamblee/Pair.java        |  0
 {src => support/src}/org/wamblee/cache/Cache.java |  0
 .../src}/org/wamblee/cache/CachedObject.java      |  0
 .../src}/org/wamblee/cache/EhCache.java           |  0
 .../src}/org/wamblee/cache/ForeverCache.java      |  0
 .../src}/org/wamblee/cache/ZeroCache.java         |  0
 .../src}/org/wamblee/concurrency/JvmLock.java     |  0
 .../src}/org/wamblee/concurrency/Lock.java        |  0
 .../src}/org/wamblee/concurrency/LockAdvice.java  |  0
 .../org/wamblee/concurrency/ReadWriteLock.java    |  0
 .../src}/org/wamblee/general/BeanFactory.java     |  0
 .../org/wamblee/general/BeanFactoryException.java |  0
 .../src}/org/wamblee/general/BeanKernel.java      |  0
 .../org/wamblee/general/SpringBeanFactory.java    |  0
 .../src}/org/wamblee/io/ClassPathResource.java    |  0
 .../src}/org/wamblee/io/FileResource.java         |  0
 .../src}/org/wamblee/io/InputResource.java        |  0
 .../src}/org/wamblee/io/StreamResource.java       |  0
 .../wamblee/observer/DefaultObserverNotifier.java |  0
 .../src}/org/wamblee/observer/Observable.java     |  0
 .../src}/org/wamblee/observer/Observer.java       |  0
 .../org/wamblee/observer/ObserverNotifier.java    |  0
 .../wamblee/persistence/AbstractPersistent.java   |  0
 .../src}/org/wamblee/persistence/Persistent.java  |  0
 .../hibernate/HibernateMappingFiles.java          |  0
 .../persistence/hibernate/HibernateSupport.java   |  0
 .../wamblee/concurrency/ReadWriteLockTest.java    |  0
 .../org/wamblee/observer/ObservableTest.java      |  0
 .../test}/org/wamblee/test/HibernateExporter.java |  0
 .../test}/org/wamblee/test/HibernateUpdater.java  |  0
 .../test}/org/wamblee/test/HibernateUtils.java    |  0
 .../test}/org/wamblee/test/SpringConfigFiles.java |  0
 .../test}/org/wamblee/test/SpringTestCase.java    |  0
 .../org/wamblee/test/TestSpringBeanFactory.java   |  0
 .../test}/org/wamblee/test/TestSupport.java       |  0
 .../org/wamblee/test/TestTransactionCallback.java |  0
 .../TestTransactionCallbackWithoutResult.java     |  0
 41 files changed, 25 insertions(+), 9 deletions(-)
 rename build.xml => support/build.xml (83%)
 rename {conf => support/conf}/properties/log4j.properties (100%)
 rename {src => support/src}/org/wamblee/Pair.java (100%)
 rename {src => support/src}/org/wamblee/cache/Cache.java (100%)
 rename {src => support/src}/org/wamblee/cache/CachedObject.java (100%)
 rename {src => support/src}/org/wamblee/cache/EhCache.java (100%)
 rename {src => support/src}/org/wamblee/cache/ForeverCache.java (100%)
 rename {src => support/src}/org/wamblee/cache/ZeroCache.java (100%)
 rename {src => support/src}/org/wamblee/concurrency/JvmLock.java (100%)
 rename {src => support/src}/org/wamblee/concurrency/Lock.java (100%)
 rename {src => support/src}/org/wamblee/concurrency/LockAdvice.java (100%)
 rename {src => support/src}/org/wamblee/concurrency/ReadWriteLock.java (100%)
 rename {src => support/src}/org/wamblee/general/BeanFactory.java (100%)
 rename {src => support/src}/org/wamblee/general/BeanFactoryException.java (100%)
 rename {src => support/src}/org/wamblee/general/BeanKernel.java (100%)
 rename {src => support/src}/org/wamblee/general/SpringBeanFactory.java (100%)
 rename {src => support/src}/org/wamblee/io/ClassPathResource.java (100%)
 rename {src => support/src}/org/wamblee/io/FileResource.java (100%)
 rename {src => support/src}/org/wamblee/io/InputResource.java (100%)
 rename {src => support/src}/org/wamblee/io/StreamResource.java (100%)
 rename {src => support/src}/org/wamblee/observer/DefaultObserverNotifier.java (100%)
 rename {src => support/src}/org/wamblee/observer/Observable.java (100%)
 rename {src => support/src}/org/wamblee/observer/Observer.java (100%)
 rename {src => support/src}/org/wamblee/observer/ObserverNotifier.java (100%)
 rename {src => support/src}/org/wamblee/persistence/AbstractPersistent.java (100%)
 rename {src => support/src}/org/wamblee/persistence/Persistent.java (100%)
 rename {src => support/src}/org/wamblee/persistence/hibernate/HibernateMappingFiles.java (100%)
 rename {src => support/src}/org/wamblee/persistence/hibernate/HibernateSupport.java (100%)
 rename {test => support/test}/org/wamblee/concurrency/ReadWriteLockTest.java (100%)
 rename {test => support/test}/org/wamblee/observer/ObservableTest.java (100%)
 rename {test => support/test}/org/wamblee/test/HibernateExporter.java (100%)
 rename {test => support/test}/org/wamblee/test/HibernateUpdater.java (100%)
 rename {test => support/test}/org/wamblee/test/HibernateUtils.java (100%)
 rename {test => support/test}/org/wamblee/test/SpringConfigFiles.java (100%)
 rename {test => support/test}/org/wamblee/test/SpringTestCase.java (100%)
 rename {test => support/test}/org/wamblee/test/TestSpringBeanFactory.java (100%)
 rename {test => support/test}/org/wamblee/test/TestSupport.java (100%)
 rename {test => support/test}/org/wamblee/test/TestTransactionCallback.java (100%)
 rename {test => support/test}/org/wamblee/test/TestTransactionCallbackWithoutResult.java (100%)

diff --git a/build/delegator.xml b/build/delegator.xml
index b14dc906..ec28ca2f 100644
--- 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 0692cb9f..106b4d6e 100644
--- 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 d2fdcf3a..54ac0f11 100644
--- 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
-- 
2.31.1