remm 00/11/07 15:08:19
Modified: catalina build.xml
Log:
- Workaround for an Ant problem. On the first build run, the
org.apache.naming.factory.TyrexDataSourceFactory was always compiled
(which raised an error if Tyrex was not there), because it was referenced by
ResourceFactory. On the second run, the build was successfull.
Now, another compilation switch is added, so that ResourceFactory is
excluded too by default.
Revision Changes Path
1.23 +6 -4 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2000/11/05 06:22:50 1.22
+++ build.xml 2000/11/07 23:08:15 1.23
@@ -71,7 +71,9 @@
<!-- =================== Conditional Compilation Falgs ================ -->
<available property="tyrex.present"
- classname="tyrex.jdbc.ServerDataSource" />
+ classname="tyrex.jdbc.xa.EnabledDataSource" />
+ <available property="jdbcse.present"
+ classname="javax.sql.DataSource" />
<available property="jta.present"
classname="javax.transaction.UserTransaction" />
@@ -80,10 +82,10 @@
classpath="${parser.jar}:${jaxp.jar}:${regexp.jar}:${servlet.jar}:${jcert.jar}:${jnet.jar}:${jsse.jar}:${jmxri.jar}"
deprecation="off" debug="on" optimize="off" target="1.2"
excludes="**/CVS/**">
- <exclude name="**/factory/TyrexDataSourceFactory.java"
+ <exclude name="**/factory/Tyrex*.java"
unless="tyrex.present" />
- <exclude name="**/factory/TyrexTransactionFactory.java"
- unless="tyrex.present" />
+ <exclude name="**/factory/ResourceFactory.java"
+ unless="jdbcse.present" />
<exclude name="**/factory/TransactionFactory.java"
unless="jta.present" />
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
