From: Greg W. <gre...@us...> - 2005-10-30 23:39:12
|
User: gregwilkins Date: 05/10/30 15:39:06 Modified: modules/javax-servlet/src/javax/servlet/resources XMLSchema.dtd datatypes.dtd j2ee_1_4.xsd j2ee_web_services_1_1.xsd j2ee_web_services_client_1_1.xsd web-app_2_2.dtd web-app_2_3.dtd web-app_2_4.xsd xml.xsd Log: scm Revision Changes Path 1.2 +6 -1 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/XMLSchema.dtd Index: XMLSchema.dtd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/XMLSchema.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- XMLSchema.dtd 5 Oct 2005 14:09:28 -0000 1.1 +++ XMLSchema.dtd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,3 +1,8 @@ +<!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + <!-- DTD for XML Schemas: Part 1: Structures Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN" Official Location: http://www.w3.org/2001/XMLSchema.dtd --> 1.2 +6 -1 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/datatypes.dtd Index: datatypes.dtd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/datatypes.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- datatypes.dtd 5 Oct 2005 14:09:28 -0000 1.1 +++ datatypes.dtd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,4 +1,9 @@ <!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + +<!-- DTD for XML Schemas: Part 2: Datatypes $Id$ Note this DTD is NOT normative, or even definitive. - - the 1.2 +14 -3 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/j2ee_1_4.xsd Index: j2ee_1_4.xsd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/j2ee_1_4.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- j2ee_1_4.xsd 5 Oct 2005 14:09:28 -0000 1.1 +++ j2ee_1_4.xsd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + <xsd:schema targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" @@ -8,14 +14,14 @@ version="1.4"> <xsd:annotation> <xsd:documentation> - @(#)j2ee_1_4.xsds 1.42 03/08/01 + @(#)j2ee_1_4.xsds 1.43 03/09/16 </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> - Copyright 2002 Sun Microsystems, Inc., 901 San Antonio + Copyright 2003 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved. @@ -46,6 +52,7 @@ </xsd:documentation> </xsd:annotation> + <xsd:annotation> <xsd:documentation> @@ -497,7 +504,11 @@ <xsd:documentation> The elements that use this type designate the name of a - Java class or interface. + Java class or interface. The name is in the form of a + "binary name", as defined in the JLS. This is the form + of name used in Class.forName(). Tools that need the + canonical name (the name used in source code) will need + to convert this binary name to the canonical name. </xsd:documentation> </xsd:annotation> 1.2 +8 -1 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/j2ee_web_services_1_1.xsd Index: j2ee_web_services_1_1.xsd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/j2ee_web_services_1_1.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- j2ee_web_services_1_1.xsd 5 Oct 2005 14:09:28 -0000 1.1 +++ j2ee_web_services_1_1.xsd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" @@ -15,7 +21,7 @@ <xsd:annotation> <xsd:documentation> - Copyright 2002 Sun Microsystems, Inc., 901 San Antonio + Copyright 2003 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved. @@ -46,6 +52,7 @@ </xsd:documentation> </xsd:annotation> + <xsd:annotation> <xsd:documentation> 1.2 +8 -1 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/j2ee_web_services_client_1_1.xsd Index: j2ee_web_services_client_1_1.xsd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/j2ee_web_services_client_1_1.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- j2ee_web_services_client_1_1.xsd 5 Oct 2005 14:09:28 -0000 1.1 +++ j2ee_web_services_client_1_1.xsd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" @@ -15,7 +21,7 @@ <xsd:annotation> <xsd:documentation> - Copyright 2002 Sun Microsystems, Inc., 901 San Antonio + Copyright 2003 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved. @@ -46,6 +52,7 @@ </xsd:documentation> </xsd:annotation> + <xsd:annotation> <xsd:documentation> 1.2 +74 -0 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/web-app_2_2.dtd Index: web-app_2_2.dtd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/web-app_2_2.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- web-app_2_2.dtd 5 Oct 2005 14:09:28 -0000 1.1 +++ web-app_2_2.dtd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,3 +1,77 @@ +<!-- +Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road, +Palo Alto, CA 94303, U.S.A. All rights reserved. + +This product or document is protected by copyright and distributed +under licenses restricting its use, copying, distribution, and +decompilation. No part of this product or documentation may be +reproduced in any form by any means without prior written authorization +of Sun and its licensors, if any. + +Third party software, including font technology, is copyrighted and +licensed from Sun suppliers. + +Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java +Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, +are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. +and other countries. + +All SPARC trademarks are used under license and are trademarks +or registered trademarks of SPARC International, Inc. +in the U.S. and other countries. Products bearing SPARC +trademarks are based upon an architecture developed by Sun Microsystems, Inc. + +PostScript is a registered trademark of Adobe Systems, Inc. + + +Federal Acquisitions: Commercial Software - Government Users Subject to +Standard License Terms and Conditions. + + + +DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED +CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY +IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT +TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY +INVALID. + +_________________________________________________________________________ +Copyright 1999 Sun Microsystems, Inc., +901 San Antonio Road, Palo Alto, CA 94303, Etats-Unis. +Tous droits re'serve's. + + +Ce produit ou document est prote'ge' par un copyright et distribue' avec +des licences qui en restreignent l'utilisation, la copie, la distribution, +et la de'compilation. Aucune partie de ce produit ou de sa documentation +associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen +que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses +bailleurs de licence, s'il y en a. + +Le logiciel de'tenu par des tiers, et qui comprend la technologie +relative aux polices de caracte`res, est prote'ge' par un copyright +et licencie' par des fournisseurs de Sun. + +Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java +Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans, +sont des marques de fabrique ou des marques de'pose'es de Sun +Microsystems, Inc. aux Etats-Unis et dans d'autres pays. + +Toutes les marques SPARC sont utilise'es sous licence et sont +des marques de fabrique ou des marques de'pose'es de SPARC +International, Inc. aux Etats-Unis et dans +d'autres pays. Les produits portant les marques SPARC sont +base's sur une architecture de'veloppe'e par Sun Microsystems, Inc. + +Postcript est une marque enregistre'e d'Adobe Systems Inc. + +LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS, +DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES, +DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT +TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE +A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON. +--> <!-- The web-app element is the root of the deployment descriptor for 1.2 +58 -54 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/web-app_2_3.dtd Index: web-app_2_3.dtd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/web-app_2_3.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- web-app_2_3.dtd 5 Oct 2005 14:09:28 -0000 1.1 +++ web-app_2_3.dtd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,74 +1,78 @@ <!-- -Copyright 2000-2001 Sun Microsystems, Inc. 901 San Antonio Road, -Palo Alto, CA 94303, U.S.A. All rights reserved. +Copyright (c) 2000 Sun Microsystems, Inc., +901 San Antonio Road, +Palo Alto, California 94303, U.S.A. +All rights reserved. + +Sun Microsystems, Inc. has intellectual property rights relating to +technology embodied in the product that is described in this document. +In particular, and without limitation, these intellectual property +rights may include one or more of the U.S. patents listed at +http://www.sun.com/patents and one or more additional patents or +pending patent applications in the U.S. and in other countries. + +This document and the product to which it pertains are distributed +under licenses restricting their use, copying, distribution, and +decompilation. This document may be reproduced and distributed but may +not be changed without prior written authorization of Sun and its +licensors, if any. -This product or document is protected by copyright and distributed -under licenses restricting its use, copying, distribution, and -decompilation. No part of this product or documentation may be -reproduced in any form by any means without prior written authorization -of Sun and its licensors, if any. - -Third party software, including font technology, is copyrighted and +Third-party software, including font technology, is copyrighted and licensed from Sun suppliers. -Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java -Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, -are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. -and other countries. - -All SPARC trademarks are used under license and are trademarks -or registered trademarks of SPARC International, Inc. -in the U.S. and other countries. Products bearing SPARC -trademarks are based upon an architecture developed by Sun Microsystems, Inc. - -PostScript is a registered trademark of Adobe Systems, Inc. +Sun, Sun Microsystems, the Sun logo, Java, JavaServer Pages, Java +Naming and Directory Interface, JDBC, JDK, JavaMail and and +Enterprise JavaBeans are trademarks or registered trademarks of Sun +Microsystems, Inc. in the U.S. and other countries. Federal Acquisitions: Commercial Software - Government Users Subject to Standard License Terms and Conditions. DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED -CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY -IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT -TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY -INVALID. +CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED +WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR +NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH +DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. + _________________________________________________________________________ -Copyright 2000-2001 Sun Microsystems, Inc., -901 San Antonio Road, Palo Alto, CA 94303, Etats-Unis. +Copyright (c) 2000 Sun Microsystems, Inc., +901 San Antonio Road, +Palo Alto, California 94303, E'tats-Unis. Tous droits re'serve's. - -Ce produit ou document est prote'ge' par un copyright et distribue' avec -des licences qui en restreignent l'utilisation, la copie, la distribution, -et la de'compilation. Aucune partie de ce produit ou de sa documentation -associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen -que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses -bailleurs de licence, s'il y en a. +Sun Microsystems, Inc. a les droits de proprie'te' intellectuels +relatants a` la technologie incorpore'e dans le produit qui est de'crit +dans ce document. En particulier, et sans la limitation, ces droits de +proprie'te' intellectuels peuvent inclure un ou plus des brevets +ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les +brevets plus supple'mentaires ou les applications de brevet en attente +dans les E'tats-Unis et dans les autres pays. + +Ce produit ou document est prote'ge' par un copyright et distribue' +avec des licences qui en restreignent l'utilisation, la copie, la +distribution, et la de'compilation. Ce documention associe n peut +e^tre reproduite et distribuer, par quelque moyen que ce soit, sans +l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de +licence, le cas e'che'ant. Le logiciel de'tenu par des tiers, et qui comprend la technologie -relative aux polices de caracte`res, est prote'ge' par un copyright -et licencie' par des fournisseurs de Sun. +relative aux polices de caracte`res, est prote'ge' par un copyright et +licencie' par des fournisseurs de Sun. -Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java -Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans, -sont des marques de fabrique ou des marques de'pose'es de Sun -Microsystems, Inc. aux Etats-Unis et dans d'autres pays. - -Toutes les marques SPARC sont utilise'es sous licence et sont -des marques de fabrique ou des marques de'pose'es de SPARC -International, Inc. aux Etats-Unis et dans -d'autres pays. Les produits portant les marques SPARC sont -base's sur une architecture de'veloppe'e par Sun Microsystems, Inc. - -Postcript est une marque enregistre'e d'Adobe Systems Inc. - -LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS, -DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES, -DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT -TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE -A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON. +Sun, Sun Microsystems, le logo Sun, Java, JavaServer Pages, Java +Naming and Directory Interface, JDBC, JDK, JavaMail et and +Enterprise JavaBeans sont des marques de fabrique ou des marques +de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres +pays. + +LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS, +DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT +EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS +NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A +L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE +CONTREFAC,ON. --> <!-- 1.2 +9 -3 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/web-app_2_4.xsd Index: web-app_2_4.xsd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/web-app_2_4.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- web-app_2_4.xsd 5 Oct 2005 14:09:28 -0000 1.1 +++ web-app_2_4.xsd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" @@ -8,14 +14,14 @@ version="2.4"> <xsd:annotation> <xsd:documentation> - %W% %E% + @(#)web-app_2_4.xsds 1.60 03/08/26 </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> - Copyright 2002 Sun Microsystems, Inc., 901 San Antonio + Copyright 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved. @@ -789,7 +795,7 @@ <xsd:simpleContent> <xsd:restriction base="j2ee:string"> - <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/> + <xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/> </xsd:restriction> </xsd:simpleContent> </xsd:complexType> 1.2 +6 -0 JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/xml.xsd Index: xml.xsd =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/javax-servlet/src/javax/servlet/resources/xml.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- xml.xsd 5 Oct 2005 14:09:28 -0000 1.1 +++ xml.xsd 30 Oct 2005 23:39:05 -0000 1.2 @@ -1,4 +1,10 @@ <?xml version='1.0'?> + +<!-- + Copyright 2004 Sun Microsystems, Inc. All rights reserved. + SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +--> + <!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" > <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"> |