From 53effafe582f026731179852cff579f555f46711 Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Sun, 12 Jul 2009 21:02:19 +0000
Subject: [PATCH] Got a little too excited here. We can only nix commons-io. We
 still need collections and logging. Sigh.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2588 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 build.xml            |  2 --
 etc/depends-incl.xml | 12 ------------
 etc/libs-incl.xml    |  2 ++
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index d0032bdf..e9e4be8d 100644
--- a/build.xml
+++ b/build.xml
@@ -71,7 +71,6 @@
       <exclude name="com/samskivert/swing/**" unless="build.swing"/>
       <exclude name="com/samskivert/test/**" unless="build.test"/>
       <exclude name="com/samskivert/util/**" unless="build.util"/>
-      <exclude name="com/samskivert/util/FileUtil*" unless="build.fileutil"/>
       <exclude name="com/samskivert/util/Log4JLogger*" unless="log4j.present"/>
       <exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
       <exclude name="com/samskivert/xml/**" unless="build.xml"/>
@@ -97,7 +96,6 @@
         <exclude name="com/samskivert/swing/**" unless="build.swing"/>
         <exclude name="com/samskivert/test/**" unless="build.test"/>
         <exclude name="com/samskivert/util/**" unless="build.util"/>
-        <exclude name="com/samskivert/util/FileUtil*" unless="build.fileutil"/>
         <exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
         <exclude name="com/samskivert/xml/**" unless="build.xml"/>
         <exclude name="com/samskivert/**/tests/**" unless="build.tests"/>
diff --git a/etc/depends-incl.xml b/etc/depends-incl.xml
index c6d99a38..62e9b20e 100644
--- a/etc/depends-incl.xml
+++ b/etc/depends-incl.xml
@@ -47,10 +47,6 @@
      classname="org.apache.commons.digester.Digester"/>
     <echo level="info">Commons Digester: ${jakarta.commons-digester.present}</echo>
 
-    <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" classpathref="classpath"
      classname="org.apache.velocity.Template"/>
     <echo level="info">Velocity: ${jakarta.velocity.present}</echo>
@@ -87,7 +83,6 @@
       <and>
         <isset property="build.io"/>
         <isset property="build.util"/>
-        <isset property="jakarta.commons-io.present"/>
       </and>
     </condition>
     <echo level="info">com.samskivert.jdbc: ${build.jdbc}</echo>
@@ -140,13 +135,6 @@
     </condition>
     <echo level="info">com.samskivert.*.tests: ${build.tests}</echo>
 
-    <condition property="build.fileutil">
-      <and>
-        <isset property="jakarta.commons-io.present"/>
-      </and>
-    </condition>
-    <echo level="info">com.samskivert.util.FileUtil: ${build.fileutil}</echo>
-
     <condition property="build.mail">
       <and>
         <isset property="build.io"/>
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index ae7e7844..00005b2f 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -3,7 +3,9 @@
 <project name="library-dependencies">
   <fileset dir="${libs.dir}" id="samskivert.libs">
     <include name="ant.jar"/>
+    <include name="commons-collections.jar"/>
     <include name="commons-digester.jar"/>
+    <include name="commons-logging.jar"/>
     <include name="ehcache.jar"/>
     <include name="junit-3.7.jar"/>
     <include name="junit4.jar"/>