Author: kkolinko Date: Tue Feb 4 17:13:10 2014 New Revision: 1564381 URL: http://svn.apache.org/r1564381 Log: Remove svn keywords and similar constructs for other source code management systems from schema and DTD files (backport of r1561706)
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_2.dtd (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_3.dtd (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd (contents, props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/resources/xml.xsd (props changed) Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 4 17:13:10 2014 @@ -28,32 +28,6 @@ None PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Remove svn keywords and similar constructs for other source code - management systems from schema and DTD files - 1. - https://people.apache.org/~kkolinko/patches/2014-01-27_tc6_schemas_keywords.patch - 2. - svn propdel svn:keywords --depth files java/javax/servlet/resources - svn propdel svn:keywords --depth files java/javax/servlet/jsp/resources - (backport of r1561706) - +1: kkolinko, markt - -1: - rjung: Is it helpful to remove the old version tags? They carry the information - on which external varion the files were based on. - - kkolinko: To me those tags say nothing and feel misleading, not - maintained and unmaintainable. - - If the annotation says version "1.17 03/18/03", is it really that - version? If someone prints or copies the file, will such number on - a printed copy be correct? Unlikely. It feels more that it will - impersonate the correct "v1.17" that exists elsewhere. - - The only reliable way to track history of such file is via its - actual history (in source code management system or via mail - archives). The first commit should have said where the file came - from. - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082 Concurrency issue in JULI's LogManager http://svn.apache.org/r1562748 Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd Tue Feb 4 17:13:10 2014 @@ -24,12 +24,6 @@ version="2.0"> <xsd:annotation> <xsd:documentation> - @(#)jsp_2_0.xsds 1.17 03/18/03 - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> This is the XML Schema for the JSP 2.0 deployment descriptor types. The JSP 2.0 schema contains all the special Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd Tue Feb 4 17:13:10 2014 @@ -23,12 +23,6 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0"> - - <xsd:annotation> - <xsd:documentation> - %W% %G% - </xsd:documentation> - </xsd:annotation> <xsd:annotation> <xsd:documentation> <![CDATA[ Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd Tue Feb 4 17:13:10 2014 @@ -17,7 +17,7 @@ <!-- DTD for XML Schemas: Part 1: Structures Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN" Official Location: http://www.w3.org/2001/XMLSchema.dtd --> -<!-- $Id$ --> + <!-- Note this DTD is NOT normative, or even definitive. --> <!--d--> <!-- prose copy in the structures REC is the definitive version --> <!--d--> <!-- (which shouldn't differ from this one except for this --> <!--d--> Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd Tue Feb 4 17:13:10 2014 @@ -16,7 +16,7 @@ --> <!-- DTD for XML Schemas: Part 2: Datatypes - $Id$ + Note this DTD is NOT normative, or even definitive. - - the prose copy in the datatypes REC is the definitive version (which shouldn't differ from this one except for this comment Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd Tue Feb 4 17:13:10 2014 @@ -22,12 +22,6 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.4"> - <xsd:annotation> - <xsd:documentation> - @(#)j2ee_1_4.xsds 1.43 03/09/16 - </xsd:documentation> - </xsd:annotation> - <xsd:annotation> <xsd:documentation> Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd Tue Feb 4 17:13:10 2014 @@ -24,12 +24,6 @@ version="1.1"> <xsd:annotation> <xsd:documentation> - @(#)j2ee_web_services_1_1.xsds 1.11 02/11/03 - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> (C) Copyright International Business Machines Corporation 2002 Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd Tue Feb 4 17:13:10 2014 @@ -24,12 +24,6 @@ version="1.1"> <xsd:annotation> <xsd:documentation> - @(#)j2ee_web_services_client_1_1.xsds 1.10 02/11/03 - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> (C) Copyright International Business Machines Corporation 2002 Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd Tue Feb 4 17:13:10 2014 @@ -8,12 +8,6 @@ version="5"> <xsd:annotation> <xsd:documentation> - @(#)javaee_5.xsds 1.65 06/02/17 - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd Tue Feb 4 17:13:10 2014 @@ -8,12 +8,6 @@ version="1.2"> <xsd:annotation> <xsd:documentation> - @(#)javaee_web_services_1_2.xsds 1.18 02/13/06 - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd Tue Feb 4 17:13:10 2014 @@ -8,12 +8,6 @@ version="1.2"> <xsd:annotation> <xsd:documentation> - @(#)javaee_web_services_client_1_2.xsds 1.19 02/13/06 - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_2.dtd ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_3.dtd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd Tue Feb 4 17:13:10 2014 @@ -24,12 +24,6 @@ version="2.4"> <xsd:annotation> <xsd:documentation> - %W% %E% - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> <![CDATA[ This is the XML Schema for the Servlet 2.4 deployment descriptor. Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd Tue Feb 4 17:13:10 2014 @@ -23,11 +23,6 @@ version="2.5"> <xsd:annotation> <xsd:documentation> - @(#)web-app_2_5.xsds1.62 05/08/06 - </xsd:documentation> - </xsd:annotation> - <xsd:annotation> - <xsd:documentation> <![CDATA[ This is the XML Schema for the Servlet 2.5 deployment descriptor. The deployment descriptor must be named "WEB-INF/web.xml" in the Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/xml.xsd ('svn:keywords' removed) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org