Update of /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd
In directory sc8-pr-cvs1:/tmp/cvs-serv14335/plugins/ejb-jar/src/xsd
Modified Files:
application-client_1_4.xsd application_1_4.xsd
connector_1_5.xsd ejb-jar_2_1.xsd j2ee_1_4.xsd jsp_2_0.xsd
web-app_2_4.xsd web-jsptaglibrary_2_0.xsd
Added Files:
j2ee_web_services_client_1_1.xsd
Log Message:
Updated schemas for EJB/J2EE
I successfully converted the schemas to RELAX NG with rngconv-20020414
(http://wwws.sun.com/software/xml/developers/relaxngconverter/)
It should be fairly easy to update zeus to support RNG, so we can ditch Castor.
Then we could probably hack Zeus to generate a simple bean model and get rid of the
current code explosion in xmlfacade. We can either use Zeus as is as an intermediate
step, then modify xmlfacade to generate just one XMLfacade API that uses Jelly
underneath.
--- NEW FILE: j2ee_web_services_client_1_1.xsd ---
<?xml version="1.0" encoding="UTF-8"?>
<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";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.1">
<xsd:annotation>
<xsd:documentation>
@(#)j2ee_web_services_client_1_1.xsds 1.8 09/30/02
</xsd:documentation>
</xsd:annotation>
<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>
</xsd:annotation>
<!-- **************************************************** -->
<xsd:complexType name="port-component-refType">
<xsd:annotation>
<xsd:documentation>
The port-component-ref element declares a client dependency
on the container for resolving a Service Endpoint Interface
to a WSDL port. It optionally associates the Service Endpoint
Interface with a particular port-component. This is only used
by the container for a Service.getPort(Class) method call.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="service-endpoint-interface"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
The service-endpoint-interface element defines a fully qualified
Java class that represents the Service Endpoint Interface of a
WSDL port.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="port-component-link"
type="j2ee:string"
minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
The port-component-link element links a port-component-ref to a
specific port-component required to be made available by a service
reference.
The value of a port-component-link must be the port-component-name
of a port-component in the same module or another module in the same
application unit. The syntax for specification follows the syntax
defined for ejb-link in the EJB 2.0 specification.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
<xsd:group name="service-refGroup">
<xsd:sequence>
<xsd:element name="service-ref"
type="j2ee:service-refType"
minOccurs="0" maxOccurs="unbounded">
<xsd:key name="service-ref_handler-name-key">
<xsd:annotation>
<xsd:documentation>
Defines the name of the handler. The name must be unique within the
module.
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:handler"/>
<xsd:field xpath="j2ee:handler-name"/>
</xsd:key>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- **************************************************** -->
<xsd:complexType name="service-refType">
<xsd:annotation>
<xsd:documentation>
The service-ref element declares a reference to a Web
service. It contains optional description, display name and
icons, a declaration of the required Service interface,
an optional WSDL document location, an optional set
of JAX-RPC mappings, an optional QName for the service element,
an optional set of Service Endpoint Interfaces to be resolved
by the container to a WSDL port, and an optional set of handlers.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="service-ref-name"
type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
The service-ref-name element declares logical name that the
components in the module use to look up the Web service. It
is recommended that all service reference names start with
"service/".
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="service-interface"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
The service-interface element declares the fully qualified class
name of the JAX-RPC Service interface the client depends on.
In most cases the value will be javax.xml.rpc.Service. A JAX-RPC
generated Service Interface class may also be specified.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="wsdl-file"
type="j2ee:xsdAnyURIType"
minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
The wsdl-file element contains the URI location of a WSDL file. The
location is relative to the root of the module.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="jaxrpc-mapping-file"
type="j2ee:pathType"
minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
The jaxrpc-mapping-file element contains the name of a file that
describes the JAX-RPC mapping between the Java interaces used by
the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module file.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="service-qname"
type="j2ee:xsdQNameType"
minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
The service-qname element declares the specific WSDL service
element that is being refered to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="port-component-ref"
type="j2ee:port-component-refType"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
The port-component-ref element declares a client dependency
on the container for resolving a Service Endpoint Interface
to a WSDL port. It optionally associates the Service Endpoint
Interface with a particular port-component. This is only used
by the container for a Service.getPort(Class) method call.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="handler"
type="j2ee:service-ref_handlerType"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
Declares the handler for a port-component. Handlers can access the
init-param name/value pairs using the HandlerInfo interface. If
port-name is not specified, the handler is assumed to be associated
with all ports of the service.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
<xsd:complexType name="service-ref_handlerType">
<xsd:annotation>
<xsd:documentation>
Declares the handler for a port-component. Handlers can access the
init-param name/value pairs using the HandlerInfo interface. If
port-name is not specified, the handler is assumed to be associated
with all ports of the service.
Used in: service-ref
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="handler-name"
type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
Defines the name of the handler. The name must be unique within the
module.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="handler-class"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
Defines a fully qualified class name for the handler implementation.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="init-param"
type="j2ee:param-valueType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="soap-header"
type="j2ee:xsdQNameType"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
Defines the QName of a SOAP header that will be processed by the
handler.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="soap-role"
type="j2ee:string"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
The soap-role element contains a SOAP actor definition that the
Handler will play as a role.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="port-name"
type="j2ee:string"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
The port-name element defines the WSDL port-name that a handler
should be associated with.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
</xsd:schema>
Index: application-client_1_4.xsd
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/application-client_1_4.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** application-client_1_4.xsd 31 Jan 2003 12:17:34 -0000 1.1
--- application-client_1_4.xsd 18 Feb 2003 00:28:58 -0000 1.2
***************
*** 9,13 ****
<xsd:annotation>
<xsd:documentation>
! @(#)application-client_1_4.xsds 1.7 07/08/02
</xsd:documentation>
</xsd:annotation>
--- 9,13 ----
<xsd:annotation>
<xsd:documentation>
! @(#)application-client_1_4.xsds 1.15 09/30/02
</xsd:documentation>
</xsd:annotation>
***************
*** 50,71 ****
<xsd:annotation>
<xsd:documentation>
This is the XML Schema for the application client 1.4
! deployment descriptor. All application client deployment
! descriptors must indicate the application client
! schema by using the J2EE namespace:
http://java.sun.com/xml/ns/j2ee
! and by indicating the version of the schema by
using the version element as shown below:
<application-client xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
! http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";
! version="1.4">
!
! ...
</application-client>
--- 50,73 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
This is the XML Schema for the application client 1.4
! deployment descriptor. The deployment descriptor must
! be named "META-INF/application-client.xml" in the
! application client's jar file. All application client
! deployment descriptors must indicate the application
! client schema by using the J2EE namespace:
http://java.sun.com/xml/ns/j2ee
! and indicate the version of the schema by
using the version element as shown below:
<application-client xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
! http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";
! version="1.4">
! ...
</application-client>
***************
*** 76,79 ****
--- 78,82 ----
http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 97,101 ****
</xsd:annotation>
! <include schemaLocation="j2ee_1_4.xsd"/>
--- 100,104 ----
</xsd:annotation>
! <xsd:include schemaLocation="j2ee_1_4.xsd"/>
***************
*** 197,201 ****
<xsd:field xpath="j2ee:message-destination-ref-name"/>
</xsd:unique>
-
</xsd:element>
--- 200,203 ----
***************
*** 204,216 ****
<xsd:complexType name="application-clientType">
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="env-entry"
type="j2ee:env-entryType"
--- 206,210 ----
<xsd:complexType name="application-clientType">
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="env-entry"
type="j2ee:env-entryType"
***************
*** 219,222 ****
--- 213,217 ----
type="j2ee:ejb-refType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:service-refGroup"/>
<xsd:element name="resource-ref"
type="j2ee:resource-refType"
***************
*** 254,258 ****
minOccurs="0"
maxOccurs="unbounded"/>
-
</xsd:sequence>
--- 249,252 ----
***************
*** 270,274 ****
</xsd:attribute>
!
</xsd:complexType>
--- 264,268 ----
</xsd:attribute>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
Index: application_1_4.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/application_1_4.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** application_1_4.xsd 31 Jan 2003 12:17:34 -0000 1.1
--- application_1_4.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 9,13 ****
<xsd:annotation>
<xsd:documentation>
! @(#)application_1_4.xsds 1.6 08/09/02
</xsd:documentation>
</xsd:annotation>
--- 9,13 ----
<xsd:annotation>
<xsd:documentation>
! @(#)application_1_4.xsds 1.11 09/30/02
</xsd:documentation>
</xsd:annotation>
***************
*** 50,70 ****
<xsd:annotation>
<xsd:documentation>
This is the XML Schema for the application 1.4 deployment
! descriptor. All application deployment descriptors must
! indicate that the schema by using the J2EE namespace
http://java.sun.com/xml/ns/j2ee
! and by indicating the version of the schema by
using the version element as shown below:
<application xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
! version="1.4">
!
! ...
</application>
--- 50,72 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
This is the XML Schema for the application 1.4 deployment
! descriptor. The deployment descriptor must be named
! "META-INF/application.xml" in the application's ear file.
! All application deployment descriptors must indicate
! the application schema by using the J2EE namespace:
http://java.sun.com/xml/ns/j2ee
! and indicate the version of the schema by
using the version element as shown below:
<application xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
! version="1.4">
! ...
</application>
***************
*** 75,78 ****
--- 77,81 ----
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 153,165 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="module"
type="j2ee:moduleType"
--- 156,160 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="module"
type="j2ee:moduleType"
***************
*** 198,201 ****
--- 193,197 ----
</xsd:attribute>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 281,284 ****
--- 277,281 ----
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 324,327 ****
--- 321,325 ----
maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
Index: connector_1_5.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/connector_1_5.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** connector_1_5.xsd 31 Jan 2003 12:17:35 -0000 1.1
--- connector_1_5.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 9,13 ****
<xsd:annotation>
<xsd:documentation>
! @(#)connector_1_5.xsds 1.16 07/06/02
</xsd:documentation>
</xsd:annotation>
--- 9,13 ----
<xsd:annotation>
<xsd:documentation>
! @(#)connector_1_5.xsds 1.21 09/30/02
</xsd:documentation>
</xsd:annotation>
***************
*** 50,58 ****
<xsd:annotation>
<xsd:documentation>
This is the XML Schema for the Connector 1.5 deployment
! descriptor. All Connector deployment descriptors must
! indicate the connector resource adapter schema by using the
! J2EE namespace:
http://java.sun.com/xml/ns/j2ee
--- 50,60 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
This is the XML Schema for the Connector 1.5 deployment
! descriptor. The deployment descriptor must be named
! "META-INF/ra.xml" in the connector's rar file. All Connector
! deployment descriptors must indicate the connector resource
! adapter schema by using the J2EE namespace:
http://java.sun.com/xml/ns/j2ee
***************
*** 62,70 ****
<connector xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
! version="1.5">
! ...
</connector>
--- 64,72 ----
<connector xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
! version="1.5">
! ...
</connector>
***************
*** 75,78 ****
--- 77,81 ----
http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 96,100 ****
</xsd:annotation>
! <include schemaLocation="j2ee_1_4.xsd"/>
--- 99,103 ----
</xsd:annotation>
! <xsd:include schemaLocation="j2ee_1_4.xsd"/>
***************
*** 139,142 ****
--- 142,146 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element activationspec-class specifies the fully
***************
*** 151,154 ****
--- 155,159 ----
</activationspec-class>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 159,163 ****
maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
--- 164,168 ----
maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 183,186 ****
--- 188,192 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element adminobject-interface specifies the
***************
*** 188,195 ****
interface implemented by an administered object.
! Example:
! <adminobject-interface>javax.jms.Destination
! </adminobject-interface>
</xsd:documentation>
</xsd:annotation>
--- 194,202 ----
interface implemented by an administered object.
! Example:
! <adminobject-interface>javax.jms.Destination
! </adminobject-interface>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 200,203 ****
--- 207,211 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element adminobject-class specifies the fully
***************
*** 208,211 ****
--- 216,220 ----
</adminobject-class>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 217,221 ****
maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
--- 226,230 ----
maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 248,254 ****
maxOccurs="unbounded"/>
<xsd:element name="authentication-mechanism-type"
! type="xsd:string">
<xsd:annotation>
<xsd:documentation>
The element authentication-mechanism-type specifies
--- 257,264 ----
maxOccurs="unbounded"/>
<xsd:element name="authentication-mechanism-type"
! type="j2ee:xsdStringType">
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element authentication-mechanism-type specifies
***************
*** 266,269 ****
--- 276,280 ----
scope of the Connector architecture specification.
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 273,284 ****
type="j2ee:credential-interfaceType"/>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="config-property-nameType">
<xsd:annotation>
<xsd:documentation>
The config-property-nameType contains the name of a
--- 284,296 ----
type="j2ee:credential-interfaceType"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="config-property-nameType">
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The config-property-nameType contains the name of a
***************
*** 308,322 ****
Example: <config-property-name>ServerName</config-property-name>
</xsd:documentation>
</xsd:annotation>
! <xsd:restriction base="xsd:string">
! </xsd:restriction>
! </xsd:simpleType>
<!-- **************************************************** -->
! <xsd:simpleType name="config-property-typeType">
<xsd:annotation>
<xsd:documentation>
The config-property-typeType contains the fully
--- 320,337 ----
Example: <config-property-name>ServerName</config-property-name>
+ ]]>
</xsd:documentation>
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:xsdStringType"/>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="config-property-typeType">
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The config-property-typeType contains the fully
***************
*** 333,350 ****
<config-property-type>java.lang.String</config-property-type>
</xsd:documentation>
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="java.lang.Boolean"/>
! <xsd:enumeration value="java.lang.String"/>
! <xsd:enumeration value="java.lang.Integer"/>
! <xsd:enumeration value="java.lang.Double"/>
! <xsd:enumeration value="java.lang.Byte"/>
! <xsd:enumeration value="java.lang.Short"/>
! <xsd:enumeration value="java.lang.Long"/>
! <xsd:enumeration value="java.lang.Float"/>
! <xsd:enumeration value="java.lang.Character"/>
! </xsd:restriction>
! </xsd:simpleType>
<!-- **************************************************** -->
--- 348,368 ----
<config-property-type>java.lang.String</config-property-type>
+ ]]>
</xsd:documentation>
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="java.lang.Boolean"/>
! <xsd:enumeration value="java.lang.String"/>
! <xsd:enumeration value="java.lang.Integer"/>
! <xsd:enumeration value="java.lang.Double"/>
! <xsd:enumeration value="java.lang.Byte"/>
! <xsd:enumeration value="java.lang.Short"/>
! <xsd:enumeration value="java.lang.Long"/>
! <xsd:enumeration value="java.lang.Float"/>
! <xsd:enumeration value="java.lang.Character"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 379,386 ****
type="j2ee:config-property-typeType"/>
<xsd:element name="config-property-value"
! type="xsd:string"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
The element config-property-value contains the value
--- 397,405 ----
type="j2ee:config-property-typeType"/>
<xsd:element name="config-property-value"
! type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element config-property-value contains the value
***************
*** 392,400 ****
<config-property-value>WombatServer</config-property-value>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 411,420 ----
<config-property-value>WombatServer</config-property-value>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 419,422 ****
--- 439,443 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element managedconnectionfactory-class specifies
***************
*** 434,437 ****
--- 455,459 ----
</managedconnectionfactory-class>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 445,448 ****
--- 467,471 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element connectionfactory-interface specifies
***************
*** 459,462 ****
--- 482,486 ----
</connectionfactory-interface>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 467,470 ****
--- 491,495 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element connectionfactory-impl-class specifies
***************
*** 478,481 ****
--- 503,507 ----
</connectionfactory-impl-class>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 485,488 ****
--- 511,515 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The connection-interface element specifies the fully
***************
*** 495,498 ****
--- 522,526 ----
</connection-interface>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 502,505 ****
--- 530,534 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The connection-impl-classType specifies the fully
***************
*** 514,522 ****
</connection-impl-class>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 543,552 ----
</connection-impl-class>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 533,548 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0"
! maxOccurs="unbounded"/>
<xsd:element name="vendor-name">
<xsd:annotation>
--- 563,567 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="vendor-name">
<xsd:annotation>
***************
*** 556,560 ****
</xsd:element>
<xsd:element name="eis-type"
! type="xsd:string">
<xsd:annotation>
<xsd:documentation>
--- 575,579 ----
</xsd:element>
<xsd:element name="eis-type"
! type="j2ee:xsdStringType">
<xsd:annotation>
<xsd:documentation>
***************
*** 572,576 ****
</xsd:element>
<xsd:element name="resourceadapter-version"
! type="xsd:string">
<xsd:annotation>
<xsd:documentation>
--- 591,595 ----
</xsd:element>
<xsd:element name="resourceadapter-version"
! type="j2ee:xsdStringType">
<xsd:annotation>
<xsd:documentation>
***************
*** 622,631 ****
</xsd:annotation>
</xsd:attribute>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="credential-interfaceType">
<xsd:annotation>
<xsd:documentation>
--- 641,650 ----
</xsd:annotation>
</xsd:attribute>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="credential-interfaceType">
<xsd:annotation>
<xsd:documentation>
***************
*** 648,662 ****
</xsd:documentation>
</xsd:annotation>
!
! <xsd:restriction base="j2ee:fully-qualified-classType">
! <xsd:enumeration
! value="javax.resource.spi.security.PasswordCredential"/>
! <xsd:enumeration
! value="org.ietf.jgss.GSSCredential"/>
! <xsd:enumeration
! value="javax.resource.spi.security.GenericCredential"/>
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 667,681 ----
</xsd:documentation>
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:fully-qualified-classType">
! <xsd:enumeration
! value="javax.resource.spi.security.PasswordCredential"/>
! <xsd:enumeration
! value="org.ietf.jgss.GSSCredential"/>
! <xsd:enumeration
! value="javax.resource.spi.security.GenericCredential"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 693,697 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 712,716 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 731,734 ****
--- 750,754 ----
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 753,757 ****
maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
--- 773,777 ----
maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 776,779 ****
--- 796,800 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The element messagelistener-type specifies the fully
***************
*** 786,789 ****
--- 807,811 ----
</messagelistener-type>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 793,797 ****
type="j2ee:activationspecType"/>
</xsd:sequence>
!
</xsd:complexType>
--- 815,819 ----
type="j2ee:activationspecType"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 852,856 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 874,878 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 860,863 ****
--- 882,886 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
The required-config-propertyType contains a declaration
***************
*** 870,873 ****
--- 893,897 ----
<required-config-property>Destination</required-config-property>
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 881,885 ****
type="j2ee:config-property-nameType"/>
</xsd:sequence>
!
</xsd:complexType>
--- 905,909 ----
type="j2ee:config-property-nameType"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 926,930 ****
<xsd:element name="outbound-resourceadapter"
type="j2ee:outbound-resourceadapterType"
! minOccurs="0"/>
<xsd:element name="inbound-resourceadapter"
type="j2ee:inbound-resourceadapterType"
--- 950,968 ----
<xsd:element name="outbound-resourceadapter"
type="j2ee:outbound-resourceadapterType"
! minOccurs="0">
! <xsd:unique name="connectionfactory-interface-uniqueness">
! <xsd:annotation>
! <xsd:documentation>
!
! The connectionfactory-interface element content must be
! unique in the outbound-resourceadapter. Multiple connection-definitions
! can not use the same connectionfactory-type.
!
! </xsd:documentation>
! </xsd:annotation>
! <xsd:selector xpath="j2ee:connection-definition"/>
! <xsd:field xpath="j2ee:connectionfactory-interface"/>
! </xsd:unique>
! </xsd:element>
<xsd:element name="inbound-resourceadapter"
type="j2ee:inbound-resourceadapterType"
***************
*** 935,939 ****
maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
--- 973,977 ----
maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 963,967 ****
maxOccurs="unbounded"/>
<xsd:element name="security-permission-spec"
! type="xsd:string">
<xsd:annotation>
<xsd:documentation>
--- 1001,1005 ----
maxOccurs="unbounded"/>
<xsd:element name="security-permission-spec"
! type="j2ee:xsdStringType">
<xsd:annotation>
<xsd:documentation>
***************
*** 978,987 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="transaction-supportType">
<xsd:annotation>
<xsd:documentation>
--- 1016,1025 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="transaction-supportType">
<xsd:annotation>
<xsd:documentation>
***************
*** 999,1010 ****
</xsd:documentation>
</xsd:annotation>
!
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="NoTransaction"/>
! <xsd:enumeration value="LocalTransaction"/>
! <xsd:enumeration value="XATransaction"/>
! </xsd:restriction>
!
! </xsd:simpleType>
</xsd:schema>
--- 1037,1048 ----
</xsd:documentation>
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="NoTransaction"/>
! <xsd:enumeration value="LocalTransaction"/>
! <xsd:enumeration value="XATransaction"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
</xsd:schema>
Index: ejb-jar_2_1.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/ejb-jar_2_1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ejb-jar_2_1.xsd 31 Jan 2003 12:17:35 -0000 1.1
--- ejb-jar_2_1.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 1,5 ****
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:ns="http://www.w3.org/XML/1998/namespace";
targetNamespace="http://java.sun.com/xml/ns/j2ee";
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";
--- 1,4 ----
***************
*** 10,14 ****
<xsd:annotation>
<xsd:documentation>
[...1185 lines suppressed...]
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="Bean"/>
! <xsd:enumeration value="Container"/>
! </xsd:restriction>
!
! </xsd:simpleType>
</xsd:schema>
--- 2256,2266 ----
</xsd:documentation>
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="Bean"/>
! <xsd:enumeration value="Container"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
</xsd:schema>
Index: j2ee_1_4.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/j2ee_1_4.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** j2ee_1_4.xsd 31 Jan 2003 12:17:35 -0000 1.1
--- j2ee_1_4.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 1,9 ****
<?xml version="1.0" encoding="UTF-8"?>
- <!--Generated by Umit Yalcinalp March 2002-->
<xsd:schema
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"
--- 1,7 ----
[...1449 lines suppressed...]
! </xsd:complexType>
!
! <!-- **************************************************** -->
!
! <xsd:complexType name="xsdStringType">
! <xsd:annotation>
! <xsd:documentation>
!
! This type adds an "id" attribute to xsd:string.
!
! </xsd:documentation>
! </xsd:annotation>
! <xsd:simpleContent>
! <xsd:extension base="xsd:string">
! <xsd:attribute name="id" type="xsd:ID"/>
! </xsd:extension>
! </xsd:simpleContent>
! </xsd:complexType>
</xsd:schema>
Index: jsp_2_0.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/jsp_2_0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jsp_2_0.xsd 31 Jan 2003 12:17:35 -0000 1.1
--- jsp_2_0.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 9,13 ****
<xsd:annotation>
<xsd:documentation>
! @(#)jsp_2_0.xsds 1.10 08/20/02
</xsd:documentation>
</xsd:annotation>
--- 9,13 ----
<xsd:annotation>
<xsd:documentation>
! @(#)jsp_2_0.xsds 1.14 11/06/02
</xsd:documentation>
</xsd:annotation>
***************
*** 106,115 ****
maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="jsp-fileType">
<xsd:annotation>
<xsd:documentation>
--- 106,115 ----
maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="jsp-fileType">
<xsd:annotation>
<xsd:documentation>
***************
*** 121,127 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:pathType"/>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 121,128 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:pathType"/>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 146,159 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"
maxOccurs="unbounded"/>
! <xsd:element name="el-enabled"
type="j2ee:true-falseType"
minOccurs="0">
--- 147,155 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"
maxOccurs="unbounded"/>
! <xsd:element name="el-ignored"
type="j2ee:true-falseType"
minOccurs="0">
***************
*** 161,168 ****
<xsd:documentation>
! Can be used to easily set the isELEnabled
property of a group of JSP pages. By default, the
EL evaluation is enabled for Web Applications using
! a Servlet 2.4 or greater web.xml.
</xsd:documentation>
--- 157,165 ----
<xsd:documentation>
! Can be used to easily set the isELIgnored
property of a group of JSP pages. By default, the
EL evaluation is enabled for Web Applications using
! a Servlet 2.4 or greater web.xml, and disabled
! otherwise.
</xsd:documentation>
***************
*** 176,190 ****
The valid values of page-encoding are those of the
! pageEncoding page directive. It is a
! translation-time error to define the pageEncoding
! of a JSP page through one value in the JSP
! configuration element and then give it a different
! value in a pageEncoding directive, but it is legal
! to give it the same value.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
! <xsd:element name="scripting-enabled"
type="j2ee:true-falseType"
minOccurs="0">
--- 173,190 ----
The valid values of page-encoding are those of the
! pageEncoding page directive. It is a
! translation-time error to name different encodings
! in the pageEncoding attribute of the page directive
! of a JSP page and in a JSP configuration element
! matching the page. It is also a translation-time
! error to name different encodings in the prolog of
! a document in XML syntax and in a JSP configuration
! element matching the document. It is legal to name
! the same encoding through mulitple mechanisms.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
! <xsd:element name="scripting-invalid"
type="j2ee:true-falseType"
minOccurs="0">
***************
*** 192,198 ****
<xsd:documentation>
! Can be used to easily set the isScriptingEnabled
! property of a group of JSP pages. By default,
! scripting is enabled.
</xsd:documentation>
--- 192,198 ----
<xsd:documentation>
! Can be used to easily disable scripting in a
! group of JSP pages. By default, scripting is
! enabled.
</xsd:documentation>
***************
*** 250,254 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 250,254 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 298,302 ****
</xsd:sequence>
!
</xsd:complexType>
--- 298,302 ----
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
Index: web-app_2_4.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/web-app_2_4.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** web-app_2_4.xsd 31 Jan 2003 12:17:35 -0000 1.1
--- web-app_2_4.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 9,13 ****
<xsd:annotation>
<xsd:documentation>
! @(#)web-app_2_4.xsds 1.34 02/08/01
</xsd:documentation>
</xsd:annotation>
--- 9,13 ----
<xsd:annotation>
<xsd:documentation>
! @(#)web-app_2_4.xsds 1.46 02/10/30
</xsd:documentation>
</xsd:annotation>
***************
*** 50,57 ****
<xsd:annotation>
<xsd:documentation>
! This is the XML Schema for the Servlet 2.4 deployment
! descriptor. All Servlet deployment descriptors must
! indicate the web application schema by using the J2EE
namespace:
--- 50,59 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
! This is the XML Schema for the Servlet 2.4 deployment descriptor.
! The deployment descriptor must be named "WEB-INF/web.xml" in the
! web application's war file. All Servlet deployment descriptors
! must indicate the web application schema by using the J2EE
namespace:
***************
*** 62,69 ****
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="..."
! version="2.4">
! ...
</web-app>
--- 64,71 ----
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="..."
! version="2.4">
! ...
</web-app>
***************
*** 74,77 ****
--- 76,80 ----
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 263,267 ****
<xsd:field xpath="j2ee:role-link"/>
</xsd:keyref>
-
</xsd:element>
--- 266,269 ----
***************
*** 297,306 ****
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="auth-methodType">
<xsd:annotation>
<xsd:documentation>
--- 299,308 ----
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="auth-methodType">
<xsd:annotation>
<xsd:documentation>
***************
*** 318,362 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="BASIC"/>
! <xsd:enumeration value="DIGEST"/>
! <xsd:enumeration value="FORM"/>
! <xsd:enumeration value="CLIENT-CERT"/>
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
! <xsd:simpleType name="dispatcherType">
<xsd:annotation>
<xsd:documentation>
! The dispatcher has three legal values, FORWARD and REQUEST
! and INCLUDE. A value of FORWARD means the Filter
! will be applied under RequestDispatcher.forward() calls.
! A value of REQUEST means the Filter will be applied
! under ordinary client calls to the path or servlet. A value of
! INCLUDE means the Filter will be applied under
! RequestDispatcher.include() calls.
! The absence of any dispatcher elements in a
! filter-mapping indicates a default of applying
! filters only under ordinary client calls to the path or servlet.
</xsd:documentation>
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="FORWARD"/>
! <xsd:enumeration value="INCLUDE"/>
! <xsd:enumeration value="REQUEST"/>
!
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
! <xsd:simpleType name="error-codeType">
<xsd:annotation>
<xsd:documentation>
--- 320,366 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="BASIC"/>
! <xsd:enumeration value="DIGEST"/>
! <xsd:enumeration value="FORM"/>
! <xsd:enumeration value="CLIENT-CERT"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="dispatcherType">
<xsd:annotation>
<xsd:documentation>
! The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
! and ERROR. A value of FORWARD means the Filter will be applied
! under RequestDispatcher.forward() calls. A value of REQUEST
! means the Filter will be applied under ordinary client calls to
! the path or servlet. A value of INCLUDE means the Filter will be
! applied under RequestDispatcher.include() calls. A value of
! ERROR means the Filter will be applied under the error page
! mechanism. The absence of any dispatcher elements in a
! filter-mapping indicates a default of applying filters only under
! ordinary client calls to the path or servlet.
</xsd:documentation>
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="FORWARD"/>
! <xsd:enumeration value="INCLUDE"/>
! <xsd:enumeration value="REQUEST"/>
! <xsd:enumeration value="ERROR"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="error-codeType">
<xsd:annotation>
<xsd:documentation>
***************
*** 369,375 ****
</xsd:annotation>
! <xsd:restriction base="positiveInteger"/>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 373,382 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:xsdPositiveIntegerType">
! <xsd:attribute name="id" type="xsd:ID"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 389,393 ****
<xsd:sequence>
! <choice>
<xsd:element name="error-code"
type="j2ee:error-codeType"/>
--- 396,400 ----
<xsd:sequence>
! <xsd:choice>
<xsd:element name="error-code"
type="j2ee:error-codeType"/>
***************
*** 404,408 ****
</xsd:annotation>
</xsd:element>
! </choice>
<xsd:element name="location"
--- 411,415 ----
</xsd:annotation>
</xsd:element>
! </xsd:choice>
<xsd:element name="location"
***************
*** 420,424 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 427,431 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 451,470 ****
<xsd:element name="filter-name"
type="j2ee:filter-nameType"/>
! <choice>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"/>
<xsd:element name="servlet-name"
type="j2ee:servlet-nameType"/>
! </choice>
<xsd:element name="dispatcher"
type="j2ee:dispatcherType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="filter-nameType">
<xsd:annotation>
<xsd:documentation>
--- 458,477 ----
<xsd:element name="filter-name"
type="j2ee:filter-nameType"/>
! <xsd:choice>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"/>
<xsd:element name="servlet-name"
type="j2ee:servlet-nameType"/>
! </xsd:choice>
<xsd:element name="dispatcher"
type="j2ee:dispatcherType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="filter-nameType">
<xsd:annotation>
<xsd:documentation>
***************
*** 480,486 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string"/>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 487,494 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string"/>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 503,516 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0"
! maxOccurs="unbounded"/>
<xsd:element name="filter-name"
type="j2ee:filter-nameType"/>
--- 511,515 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="filter-name"
type="j2ee:filter-nameType"/>
***************
*** 539,543 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 538,542 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 589,598 ****
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="http-methodType">
<xsd:annotation>
--- 588,597 ----
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="http-methodType">
<xsd:annotation>
***************
*** 604,618 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="GET"/>
! <xsd:enumeration value="POST"/>
! <xsd:enumeration value="PUT"/>
! <xsd:enumeration value="DELETE"/>
! <xsd:enumeration value="HEAD"/>
! <xsd:enumeration value="OPTIONS"/>
! <xsd:enumeration value="TRACE"/>
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 603,618 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="GET"/>
! <xsd:enumeration value="POST"/>
! <xsd:enumeration value="PUT"/>
! <xsd:enumeration value="DELETE"/>
! <xsd:enumeration value="HEAD"/>
! <xsd:enumeration value="OPTIONS"/>
! <xsd:enumeration value="TRACE"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 631,646 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0"
! maxOccurs="unbounded"/>
<xsd:element name="listener-class"
type="j2ee:fully-qualified-classType">
--- 631,635 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="listener-class"
type="j2ee:fully-qualified-classType">
***************
*** 657,661 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 646,650 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 672,680 ****
</xsd:annotation>
! <xsd:sequence>
! <xsd:element name="locale-encoding-mapping"
! type="j2ee:locale-encoding-mappingType"
! maxOccurs="unbounded"/>
! </xsd:sequence>
</xsd:complexType>
--- 661,670 ----
</xsd:annotation>
! <xsd:sequence>
! <xsd:element name="locale-encoding-mapping"
! type="j2ee:locale-encoding-mappingType"
! maxOccurs="unbounded"/>
! </xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 693,702 ****
</xsd:annotation>
! <xsd:sequence>
! <xsd:element name="locale"
! type="j2ee:string"/>
! <xsd:element name="encoding"
! type="j2ee:string"/>
! </xsd:sequence>
</xsd:complexType>
--- 683,693 ----
</xsd:annotation>
! <xsd:sequence>
! <xsd:element name="locale"
! type="j2ee:string"/>
! <xsd:element name="encoding"
! type="j2ee:string"/>
! </xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 736,740 ****
minOccurs="0"/>
</xsd:sequence>
!
</xsd:complexType>
--- 727,731 ----
minOccurs="0"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 768,777 ****
type="j2ee:mime-typeType"/>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="mime-typeType">
<xsd:annotation>
<xsd:documentation>
--- 759,768 ----
type="j2ee:mime-typeType"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="mime-typeType">
<xsd:annotation>
<xsd:documentation>
***************
*** 787,795 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 778,787 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 823,827 ****
minOccurs="0"/>
</xsd:sequence>
!
</xsd:complexType>
--- 815,819 ----
minOccurs="0"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 846,855 ****
type="j2ee:url-patternType"/>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="servlet-nameType">
<xsd:annotation>
<xsd:documentation>
--- 838,847 ----
type="j2ee:url-patternType"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="servlet-nameType">
<xsd:annotation>
<xsd:documentation>
***************
*** 862,868 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string"/>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 854,861 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string"/>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 884,900 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0"
! maxOccurs="unbounded"/>
<xsd:element name="servlet-name"
type="j2ee:servlet-nameType"/>
! <choice>
<xsd:element name="servlet-class"
type="j2ee:fully-qualified-classType">
--- 877,884 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="servlet-name"
type="j2ee:servlet-nameType"/>
! <xsd:choice>
<xsd:element name="servlet-class"
type="j2ee:fully-qualified-classType">
***************
*** 912,916 ****
type="j2ee:jsp-fileType"/>
! </choice>
<xsd:element name="init-param"
--- 896,900 ----
type="j2ee:jsp-fileType"/>
! </xsd:choice>
<xsd:element name="init-param"
***************
*** 918,922 ****
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="load-on-startup"
! type="xsd:integer"
minOccurs="0">
<xsd:annotation>
--- 902,906 ----
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="load-on-startup"
! type="j2ee:xsdIntegerType"
minOccurs="0">
<xsd:annotation>
***************
*** 953,956 ****
--- 937,941 ----
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 971,976 ****
<xsd:sequence>
<xsd:element name="session-timeout"
! type="xsd:nonNegativeInteger"
! minOccurs="0">
<xsd:annotation>
<xsd:documentation>
--- 956,961 ----
<xsd:sequence>
<xsd:element name="session-timeout"
! type="j2ee:xsdNonNegativeIntegerType"
! minOccurs="0">
<xsd:annotation>
<xsd:documentation>
***************
*** 989,998 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="transport-guaranteeType">
<xsd:annotation>
<xsd:documentation>
--- 974,983 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="transport-guaranteeType">
<xsd:annotation>
<xsd:documentation>
***************
*** 1016,1026 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="NONE"/>
! <xsd:enumeration value="INTEGRAL"/>
! <xsd:enumeration value="CONFIDENTIAL"/>
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 1001,1012 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="NONE"/>
! <xsd:enumeration value="INTEGRAL"/>
! <xsd:enumeration value="CONFIDENTIAL"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 1047,1051 ****
--- 1033,1056 ----
type="j2ee:transport-guaranteeType"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <!-- **************************************************** -->
+
+ <xsd:complexType name="war-pathType">
+ <xsd:annotation>
+ <xsd:documentation>
+ The elements that use this type designate a path starting
+ with a "/" and interpreted relative to the root of a WAR
+ file.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:pattern value="/.*"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
</xsd:complexType>
***************
*** 1060,1077 ****
version of the web application.
- Example:
-
- <web-app>
- <version>2.4</version>
- ...
- </web-app>
-
</xsd:documentation>
</xsd:annotation>
!
! <xsd:restriction base="j2ee:string">
<xsd:enumeration value="2.4"/>
</xsd:restriction>
-
</xsd:simpleType>
--- 1065,1073 ----
version of the web application.
</xsd:documentation>
</xsd:annotation>
! <xsd:restriction base="xsd:token">
<xsd:enumeration value="2.4"/>
</xsd:restriction>
</xsd:simpleType>
***************
*** 1081,1096 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0"
! maxOccurs="unbounded"/>
<xsd:element name="distributable"
type="j2ee:emptyType"
--- 1077,1081 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="distributable"
type="j2ee:emptyType"
***************
*** 1146,1161 ****
type="j2ee:jsp-configType"
minOccurs="0"/>
- <xsd:element name="resource-env-ref"
- type="j2ee:resource-env-refType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="message-destination-ref"
- type="j2ee:message-destination-refType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="resource-ref"
- type="j2ee:resource-refType"
- minOccurs="0"
- maxOccurs="unbounded"/>
<xsd:element name="security-constraint"
type="j2ee:security-constraintType"
--- 1131,1134 ----
***************
*** 1169,1184 ****
minOccurs="0"
maxOccurs="unbounded"/>
! <xsd:element name="env-entry"
! type="j2ee:env-entryType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="ejb-ref"
! type="j2ee:ejb-refType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="ejb-local-ref"
! type="j2ee:ejb-local-refType"
! minOccurs="0"
! maxOccurs="unbounded"/>
<xsd:element name="message-destination"
type="j2ee:message-destinationType"
--- 1142,1146 ----
minOccurs="0"
maxOccurs="unbounded"/>
! <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
<xsd:element name="message-destination"
type="j2ee:message-destinationType"
***************
*** 1198,1202 ****
type="j2ee:web-app-versionType"
use="required"/>
!
</xsd:complexType>
--- 1160,1164 ----
type="j2ee:web-app-versionType"
use="required"/>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 1241,1245 ****
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
!
</xsd:complexType>
--- 1203,1207 ----
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 1272,1276 ****
</xsd:element>
</xsd:sequence>
!
</xsd:complexType>
--- 1234,1238 ----
</xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
Index: web-jsptaglibrary_2_0.xsd
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/plugins/ejb-jar/src/xsd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** web-jsptaglibrary_2_0.xsd 31 Jan 2003 12:17:35 -0000 1.1
--- web-jsptaglibrary_2_0.xsd 18 Feb 2003 00:28:59 -0000 1.2
***************
*** 11,15 ****
<xsd:annotation>
<xsd:documentation>
! @(#)web-jsptaglibrary_2_0.xsds 1.14 08/14/02
</xsd:documentation>
</xsd:annotation>
--- 11,15 ----
<xsd:annotation>
<xsd:documentation>
! @(#)web-jsptaglibrary_2_0.xsds 1.24 11/01/02
</xsd:documentation>
</xsd:annotation>
***************
*** 51,54 ****
--- 51,55 ----
<xsd:annotation>
<xsd:documentation>
+ <![CDATA[
This is the XML Schema for the JSP Taglibrary deployment
***************
*** 63,70 ****
<taglib xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="..."
! version="2.0">
! ...
</taglib>
--- 64,71 ----
<taglib xmlns="http://java.sun.com/xml/ns/j2ee";
! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
! xsi:schemaLocation="..."
! version="2.0">
! ...
</taglib>
***************
*** 75,78 ****
--- 76,80 ----
http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
+ ]]>
</xsd:documentation>
</xsd:annotation>
***************
*** 138,142 ****
<!-- **************************************************** -->
! <xsd:simpleType name="body-contentType">
<xsd:annotation>
<xsd:documentation>
--- 140,144 ----
<!-- **************************************************** -->
! <xsd:complexType name="body-contentType">
<xsd:annotation>
<xsd:documentation>
***************
*** 164,178 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="tagdependent"/>
! <xsd:enumeration value="TAGDEPENDENT"/>
! <xsd:enumeration value="JSP"/>
! <xsd:enumeration value="empty"/>
! <xsd:enumeration value="EMPTY"/>
! <xsd:enumeration value="scriptless"/>
! <xsd:enumeration value="SCRIPTLESS"/>
! </xsd:restriction>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 166,181 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="tagdependent"/>
! <xsd:enumeration value="TAGDEPENDENT"/>
! <xsd:enumeration value="JSP"/>
! <xsd:enumeration value="empty"/>
! <xsd:enumeration value="EMPTY"/>
! <xsd:enumeration value="scriptless"/>
! <xsd:enumeration value="SCRIPTLESS"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 212,224 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType">
--- 215,219 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType">
***************
*** 245,249 ****
</xsd:element>
<xsd:element name="function-signature"
! type="xsd:string">
<xsd:annotation>
<xsd:documentation>
--- 240,244 ----
</xsd:element>
<xsd:element name="function-signature"
! type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
***************
*** 262,266 ****
</xsd:element>
<xsd:element name="example"
! type="xsd:string"
minOccurs="0">
<xsd:annotation>
--- 257,261 ----
</xsd:element>
<xsd:element name="example"
! type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
***************
*** 275,278 ****
--- 270,274 ----
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 304,307 ****
--- 300,304 ----
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 322,326 ****
action, relative to the root of the web application or
the root of the JAR file for a tag library packaged in
! a JAR.
</xsd:documentation>
--- 319,325 ----
action, relative to the root of the web application or
the root of the JAR file for a tag library packaged in
! a JAR. This must begin with /WEB-INF/tags if the .tag
! file resides in the WAR, or /META-INF/tags if the .tag
! file resides in a JAR.
</xsd:documentation>
***************
*** 333,336 ****
--- 332,336 ----
type="j2ee:pathType"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 386,398 ****
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType"/>
--- 386,390 ----
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType"/>
***************
*** 446,450 ****
minOccurs="0"/>
<xsd:element name="example"
! type="xsd:string"
minOccurs="0">
<xsd:annotation>
--- 438,442 ----
minOccurs="0"/>
<xsd:element name="example"
! type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
***************
*** 476,479 ****
--- 468,472 ----
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 523,536 ****
</xsd:annotation>
<xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="display-name"
! type="j2ee:display-nameType"
! minOccurs="0" maxOccurs="unbounded"/>
! <xsd:element name="icon"
! type="j2ee:iconType"
! minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="tlib-version"
type="j2ee:dewey-versionType">
--- 516,520 ----
</xsd:annotation>
<xsd:sequence>
! <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="tlib-version"
type="j2ee:dewey-versionType">
***************
*** 563,567 ****
</xsd:element>
<xsd:element name="uri"
! type="xsd:anyURI"
minOccurs="0">
<xsd:annotation>
--- 547,551 ----
</xsd:element>
<xsd:element name="uri"
! type="j2ee:xsdAnyURIType"
minOccurs="0">
<xsd:annotation>
***************
*** 630,634 ****
</xsd:attribute>
!
</xsd:complexType>
--- 614,618 ----
</xsd:attribute>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
***************
*** 732,740 ****
</xsd:choice>
</xsd:sequence>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="tld-canonical-nameType">
<xsd:annotation>
--- 716,725 ----
</xsd:choice>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="tld-canonical-nameType">
<xsd:annotation>
***************
*** 749,755 ****
</xsd:annotation>
! <xsd:restriction base="xsd:NMTOKEN"/>
!
! </xsd:simpleType>
<!-- **************************************************** -->
--- 734,741 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:xsdNMTOKENType"/>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 766,806 ****
</xsd:annotation>
! <xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="validator-class"
! type="j2ee:fully-qualified-classType">
! <xsd:annotation>
! <xsd:documentation>
! Defines the TagLibraryValidator class that can be used
! to validate the conformance of a JSP page to using this
! tag library.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! <xsd:element name="init-param"
! type="j2ee:param-valueType"
! minOccurs="0" maxOccurs="unbounded">
! <xsd:annotation>
! <xsd:documentation>
! The init-param element contains a name/value pair as an
! initialization param.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! </xsd:sequence>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:simpleType name="variable-scopeType">
<xsd:annotation>
<xsd:documentation>
--- 752,793 ----
</xsd:annotation>
! <xsd:sequence>
! <xsd:element name="description"
! type="j2ee:descriptionType"
! minOccurs="0"
! maxOccurs="unbounded"/>
! <xsd:element name="validator-class"
! type="j2ee:fully-qualified-classType">
! <xsd:annotation>
! <xsd:documentation>
! Defines the TagLibraryValidator class that can be used
! to validate the conformance of a JSP page to using this
! tag library.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! <xsd:element name="init-param"
! type="j2ee:param-valueType"
! minOccurs="0" maxOccurs="unbounded">
! <xsd:annotation>
! <xsd:documentation>
! The init-param element contains a name/value pair as an
! initialization param.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! </xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
! <xsd:complexType name="variable-scopeType">
<xsd:annotation>
<xsd:documentation>
***************
*** 813,822 ****
</xsd:annotation>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="NESTED"/>
! <xsd:enumeration value="AT_BEGIN"/>
! <xsd:enumeration value="AT_END"/>
! </xsd:restriction>
! </xsd:simpleType>
<!-- **************************************************** -->
--- 800,811 ----
</xsd:annotation>
! <xsd:simpleContent>
! <xsd:restriction base="j2ee:string">
! <xsd:enumeration value="NESTED"/>
! <xsd:enumeration value="AT_BEGIN"/>
! <xsd:enumeration value="AT_END"/>
! </xsd:restriction>
! </xsd:simpleContent>
! </xsd:complexType>
<!-- **************************************************** -->
***************
*** 830,834 ****
time) error for a tag that has one or more variable
subelements to have a TagExtraInfo class that returns a
! non-null object.
The subelements of variableType are of the form:
--- 819,823 ----
time) error for a tag that has one or more variable
subelements to have a TagExtraInfo class that returns a
! non-null value from a call to getVariableInfo().
The subelements of variableType are of the form:
***************
*** 854,861 ****
defined. NESTED is default.
- fragment The fragment to which the variable
- is scoped. (incompatible with scope
- attribute)
-
</xsd:documentation>
</xsd:annotation>
--- 843,846 ----
***************
*** 904,954 ****
</xsd:element>
! <xsd:choice>
! <xsd:sequence>
! <xsd:element name="declare"
! type="j2ee:generic-booleanType"
! minOccurs="0">
! <xsd:annotation>
! <xsd:documentation>
!
! Whether the scripting variable is to be defined
! or not. See TagExtraInfo for details. This
! element is optional and "true" is the default.
!
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! <xsd:element name="scope"
! type="j2ee:variable-scopeType"
! minOccurs="0">
! <xsd:annotation>
! <xsd:documentation>
! The element is optional and "NESTED" is the default.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! </xsd:sequence>
! <xsd:element name="fragment"
! type="j2ee:java-identifierType"
! minOccurs="0">
! <xsd:annotation>
! <xsd:documentation>
! Must match the value of a name attribute in an
! attribute element whose fragment attribute is
! set to "true". If so specified, this variable's
! scope is restricted to that fragment invocation.
! If not specified, the default is declare="true"
! and scope="NESTED"
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! </xsd:choice>
</xsd:sequence>
!
</xsd:complexType>
--- 889,919 ----
</xsd:element>
! <xsd:element name="declare"
! type="j2ee:generic-booleanType"
! minOccurs="0">
! <xsd:annotation>
! <xsd:documentation>
! Whether the scripting variable is to be defined
! or not. See TagExtraInfo for details. This
! element is optional and "true" is the default.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
! <xsd:element name="scope"
! type="j2ee:variable-scopeType"
! minOccurs="0">
! <xsd:annotation>
! <xsd:documentation>
! The element is optional and "NESTED" is the default.
! </xsd:documentation>
! </xsd:annotation>
! </xsd:element>
</xsd:sequence>
! <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
