Author: kkolinko
Date: Sat Jan 9 05:37:54 2016
New Revision: 1723827
URL: http://svn.apache.org/viewvc?rev=1723827&view=rev
Log:
Remove redundant copy of catalina.properties from o.a.c.startup.
Generate this copy during the ant "compile" task.
In Tomcat 7 this feature was implemented in r1138825 + r1351135.
Note that nowadays the copied file is not included in src archives.
Removed:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/catalina.properties
Modified:
tomcat/tc6.0.x/trunk/.gitignore
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/.gitignore?rev=1723827&r1=1723826&r2=1723827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/.gitignore (original)
+++ tomcat/tc6.0.x/trunk/.gitignore Sat Jan 9 05:37:54 2016
@@ -34,3 +34,4 @@ maven-ant-tasks-*.jar
thumbs.db
Thumbs.db
bin/setenv.*
+java/org/apache/catalina/startup/catalina.properties
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1723827&r1=1723826&r2=1723827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sat Jan 9 05:37:54 2016
@@ -131,7 +131,15 @@
</target>
- <target name="compile">
+ <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,compile-prepare">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
@@ -168,7 +176,7 @@
</target>
- <target name="build-only" depends="build-prepare,compile,package" />
+ <target name="build-only" depends="compile,package" />
<!-- Pattern sets for jar files -->
<patternset id="files.annotations-api">
@@ -664,6 +672,8 @@
<delete dir="${tomcat.classes}" />
<delete dir="${tomcat.build}" />
<delete dir="${tomcat.manifests}" />
+ <!-- Remove the copied catalina.properties -->
+ <delete file="java/org/apache/catalina/startup/catalina.properties" />
</target>
<!-- ================ Download and dependency building ===================
-->
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1723827&r1=1723826&r2=1723827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sat Jan 9 05:37:54 2016
@@ -368,6 +368,7 @@
<exclude name=".*/**"/>
<exclude name="output/**"/>
<exclude name="build.properties"/>
+ <exclude name="java/org/apache/catalina/startup/catalina.properties"/>
</fileset>
</copy>
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan 9 05:37:54 2016
@@ -0,0 +1 @@
+catalina.properties
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1723827&r1=1723826&r2=1723827&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 9 05:37:54 2016
@@ -103,6 +103,10 @@
Add the <code>StatusManagerServlet</code> to the list of Servlets that
can only be loaded by privileged applications. (markt)
</fix>
+ <fix>
+ Remove redundant copy of catalina.properties from o.a.c.startup.
+ Generate this copy during the ant "compile" task. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
