Author: markt
Date: Wed Feb 10 23:10:04 2010
New Revision: 908735
URL: http://svn.apache.org/viewvc?rev=908735&view=rev
Log:
Use CRLF line ends in conf/* files installed by the Windows exe installer
(kkolinko)
-1:
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=908735&r1=908734&r2=908735&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 10 23:10:04 2010
@@ -101,11 +101,6 @@
+1: kkolinko, markt
-1:
-* Use CRLF line ends in conf/* files installed by the Windows exe installer
-
http://people.apache.org/~kkolinko/patches/2010-01-18_tc6_installer-crlf.patch
- +1: kkolinko, jfclere, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
Only attempt APR initialization if the <Listener> has been specified
http://svn.apache.org/viewvc?rev=904224&view=rev
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=908735&r1=908734&r2=908735&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Feb 10 23:10:04 2010
@@ -326,6 +326,8 @@
<copy file="${tomcat-native.home}/tcnative-1.dll.i64"
tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE"
eol="crlf" encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1"
fixlast="false" />
<!-- Make sure the RELEASE-NOTES has Windows line endings as they may be
displayed post-install -->
<fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
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=908735&r1=908734&r2=908735&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Feb 10 23:10:04 2010
@@ -43,6 +43,12 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>Ensure files in conf directory have CRLF line endings when using the
+ Windows installer. (kkolinko)</fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.24 (jfclere)" rtext="released 2010-01-21">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
