From 21c4d0ed1c17c323b41c4a227f1a8bd22826708d Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Thu, 11 Jan 2007 01:02:44 +0000
Subject: [PATCH] Freak not out if ehcache.jar is not available. Instead just
 don't build Depot.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2031 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 build.xml                                     |  3 ++
 depends-incl.xml                              | 40 ++++++++++++-------
 .../jdbc/{ => depot}/tests/TestRecord.java    |  2 +-
 .../{ => depot}/tests/TestRepository.java     |  2 +-
 4 files changed, 31 insertions(+), 16 deletions(-)
 rename src/java/com/samskivert/jdbc/{ => depot}/tests/TestRecord.java (95%)
 rename src/java/com/samskivert/jdbc/{ => depot}/tests/TestRepository.java (96%)

diff --git a/build.xml b/build.xml
index 8c9430f5..bdf1abe1 100644
--- a/build.xml
+++ b/build.xml
@@ -61,6 +61,7 @@
       <classpath refid="classpath"/>
       <exclude name="com/samskivert/io/**" unless="build.io"/>
       <exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
+      <exclude name="com/samskivert/jdbc/depot/**" unless="build.depot"/>
       <exclude name="com/samskivert/net/**" unless="build.net"/>
       <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
       <exclude name="com/samskivert/swing/**" unless="build.swing"/>
@@ -85,6 +86,7 @@
       <packageset dir="${src.dir}">
         <exclude name="com/samskivert/io/**" unless="build.io"/>
         <exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
+        <exclude name="com/samskivert/jdbc/depot/**" unless="build.depot"/>
         <exclude name="com/samskivert/net/**" unless="build.net"/>
         <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
         <exclude name="com/samskivert/swing/**" unless="build.swing"/>
@@ -130,6 +132,7 @@
           <include name="**/tests/**/*Test.java"/>
           <exclude name="com/samskivert/io/**" unless="build.io"/>
           <exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
+          <exclude name="com/samskivert/jdbc/depot/**" unless="build.depot"/>
           <exclude name="com/samskivert/net/**" unless="build.net"/>
           <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
           <exclude name="com/samskivert/swing/**" unless="build.swing"/>
diff --git a/depends-incl.xml b/depends-incl.xml
index b0894727..50fed95a 100644
--- a/depends-incl.xml
+++ b/depends-incl.xml
@@ -35,29 +35,33 @@
     <echo level="info">----------------------------------------------</echo>
     <echo level="info">Jakarta libraries - http://jakarta.apache.org/</echo>
     <echo level="info">----------------------------------------------</echo>
-    <available property="jakarta.commons-colls.present"
-     classname="org.apache.commons.collections.CollectionUtils"
-     classpathref="classpath"/>
+    <available property="jakarta.commons-colls.present" classpathref="classpath"
+     classname="org.apache.commons.collections.CollectionUtils"/>
     <echo level="info">Commons Collections: ${jakarta.commons-colls.present}</echo>
 
-    <available property="jakarta.commons-logging.present"
-     classname="org.apache.commons.logging.Log"
-     classpathref="classpath"/>
+    <available property="jakarta.commons-logging.present" classpathref="classpath"
+     classname="org.apache.commons.logging.Log"/>
     <echo level="info">Commons Logging: ${jakarta.commons-logging.present}</echo>
 
-    <available property="jakarta.commons-digester.present"
-     classname="org.apache.commons.digester.Digester"
-     classpathref="classpath"/>
+    <available property="jakarta.commons-digester.present" classpathref="classpath"
+     classname="org.apache.commons.digester.Digester"/>
     <echo level="info">Commons Digester: ${jakarta.commons-digester.present}</echo>
 
-    <available property="jakarta.commons-io.present"
-     classname="org.apache.commons.io.IOUtils"
-     classpathref="classpath"/>
+    <available property="jakarta.commons-io.present" classpathref="classpath"
+     classname="org.apache.commons.io.IOUtils"/>
     <echo level="info">Commons Io: ${jakarta.commons-io.present}</echo>
 
-    <available property="jakarta.velocity.present"
-     classname="org.apache.velocity.Template" classpathref="classpath"/>
+    <available property="jakarta.velocity.present" classpathref="classpath"
+     classname="org.apache.velocity.Template"/>
     <echo level="info">Velocity: ${jakarta.velocity.present}</echo>
+
+    <echo level="info"></echo>
+    <echo level="info">---------------</echo>
+    <echo level="info">Other libraries</echo>
+    <echo level="info">---------------</echo>
+    <available property="ehcache.present" classpathref="classpath"
+     classname="net.sf.ehcache.Element"/>
+    <echo level="info">EH Cache: ${ehcache.present}</echo>
   </target>
 
   <!-- combines package availability into build controls -->
@@ -84,6 +88,14 @@
     </condition>
     <echo>com.samskivert.jdbc: ${build.jdbc}</echo>
 
+    <condition property="build.depot">
+      <and>
+        <isset property="build.jdbc"/>
+        <isset property="ehcache.present"/>
+      </and>
+    </condition>
+    <echo>com.samskivert.jdbc.depot: ${build.depot}</echo>
+
     <condition property="build.net">
       <and>
         <isset property="build.io"/>
diff --git a/src/java/com/samskivert/jdbc/tests/TestRecord.java b/src/java/com/samskivert/jdbc/depot/tests/TestRecord.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/tests/TestRecord.java
rename to src/java/com/samskivert/jdbc/depot/tests/TestRecord.java
index c5287a35..3a4a3867 100644
--- a/src/java/com/samskivert/jdbc/tests/TestRecord.java
+++ b/src/java/com/samskivert/jdbc/depot/tests/TestRecord.java
@@ -1,7 +1,7 @@
 //
 // $Id$
 
-package com.samskivert.jdbc.tests;
+package com.samskivert.jdbc.depot.tests;
 
 import java.sql.Date;
 import java.sql.Timestamp;
diff --git a/src/java/com/samskivert/jdbc/tests/TestRepository.java b/src/java/com/samskivert/jdbc/depot/tests/TestRepository.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/tests/TestRepository.java
rename to src/java/com/samskivert/jdbc/depot/tests/TestRepository.java
index 97d26983..73223107 100644
--- a/src/java/com/samskivert/jdbc/tests/TestRepository.java
+++ b/src/java/com/samskivert/jdbc/depot/tests/TestRepository.java
@@ -1,7 +1,7 @@
 //
 // $Id$
 
-package com.samskivert.jdbc.tests;
+package com.samskivert.jdbc.depot.tests;
 
 import java.sql.Date;
 import java.sql.Timestamp;