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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org