Return-Path: 
 <dev-return-101620-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 60234 invoked from network); 4 Jan 2010 11:07:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 4 Jan 2010 11:07:12 -0000
Received: (qmail 52146 invoked by uid 500); 4 Jan 2010 11:07:11 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 52066 invoked by uid 500); 4 Jan 2010 11:07:10 -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 52055 invoked by uid 99); 4 Jan 2010 11:07:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jan 2010 11:07:10 +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; Mon, 04 Jan 2010 11:07:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0C4E32388A19; Mon,  4 Jan 2010 11:06:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r895595 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml
Date: Mon, 04 Jan 2010 11:06:46 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100104110647.0C4E32388A19@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Mon Jan  4 11:06:46 2010
New Revision: 895595

URL: http://svn.apache.org/viewvc?rev=895595&view=rev
Log: (empty)

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/dist.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=895595&r1=895594&r2=895595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan  4 11:06:46 2010
@@ -159,11 +159,6 @@
   +1: kkolinko
   -1:
 
-* Fix line-endings in src build
-  http://svn.apache.org/viewvc?rev=894831&view=rev
-  +1: markt, jfclere, kkolinko
-  -1: 
-
 * Add some missing deprecation markers
   http://svn.apache.org/viewvc?rev=895045&view=rev
   +1: markt, kkolinko (with r895057)

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=895595&r1=895594&r2=895595&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Mon Jan  4 11:06:46 2010
@@ -88,19 +88,40 @@
 
   <!-- Files that need to have their line endings changed for src distros -->
   <patternset id="src.files" >
-    <include name="**/INSTALLLICENSE,**/KEYS,**/LICENSE,**/NOTICE"/>
+    <include name="**/INSTALLLICENSE"/>
+  	<include name="**/KEYS"/>
+    <include name="**/LICENSE"/>
+    <include name="**/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="**/*.bat"/>
+    <include name="**/*.dtd"/>
+    <include name="**/*.htm"/>
+    <include name="**/*.html"/>
+    <include name="**/*.ini"/>
+    <include name="**/*.java"/>
+    <include name="**/*.jjt"/>
+    <include name="**/*.jsp"/>
+    <include name="**/*.jspf"/>
+    <include name="**/*.jspx"/>
+    <include name="**/*.license"/>
+    <include name="**/*.manifest"/>
+    <include name="**/*.mdl"/>
+    <include name="**/*.nsi"/>
+    <include name="**/*.policy"/>
+    <include name="**/*.pom"/>
+    <include name="**/*.properties"/>
     <include name="**/*.properties.default"/>
-    <include name="**/*.rtf,**/*.sh,**/*.svg"/>
-    <include name="**/*.tag,**/*.tagx"/>
-    <include name="**/*.tasks,**/*.tld,**/*.txt"/>
-    <include name="**/*.xml,**/*.xsd,**/*.xsl"/>
+    <include name="**/*.rtf"/>
+    <include name="**/*.sh"/>
+    <include name="**/*.svg"/>
+    <include name="**/*.tag"/>
+    <include name="**/*.tagx"/>
+    <include name="**/*.tasks"/>
+    <include name="**/*.tld"/>
+    <include name="**/*.txt"/>
+    <include name="**/*.xml"/>
+    <include name="**/*.xsd"/>
+    <include name="**/*.xsl"/>
   </patternset>
 
   <!-- ====================== COMBO: Clean All Directories ================ -->
@@ -606,7 +627,7 @@
   <target name="package-src-zip">
     <fixcrlf srcdir="${tomcat.dist}/src" eol="crlf"
         encoding="ISO-8859-1" fixlast="false" >
-      <patternset id="src.files"/>
+      <patternset refid="src.files"/>
     </fixcrlf>
     <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
       <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
@@ -621,7 +642,7 @@
   <target name="package-src-tgz">
     <fixcrlf srcdir="${tomcat.dist}/src" eol="lf"
         encoding="ISO-8859-1" fixlast="false" >
-      <patternset id="src.files"/>
+      <patternset refid="src.files"/>
     </fixcrlf>
     <tar longfile="gnu" compression="gzip"
          tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">



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