AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Freak not out if ehcache.jar is not available. Instead just don't build Depot.

Browse Source 
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2031 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2007-01-11 01:02:44 +00:00
parent 1d86a5e5cf
commit 21c4d0ed1c
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+3
View File
@@ -61,6 +61,7 @@
<classpath refid="classpath"/> <classpath refid="classpath"/>
<exclude name="com/samskivert/io/**" unless="build.io"/> <exclude name="com/samskivert/io/**" unless="build.io"/>
<exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/> <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/net/**" unless="build.net"/>
<exclude name="com/samskivert/servlet/**" unless="build.servlet"/> <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
<exclude name="com/samskivert/swing/**" unless="build.swing"/> <exclude name="com/samskivert/swing/**" unless="build.swing"/>
@@ -85,6 +86,7 @@
<packageset dir="${src.dir}"> <packageset dir="${src.dir}">
<exclude name="com/samskivert/io/**" unless="build.io"/> <exclude name="com/samskivert/io/**" unless="build.io"/>
<exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/> <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/net/**" unless="build.net"/>
<exclude name="com/samskivert/servlet/**" unless="build.servlet"/> <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
<exclude name="com/samskivert/swing/**" unless="build.swing"/> <exclude name="com/samskivert/swing/**" unless="build.swing"/>
@@ -130,6 +132,7 @@
<include name="**/tests/**/*Test.java"/> <include name="**/tests/**/*Test.java"/>
<exclude name="com/samskivert/io/**" unless="build.io"/> <exclude name="com/samskivert/io/**" unless="build.io"/>
<exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/> <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/net/**" unless="build.net"/>
<exclude name="com/samskivert/servlet/**" unless="build.servlet"/> <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
<exclude name="com/samskivert/swing/**" unless="build.swing"/> <exclude name="com/samskivert/swing/**" unless="build.swing"/>
depends-incl.xml
+26 -14
View File
@@ -35,29 +35,33 @@
<echo level="info">----------------------------------------------</echo> <echo level="info">----------------------------------------------</echo>
<echo level="info">Jakarta libraries - http://jakarta.apache.org/</echo> <echo level="info">Jakarta libraries - http://jakarta.apache.org/</echo>
<echo level="info">----------------------------------------------</echo> <echo level="info">----------------------------------------------</echo>
<available property="jakarta.commons-colls.present" <available property="jakarta.commons-colls.present" classpathref="classpath"
classname="org.apache.commons.collections.CollectionUtils" classname="org.apache.commons.collections.CollectionUtils"/>
classpathref="classpath"/>
<echo level="info">Commons Collections: ${jakarta.commons-colls.present}</echo> <echo level="info">Commons Collections: ${jakarta.commons-colls.present}</echo>
<available property="jakarta.commons-logging.present" <available property="jakarta.commons-logging.present" classpathref="classpath"
classname="org.apache.commons.logging.Log" classname="org.apache.commons.logging.Log"/>
classpathref="classpath"/>
<echo level="info">Commons Logging: ${jakarta.commons-logging.present}</echo> <echo level="info">Commons Logging: ${jakarta.commons-logging.present}</echo>
<available property="jakarta.commons-digester.present" <available property="jakarta.commons-digester.present" classpathref="classpath"
classname="org.apache.commons.digester.Digester" classname="org.apache.commons.digester.Digester"/>
classpathref="classpath"/>
<echo level="info">Commons Digester: ${jakarta.commons-digester.present}</echo> <echo level="info">Commons Digester: ${jakarta.commons-digester.present}</echo>
<available property="jakarta.commons-io.present" <available property="jakarta.commons-io.present" classpathref="classpath"
classname="org.apache.commons.io.IOUtils" classname="org.apache.commons.io.IOUtils"/>
classpathref="classpath"/>
<echo level="info">Commons Io: ${jakarta.commons-io.present}</echo> <echo level="info">Commons Io: ${jakarta.commons-io.present}</echo>
<available property="jakarta.velocity.present" <available property="jakarta.velocity.present" classpathref="classpath"
classname="org.apache.velocity.Template" classpathref="classpath"/> classname="org.apache.velocity.Template"/>
<echo level="info">Velocity: ${jakarta.velocity.present}</echo> <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> </target>
<!-- combines package availability into build controls --> <!-- combines package availability into build controls -->
@@ -84,6 +88,14 @@
</condition> </condition>
<echo>com.samskivert.jdbc: ${build.jdbc}</echo> <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"> <condition property="build.net">
<and> <and>
<isset property="build.io"/> <isset property="build.io"/>
src/java/com/samskivert/jdbc/tests/TestRecord.java → src/java/com/samskivert/jdbc/depot/tests/TestRecord.java
+1 -1
View File
@@ -1,7 +1,7 @@
// //
// $Id$ // $Id$
package com.samskivert.jdbc.tests; package com.samskivert.jdbc.depot.tests;
import java.sql.Date; import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;
src/java/com/samskivert/jdbc/tests/TestRepository.java → src/java/com/samskivert/jdbc/depot/tests/TestRepository.java
+1 -1
View File
@@ -1,7 +1,7 @@
// //
// $Id$ // $Id$
package com.samskivert.jdbc.tests; package com.samskivert.jdbc.depot.tests;
import java.sql.Date; import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;