Author: markt
Date: Fri Feb 7 10:00:09 2014
New Revision: 1565603
URL: http://svn.apache.org/r1565603
Log:
Add a check to the build to catch problems copying the DBCP resources
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1565603&r1=1565602&r2=1565603&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Feb 7 10:00:09 2014
@@ -2757,6 +2757,18 @@ Apache Tomcat ${version} native binaries
<fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
</move>
<mkdir dir="${tomcat-dbcp.home}/classes"/>
+ <!-- Make sure the build fails if the DBCP sources haven't been copied
-->
+ <!-- correctly. Other problems should be detected by the following -->
+ <!-- compilation step failing. -->
+ <fail message="Repackaged DBCP factory is missing">
+ <condition>
+ <not>
+ <resourceexists>
+ <file
file="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java"/>
+ </resourceexists>
+ </not>
+ </condition>
+ </fail>
<javac destdir="${tomcat-dbcp.home}/classes"
optimize="off"
debug="${compile.debug}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
