Return-Path: 
 <dev-return-101428-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 82887 invoked from network); 23 Dec 2009 16:43:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 Dec 2009 16:43:07 -0000
Received: (qmail 66203 invoked by uid 500); 23 Dec 2009 16:43:06 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 66143 invoked by uid 500); 23 Dec 2009 16:43:06 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 66127 invoked by uid 99); 23 Dec 2009 16:43:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Dec 2009 16:43:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Dec 2009 16:43:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4D40723889FD; Wed, 23 Dec 2009 16:42:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r893572 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml
 webapps/docs/changelog.xml
Date: Wed, 23 Dec 2009 16:42:41 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091223164241.4D40723889FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Wed Dec 23 16:42:40 2009
New Revision: 893572

URL: http://svn.apache.org/viewvc?rev=893572&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implement fail-safe EOL conversion for source distributions
Based on patches provided by sebb / kkolinko

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=893572&r1=893571&r2=893572&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 16:42:40 2009
@@ -68,13 +68,6 @@
   -1: funkman : api change in Session.java for .x.x release
 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
-  Implement fail-safe EOL conversion for source distributions
-  Based on patches provided by sebb / kkolinko
-  http://people.apache.org/~markt/patches/2009-12-23-bug47609.patch
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
   Ensure web application class loader is used when calling session listeners
   http://svn.apache.org/viewvc?rev=890530&view=rev

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=893572&r1=893571&r2=893572&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Dec 23 16:42:40 2009
@@ -86,6 +86,23 @@
   <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
   <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
 
+  <!-- Files that need to have their line endings changed for src distros -->
+  <patternset id="src.files" >
+    <include name="**/INSTALLLICENSE,**/KEYS,**/LICENSE,**/NOTICE"/>
+    <include name="**/RELEASE-NOTES"/>
+    <include name="**/*.bat,**/*.dtd"/>
+    <include name="**/*.htm,**/*.html"/>
+    <include name="**/*.ini,**/*.java,**/*.jjt"/>
+    <include name="**/*.jsp,**/*.jspf,**/*.jspx"/>
+    <include name="**/*.license,**/*.manifest,**/*.mdl,**/*.nsi"/>
+    <include name="**/*.policy,**/*.pom,**/*.properties"/>
+    <include name="**/*.properties.default"/>
+    <include name="**/*.rtf,**/*.sh,**/*.svg"/>
+    <include name="**/*.tag,**/*.tagx"/>
+    <include name="**/*.tasks,**/*.tld,**/*.txt"/>
+    <include name="**/*.xml,**/*.xsd,**/*.xsl"/>
+  </patternset>
+
   <!-- ====================== COMBO: Clean All Directories ================ -->
   <target name="clean"
    description="Clean all components">
@@ -587,6 +604,10 @@
 
   <!-- Packages the source code distribution in zip format -->
   <target name="package-src-zip">
+    <fixcrlf srcdir="${tomcat.dist}/src" eol="crlf"
+        encoding="ISO-8859-1" fixlast="false" >
+      <patternset id="src.files"/>
+    </fixcrlf>
     <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
       <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
     </zip>
@@ -598,9 +619,10 @@
 
   <!-- Packages the source code distribution in tar.gz format -->
   <target name="package-src-tgz">
-  	<fixcrlf srcdir="${tomcat.dist}/src"
-        excludes="**/*.bin,**/*.bmp,**/*.dia,**/*.exe,**/*.gif,**/*.ico,**/*.jar,**/*.jpg,**/*.pdf,**/*.rtf,**/*.war"
-          eol="lf" fixlast="false" encoding="ISO-8859-1" />
+    <fixcrlf srcdir="${tomcat.dist}/src" eol="lf"
+        encoding="ISO-8859-1" fixlast="false" >
+      <patternset id="src.files"/>
+    </fixcrlf>
     <tar longfile="gnu" compression="gzip"
          tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
       <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />

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=893572&r1=893571&r2=893572&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 16:42:40 2009
@@ -74,6 +74,10 @@
       <fix>
         Correct MD5 generation in the build process. (jfclere/kkolinko)
       </fix>
+      <fix>
+        <bug>47609</bug>: Provide fail-safe EOL conversion for build process.
+        Based on patches by sebb/kkolinko. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



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