You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by se...@apache.org on 2002/04/18 21:13:09 UTC
cvs commit: jakarta-james build.xml
serge 02/04/18 12:13:09
Modified: . build.xml
Log:
Changed to build JDBC3 (JDK 1.4) support if it available. Otherwise will build cleanly in JDK 1.3
Revision Changes Path
1.91 +18 -3 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- build.xml 5 Feb 2002 12:36:08 -0000 1.90
+++ build.xml 18 Apr 2002 19:13:09 -0000 1.91
@@ -2,7 +2,7 @@
<!-- ==========================================================================
- James build file $Revision: 1.90 $ Committed on $Date: 2002/02/05 12:36:08 $ by: $Author: danny $
+ James build file $Revision: 1.91 $ Committed on $Date: 2002/04/18 19:13:09 $ by: $Author: serge $
Authors:
Federico Barbieri <sc...@systemy.it>
@@ -92,6 +92,7 @@
<property name="dist.name" value="${name}-${version}"/>
<property name="constants.file" value="org/apache/james/Constants.java"/>
+ <property name="poolconn.file" value="org/apache/james/util/mordred/PoolConnEntry.java"/>
<property name="conf.file" value="james.conf.xml"/>
<property name="server.file" value="james.server.xml"/>
@@ -199,6 +200,9 @@
<property name="src.dist.lib" value="${src.dist.dir}/lib"/>
<property name="src.dist.tools" value="${src.dist.dir}/tools"/>
<property name="src.dist.proposals" value="${src.dist.dir}/proposals"/>
+
+ <available property="jdbc3.present" classname="java.sql.Savepoint"/>
+
</target>
@@ -208,9 +212,11 @@
<target name="prepare" depends="setup-properties">
<mkdir dir="${build.src}"/>
+
<copy todir="${build.src}">
<fileset dir="${java.dir}">
<include name="${constants.file}"/>
+ <include name="${poolconn.file}"/>
</fileset>
</copy>
@@ -220,10 +226,18 @@
<replace file="${build.src}/${constants.file}" token="@@VERSION@@" value="${version}"/>
<replace file="${build.src}/${constants.file}" token="@@NAME@@" value="${Name}"/>
<replace file="${build.src}/${constants.file}" token="@@DATE@@" value="${TODAY}"/>
+ </target>
+ <target name="prepare-jdbc3" depends="prepare" if="jdbc3.present">
+ <replace file="${build.src}/${poolconn.file}" token="/* JDBC_3_ANT_KEY" value="" />
+ <replace file="${build.src}/${poolconn.file}" token="JDBC_3_ANT_KEY */" value="" />
+ <!--
+ <replace dir="${build.src}" token="/* JDBC_3_ANT_KEY" value=""/>
+ <replace dir="${build.src}" token="JDBC_3_ANT_KEY */" value=""/>
+ -->
</target>
- <target name="prepare-error" depends="prepare" unless="AnakiaTask.present">
+ <target name="prepare-error" depends="prepare,prepare-jdbc3" unless="AnakiaTask.present">
<echo>
AnakiaTask is not present! Please check to make sure that
velocity.jar is in your classpath.
@@ -234,7 +248,7 @@
<!-- =================================================================== -->
<!-- Compiles the source directory -->
<!-- =================================================================== -->
- <target name="compile" depends="prepare">
+ <target name="compile" depends="prepare,prepare-jdbc3">
<!-- <mkdir dir="${build.dir}"/> -->
<available property="jndi.present" classname="javax.naming.InitialContext" />
@@ -248,6 +262,7 @@
<src path="${build.src}"/>
<src path="${java.dir}"/>
<exclude name="${constants.file}" />
+ <exclude name="${poolconn.file}" />
<exclude name="org/apache/james/userrepository/UsersLDAPRepository.java"
unless="jndi.present" />
</javac>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>