Author: markt
Date: Fri Mar 6 14:27:56 2009
New Revision: 750916
URL: http://svn.apache.org/viewvc?rev=750916&view=rev
Log:
Fix error in 2.5 web.xml XSD
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 6 14:27:56 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,748344
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=750916&r1=750915&r2=750916&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 6 14:27:56 2009
@@ -95,11 +95,6 @@
code a warning that it won't be there in the next version.
-1:
-* Fix error in 2.5 web.xml XSD
- http://svn.apache.org/viewvc?rev=747863&view=rev
- +1: markt, fhanik, jim
- -1:
-
* UseHttpOnly is a cookie attribute. Our Manager is cookie agnostic, hence the
attribute might
serve a better purpose being implemented at the Context level
http://people.apache.org/~fhanik/tomcat/useHttpOnly.patch
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=750916&r1=750915&r2=750916&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 Fri Mar
6 14:27:56 2009
@@ -875,22 +875,22 @@
<xsd:attribute name="version" type="javaee:web-app-versionType"
use="required" />
<xsd:attribute name="id" type="xsd:ID" />
- xsd:attribute name="metadata-complete" type="xsd:boolean">
- <xsd:annotation>
- <xsd:documentation>
- The metadata-complete attribute defines whether this
- deployment descriptor is complete, or whether the class
- files of the jar file should be examined for annotations
- that specify deployment information. If
- metadata-complete is set to "true", the deployment tool
- must ignore any Servlet annotations present in the class
- files of the application. If metadata-complete is not
- specified or is set to "false", the deployment tool must
- examine the class files of the application for
- annotations, as specified by the Servlet specifications.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute />
+ <xsd:attribute name="metadata-complete" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+ The metadata-complete attribute defines whether this
+ deployment descriptor is complete, or whether the class
+ files of the jar file should be examined for annotations
+ that specify deployment information. If
+ metadata-complete is set to "true", the deployment tool
+ must ignore any Servlet annotations present in the class
+ files of the application. If metadata-complete is not
+ specified or is set to "false", the deployment tool must
+ examine the class files of the application for
+ annotations, as specified by the Servlet specifications.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
<!-- **************************************************** -->
<xsd:complexType name="web-resource-collectionType">
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=750916&r1=750915&r2=750916&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 6 14:27:56 2009
@@ -579,6 +579,9 @@
<fix>
Use more useful JPDA defaults in catalina.bat. (markt)
</fix>
+ <fix>
+ Correct error in 25. web-app XSD.
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
