Author: kkolinko
Date: Tue Nov 22 13:26:43 2011
New Revision: 1204982
URL: http://svn.apache.org/viewvc?rev=1204982&view=rev
Log:
Ensure that jdbc-pool.xml is copied before checkstyle runs.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1204982&r1=1204981&r2=1204982&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Nov 22 13:26:43 2011
@@ -488,6 +488,13 @@
file="conf/catalina.properties" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
</copy>
+ <!-- Copy jdbc-pool documentation -->
+ <copy tofile="webapps/docs/jdbc-pool.xml"
+ file="${tomcat.jdbc.dir}/doc/jdbc-pool.xml" encoding="ISO-8859-1">
+ <filterset>
+ <filter token="TOMCAT_PROJECT_DEST" value="project.xml"/>
+ </filterset>
+ </copy>
</target>
<target name="compile"
depends="build-prepare,download-compile,compile-prepare,validate">
@@ -664,7 +671,7 @@
</target>
- <target name="build-docs" description="Builds all documentation from XML
sources">
+ <target name="build-docs" depends="compile-prepare" description="Builds all
documentation from XML sources">
<copy todir="${tomcat.build}/webapps">
<fileset dir="webapps">
@@ -701,12 +708,6 @@
<mkdir dir="${tomcat.build}/webapps/docs/funcspecs" />
<!-- XSL processing -->
- <copy tofile="webapps/docs/jdbc-pool.xml"
file="${tomcat.jdbc.dir}/doc/jdbc-pool.xml">
- <!-- jdbc-pool documentation -->
- <filterset>
- <filter token="TOMCAT_PROJECT_DEST" value="project.xml"/>
- </filterset>
- </copy>
<xslt basedir="webapps/docs"
destdir="${tomcat.build}/webapps/docs"
extension=".html"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
