You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/06 22:38:18 UTC
svn commit: r609412 - in /tomcat/servletapi/servlet2.4-jsp2.0-tc5.x:
jsr152/src/share/dtd/jsp_2_0.xsd
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd
Author: markt
Date: Sun Jan 6 13:38:17 2008
New Revision: 609412
URL: http://svn.apache.org/viewvc?rev=609412&view=rev
Log:
Port license fixes from TC6. See the change log for the TC6 files for details on provenance.
Modified:
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd
URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd?rev=609412&r1=609411&r2=609412&view=diff
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd Sun Jan 6 13:38:17 2008
@@ -31,41 +31,6 @@
<xsd:annotation>
<xsd:documentation>
- Copyright 2002 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 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 other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- 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, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo 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.
-
- </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
structures and datatypes that are necessary to use JSP files
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd?rev=609412&r1=609411&r2=609412&view=diff
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd Sun Jan 6 13:38:17 2008
@@ -19,6 +19,7 @@
targetNamespace="http://java.sun.com/xml/ns/j2ee"
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="2.0">
@@ -28,42 +29,6 @@
%W% %G%
</xsd:documentation>
</xsd:annotation>
-
- <xsd:annotation>
- <xsd:documentation>
-
- Copyright 2003 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 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 other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- 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, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo 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.
-
- </xsd:documentation>
- </xsd:annotation>
-
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -286,15 +251,13 @@
Where:
- * Type is a basic type or a fully qualified
- Java class name (including package name),
- as per the 'Type' production in the Java
- Language Specification, Second Edition,
+ * Type is a basic type or a fully qualified Java class name
+ (including package name), as per the 'Type' production
+ in the Java Language Specification, Second Edition,
Chapter 18.
- * Identifier is a Java identifier, as per
- the 'Identifier' production in the Java
- Language Specification, Second
+ * Identifier is a Java identifier, as per the 'Identifier'
+ production in the Java Language Specification, Second
Edition, Chapter 18.
Example:
@@ -711,8 +674,8 @@
The taglib tag is the document root, it defines:
- description a simple string describing the "use" of this
- taglib, should be user discernable
+ description a simple string describing the "use" of this taglib,
+ should be user discernable
display-name the display-name element contains a
short name that is intended to be displayed
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd?rev=609412&r1=609411&r2=609412&view=diff
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd Sun Jan 6 13:38:17 2008
@@ -31,40 +31,6 @@
<xsd:annotation>
<xsd:documentation>
- Copyright 2002 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 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 other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- 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, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo 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.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:annotation>
- <xsd:documentation>
-
(C) Copyright International Business Machines Corporation 2002
</xsd:documentation>
Modified: tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd
URL: http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd?rev=609412&r1=609411&r2=609412&view=diff
==============================================================================
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd (original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd Sun Jan 6 13:38:17 2008
@@ -31,40 +31,6 @@
<xsd:annotation>
<xsd:documentation>
- Copyright 2002 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 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 other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- 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, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo 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.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:annotation>
- <xsd:documentation>
-
(C) Copyright International Business Machines Corporation 2002
</xsd:documentation>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org