Author: rjung Date: Thu Jun 23 10:57:18 2011 New Revision: 1138825 URL: http://svn.apache.org/viewvc?rev=1138825&view=rev Log: Remove redundant copy of catalina.properties from o.a.c.startup. Generate this copy for inclusion in bin and src jars during the ant "compile" task.
Removed: tomcat/trunk/java/org/apache/catalina/startup/catalina.properties Modified: tomcat/trunk/build.xml tomcat/trunk/java/org/apache/catalina/startup/ (props changed) tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1138825&r1=1138824&r2=1138825&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Thu Jun 23 10:57:18 2011 @@ -467,6 +467,11 @@ <target name="compile" depends="build-prepare,download-compile,validate"> + <!-- 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> <!-- Compile internal server components --> <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" @@ -2097,6 +2102,8 @@ Apache Tomcat ${version} native binaries <target name="clean" description="Delete the default output folders"> <delete dir="${tomcat.output}" /> + <!-- Remove the copied catalina.properties --> + <delete file="java/org/apache/catalina/startup/catalina.properties" /> </target> Propchange: tomcat/trunk/java/org/apache/catalina/startup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 23 10:57:18 2011 @@ -0,0 +1 @@ +catalina.properties Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1138825&r1=1138824&r2=1138825&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 23 10:57:18 2011 @@ -130,6 +130,11 @@ <bug>51418</bug>: Provide more control over Context creation when embedding Tomcat. Based on a patch by Benson Margulies. (markt/kkolinko) </add> + <fix> + Remove redundant copy of catalina.properties from o.a.c.startup. + Generate this copy for inclusion in bin and src jars during the + ant "compile" task. (rjung) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org