svn commit: r1195899 - /tomcat/trunk/build.xml

[kk...@apache.org]

Author: kkolinko
Date: Tue Nov  1 09:47:42 2011
New Revision: 1195899

URL: http://svn.apache.org/viewvc?rev=1195899&view=rev
Log:
Fix checkstyle validation for startup/catalina.properties:
validation runs before compile and the file must be copied before validation runs.
Reconfigured the build so that copying occurs before validation.

Modified:
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1195899&r1=1195898&r2=1195899&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Nov  1 09:47:42 2011
@@ -472,13 +472,15 @@
     </checkstyle>
   </target>
 
-  <target name="compile" depends="build-prepare,download-compile,validate">
-
+  <target name="compile-prepare">
     <!-- Add the builtin catalina.properties -->
     <copy todir="java/org/apache/catalina/startup"
           file="conf/catalina.properties" encoding="ISO-8859-1">
       <filterset refid="version.filters"/>
     </copy>
+  </target>
+
+  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
     <!-- Compile internal server components -->
     <javac srcdir="java" destdir="${tomcat.classes}"
            debug="${compile.debug}"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org