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 2011/10/22 22:55:03 UTC
svn commit: r1187778 [6/6] - in /tomcat/trunk/java/javax: annotation/
annotation/security/ ejb/ el/ persistence/ servlet/ servlet/annotation/
servlet/descriptor/ servlet/http/ servlet/jsp/ servlet/jsp/el/
servlet/jsp/resources/ servlet/jsp/tagext/ serv...
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd Sat Oct 22 20:54:57 2011
@@ -10,7 +10,7 @@
<xsd:documentation>
$Id$
-
+
</xsd:documentation>
</xsd:annotation>
@@ -18,9 +18,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -30,7 +30,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -40,9 +40,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -54,7 +54,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -69,7 +69,7 @@
<xsd:documentation>
(C) Copyright International Business Machines Corporation 2002
-
+
</xsd:documentation>
</xsd:annotation>
@@ -82,17 +82,17 @@
Server and the dependencies they have on container resources and
services. The deployment descriptor must be named
"META-INF/webservices.xml" in the web services' jar file.
-
+
Used in: webservices.xml
-
+
All webservices deployment descriptors must indicate the
webservices schema by using the Java EE namespace:
-
+
http://java.sun.com/xml/ns/javaee
-
+
and by indicating the version of the schema by using the version
element as shown below:
-
+
<webservices xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
@@ -100,13 +100,13 @@
version="1.3">
...
</webservices>
-
+
The instance documents may indicate the published version of the
schema using the xsi:schemaLocation attribute for the Java EE
namespace with the following location:
-
+
http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -116,7 +116,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -125,7 +125,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -143,9 +143,9 @@
deployment descriptor. It specifies the set of web service
descriptions that are to be deployed into the Java EE Application Server
and the dependencies they have on container resources and services.
-
+
Used in: webservices.xml
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:key name="webservice-description-name-key">
@@ -155,7 +155,7 @@
The webservice-description-name identifies the collection of
port-components associated with a WSDL file and JAX-RPC mapping. The
name must be unique within the deployment descriptor.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:webservice-description"/>
@@ -175,10 +175,10 @@
component, optional description, optional display name, optional iconic
representations, WSDL port QName, Service Endpoint Interface, Service
Implementation Bean.
-
+
This element also associates a WSDL service with a JAX-WS Provider
implementation.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -204,13 +204,13 @@
the service implementation bean in the module's deployment
descriptor. The name must be unique among the port component
names defined in the same module.
-
+
Used in: port-component
-
+
Example:
<port-component-name>EmployeeService
</port-component-name>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -225,7 +225,7 @@
Defines the name space and local name part of the WSDL
service QName. This is required to be specified for
port components that are JAX-WS Provider implementations.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -239,7 +239,7 @@
Defines the name space and local name part of the WSDL
port QName. This is not required to be specified for port
components that are JAX-WS Provider implementations
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -252,9 +252,9 @@
Used to enable or disable SOAP MTOM/XOP mechanism for an
endpoint implementation.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -267,9 +267,9 @@
When MTOM is enabled, binary data above this size in bytes
will be XOP encoded or sent as attachment. Default value is 0.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -283,11 +283,11 @@
This specifies the WS-Addressing requirements for a JAX-WS
web service. It corresponds to javax.xml.ws.soap.Addressing
annotation or its feature javax.xml.ws.soap.AddressingFeature.
-
+
See the addressingType for more information.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -303,9 +303,9 @@
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -319,7 +319,7 @@
Used to specify the protocol binding used by the port-component.
If this element is not specified, then the default binding is
used (SOAP 1.1 over HTTP)
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -333,19 +333,19 @@
The service-endpoint-interface element contains the
fully-qualified name of the port component's Service Endpoint
Interface.
-
+
Used in: port-component
-
+
Example:
<remote>com.wombat.empl.EmployeeService</remote>
-
+
This may not be specified in case there is no Service
Enpoint Interface as is the case with directly using an
implementation class with the @WebService annotation.
-
+
When the port component is a Provider implementation
this is not specified.
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -361,7 +361,7 @@
<xsd:documentation>
To be used with JAX-RPC based runtime only.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -373,7 +373,7 @@
<xsd:documentation>
To be used with JAX-WS based runtime only.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -394,9 +394,9 @@
A service implementation can be an EJB bean class or JAX-RPC web
component. Existing EJB implementations are exposed as a web service
using an ejb-link.
-
+
Used in: port-component
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:choice>
@@ -419,15 +419,15 @@
The servlet-link element is used in the service-impl-bean element
to specify that a Service Implementation Bean is defined as a
JAX-RPC Service Endpoint.
-
+
The value of the servlet-link element must be the servlet-name of
a JAX-RPC Service Endpoint in the same WAR file.
-
+
Used in: service-impl-bean
-
+
Example:
<servlet-link>StockQuoteService</servlet-link>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -447,12 +447,12 @@
and the set of Port components associated with the WSDL ports
defined in the WSDL document. There may be multiple
webservice-descriptions defined within a module.
-
+
All WSDL file ports must have a corresponding port-component element
defined.
-
+
Used in: webservices
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -476,7 +476,7 @@
The webservice-description-name identifies the collection of
port-components associated with a WSDL file and JAX-RPC
mapping. The name must be unique within the deployment descriptor.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -489,7 +489,7 @@
The wsdl-file element contains the name of a WSDL file in the
module. The file name is a relative path within the module.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -504,9 +504,9 @@
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.
-
+
This is not required when JAX-WS based runtime is used.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -520,7 +520,7 @@
Defines the name of the handler. The name must be unique
within the module.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:handler"/>
@@ -551,9 +551,9 @@
producer to name the service implementation bean in the
module's deployment descriptor. The name must be unique
among the port component names defined in the same module.
-
+
Used in: port-component
-
+
Example:
<port-component-name>EmployeeService
</port-component-name>
@@ -575,7 +575,7 @@
<xsd:documentation>
The required value for the version is 1.3.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd Sat Oct 22 20:54:57 2011
@@ -10,7 +10,7 @@
<xsd:documentation>
$Id$
-
+
</xsd:documentation>
</xsd:annotation>
@@ -18,9 +18,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -30,7 +30,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -40,9 +40,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -54,7 +54,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -69,7 +69,7 @@
<xsd:documentation>
(C) Copyright International Business Machines Corporation 2002
-
+
</xsd:documentation>
</xsd:annotation>
@@ -85,9 +85,9 @@
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
+ 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>
@@ -98,10 +98,10 @@
<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
+ 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>
@@ -111,10 +111,10 @@
<xsd:documentation>
The service-interface element declares the fully qualified class
- name of the JAX-RPC Service interface the client depends on.
+ 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>
@@ -125,18 +125,18 @@
<xsd:annotation>
<xsd:documentation>
- The service-ref-type element declares the type of the service-ref
+ The service-ref-type element declares the type of the service-ref
element that is injected or returned when a JNDI lookup is done.
- This must be either a fully qualified name of Service class or
- the fully qualified name of service endpoint interface class.
- This is only used with JAX-WS runtime where the corresponding
+ This must be either a fully qualified name of Service class or
+ the fully qualified name of service endpoint interface class.
+ This is only used with JAX-WS runtime where the corresponding
@WebServiceRef annotation can be used to denote both a Service
or a Port.
-
- If this is not specified, then the type of service-ref element
- that is injected or returned when a JNDI lookup is done is
+
+ If this is not specified, then the type of service-ref element
+ that is injected or returned when a JNDI lookup is done is
always a Service interface/class.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -149,7 +149,7 @@
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>
@@ -162,11 +162,11 @@
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
+ the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module file.
-
+
This is not required when JAX-WS based runtime is used.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -180,7 +180,7 @@
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>
@@ -196,7 +196,7 @@
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>
@@ -213,9 +213,9 @@
HandlerInfo interface. If port-name is not specified, the
handler is assumed to be associated with all ports of the
service.
-
+
To be used with JAX-RPC based runtime only.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -227,7 +227,7 @@
<xsd:documentation>
To be used with JAX-WS based runtime only.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -250,7 +250,7 @@
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>
@@ -262,7 +262,7 @@
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>
@@ -274,10 +274,10 @@
<xsd:documentation>
Used to enable or disable SOAP MTOM/XOP mechanism on the client
- side for a port-component.
-
+ side for a port-component.
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -290,9 +290,9 @@
When MTOM is enabled, binary data above this size in bytes
should be XOP encoded or sent as attachment. Default value is 0.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -306,11 +306,11 @@
This specifies the WS-Addressing requirements for a JAX-WS
web service. It corresponds to javax.xml.ws.soap.Addressing
annotation or its feature javax.xml.ws.soap.AddressingFeature.
-
+
See the addressingType for more information.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -326,9 +326,9 @@
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -342,13 +342,13 @@
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>
@@ -366,7 +366,7 @@
The handler-chains element defines the handlerchains associated with this
service or service endpoint.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -386,17 +386,17 @@
<xsd:annotation>
<xsd:documentation>
- The handler-chain element defines the handlerchain.
+ The handler-chain element defines the handlerchain.
Handlerchain can be defined such that the handlers in the
handlerchain operate,all ports of a service, on a specific
port or on a list of protocol-bindings. The choice of elements
service-name-pattern, port-name-pattern and protocol-bindings
are used to specify whether the handlers in handler-chain are
- for a service, port or protocol binding. If none of these
+ for a service, port or protocol binding. If none of these
choices are specified with the handler-chain element then the
- handlers specified in the handler-chain will be applied on
+ handlers specified in the handler-chain will be applied on
everything.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -424,9 +424,9 @@
Defines the type used for specifying a list of
protocol-bindingType(s). For e.g.
-
+
##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="javaee:protocol-bindingType"/>
@@ -439,17 +439,17 @@
Defines the type used for specifying the URI for the
protocol binding used by the port-component. For
portability one could use one of the following tokens that
- alias the standard binding types:
-
+ alias the standard binding types:
+
##SOAP11_HTTP
##SOAP11_HTTP_MTOM
##SOAP12_HTTP
##SOAP12_HTTP_MTOM
##XML_HTTP
-
+
Other specifications could define tokens that start with ##
to alias new standard binding URIs that are introduced.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/>
@@ -463,18 +463,18 @@
start with ## which are used to alias existing standard
protocol bindings and support aliases for new standard
binding URIs that are introduced in future specifications.
-
+
The following tokens alias the standard protocol binding
URIs:
-
+
##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
- ##SOAP11_HTTP_MTOM =
+ ##SOAP11_HTTP_MTOM =
"http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
- ##SOAP12_HTTP_MTOM =
+ ##SOAP12_HTTP_MTOM =
"http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -489,42 +489,42 @@
This is used to specify the QName pattern in the
attribute service-name-pattern and port-name-pattern in
the handler-chain element
-
+
For example, the various forms acceptable here for
service-name-pattern attribute in handler-chain element
are :
-
+
Exact Name: service-name-pattern="ns1:EchoService"
-
+
In this case, handlers specified in this
handler-chain element will apply to all ports with
this exact service name. The namespace prefix must
have been declared in a namespace declaration
attribute in either the start-tag of the element
- where the prefix is used or in an an ancestor
- element (i.e. an element in whose content the
+ where the prefix is used or in an an ancestor
+ element (i.e. an element in whose content the
prefixed markup occurs)
-
-
+
+
Pattern : service-name-pattern="ns1:EchoService*"
-
+
In this case, handlers specified in this
handler-chain element will apply to all ports whose
Service names are like EchoService1, EchoServiceFoo
etc. The namespace prefix must have been declared in
a namespace declaration attribute in either the
start-tag of the element where the prefix is used or
- in an an ancestor element (i.e. an element in whose
+ in an an ancestor element (i.e. an element in whose
content the prefixed markup occurs)
-
+
Wild Card : service-name-pattern="*"
-
+
In this case, handlers specified in this handler-chain
element will apply to ports of all service names.
-
+
The same can be applied to port-name attribute in
handler-chain element.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -542,26 +542,26 @@
This specifies the WS-Addressing requirements for a JAX-WS web service.
It corresponds to javax.xml.ws.soap.Addressing annotation or its
feature javax.xml.ws.soap.AddressingFeature.
-
+
If the "enabled" element is "true", WS-Addressing is enabled.
It means that the endpoint supports WS-Addressing but does not require
its use. The default value for "enabled" is "true".
-
+
If the WS-Addressing is enabled and the "required" element is "true",
it means that the endpoint requires WS-Addressing. The default value
for "required" is "false".
-
+
If WS-Addressing is enabled, the "responses" element determines
if an endpoint requires the use of only anonymous responses,
or only non-anonymous responses, or all. The value of the "responses"
element must be one of the following:
-
+
ANONYMOUS
NON_ANONYMOUS
ALL
-
+
The default value for the "responses" is ALL.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -590,7 +590,7 @@
If WS-Addressing is enabled, this type determines if an endpoint
requires the use of only anonymous responses, or only non-anonymous
responses, or all.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -614,10 +614,10 @@
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
If the "enabled" element is "true", wsdl:binding in the
associated WSDL, if any, must be respected/honored.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -637,9 +637,9 @@
Declares the handler for a port-component, service-ref. Handlers can
access the init-param name/value pairs using the HandlerInfo interface.
-
+
Used in: port-component, service-ref
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -651,7 +651,7 @@
Defines the name of the handler. The name must be unique within the
module.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -661,7 +661,7 @@
<xsd:documentation>
Defines a fully qualified class name for the handler implementation.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -673,7 +673,7 @@
<xsd:documentation>
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -686,9 +686,9 @@
Defines the QName of a SOAP header that will be processed by the
handler.
-
+
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -701,7 +701,7 @@
The soap-role element contains a SOAP actor definition that the
Handler will play as a role.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -716,9 +716,9 @@
handler should be associated with. If port-name is not
specified, the handler is assumed to be associated with
all ports of the service.
-
+
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -739,7 +739,7 @@
Defines the name of the handler. The name must be unique
within the module.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:handler"/>
Modified: tomcat/trunk/java/javax/servlet/resources/web-app_2_2.dtd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_2_2.dtd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd Sat Oct 22 20:54:57 2011
@@ -29,24 +29,24 @@
<xsd:annotation>
<xsd:documentation>
<![CDATA[
- This is the XML Schema for the Servlet 2.5 deployment descriptor.
-The deployment descriptor must be named "WEB-INF/web.xml" in the
-web application's war file. All Servlet deployment descriptors
-must indicate the web application schema by using the Java EE
-namespace:
-http://java.sun.com/xml/ns/javaee
-and by indicating the version of the schema by
-using the version element as shown below:
- <web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="..."
- version="2.5">
- ...
- </web-app>
-The instance documents may indicate the published version of
-the schema using the xsi:schemaLocation attribute for Java EE
-namespace with the following location:
-http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
+ This is the XML Schema for the Servlet 2.5 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 Java EE
+namespace:
+http://java.sun.com/xml/ns/javaee
+and by indicating the version of the schema by
+using the version element as shown below:
+ <web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="..."
+ version="2.5">
+ ...
+ </web-app>
+The instance documents may indicate the published version of
+the schema using the xsi:schemaLocation attribute for Java EE
+namespace with the following location:
+http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
]]>
</xsd:documentation>
</xsd:annotation>
Modified: tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd Sat Oct 22 20:54:57 2011
@@ -10,7 +10,7 @@
<xsd:documentation>
$Id$
-
+
</xsd:documentation>
</xsd:annotation>
@@ -18,9 +18,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -30,7 +30,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -40,9 +40,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -54,7 +54,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -73,25 +73,25 @@
web application's war file. All Servlet deployment descriptors
must indicate the web application schema by using the Java EE
namespace:
-
- http://java.sun.com/xml/ns/javaee
-
- and by indicating the version of the schema by
- using the version element as shown below:
-
+
+ http://java.sun.com/xml/ns/javaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
- version="3.0">
+ version="3.0">
...
</web-app>
-
+
The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Java EE
namespace with the following location:
-
+
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -101,7 +101,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -110,7 +110,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -137,8 +137,8 @@
must concatenate the element contents. The multiple occurence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
- one distributable.
-
+ one distributable.
+
</xsd:documentation>
</xsd:annotation>
<xsd:unique name="web-common-servlet-name-uniqueness">
@@ -147,7 +147,7 @@
The servlet element contains the name of a servlet.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet"/>
@@ -159,7 +159,7 @@
The filter element contains the name of a filter.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:filter"/>
@@ -174,9 +174,9 @@
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-local-ref"/>
@@ -191,9 +191,9 @@
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-ref"/>
@@ -208,7 +208,7 @@
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-env-ref"/>
@@ -223,7 +223,7 @@
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:message-destination-ref"/>
@@ -237,7 +237,7 @@
resource manager connection factory reference. The name
is a JNDI name relative to the java:comp/env context.
The name must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-ref"/>
@@ -251,7 +251,7 @@
application's environment entry. The name is a JNDI
name relative to the java:comp/env context. The name
must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:env-entry"/>
@@ -263,7 +263,7 @@
A role-name-key is specified to allow the references
from the security-role-refs.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:security-role"/>
@@ -276,7 +276,7 @@
The keyref indicates the references from
security-role-ref to a specified role-name.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
Modified: tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd Sat Oct 22 20:54:57 2011
@@ -10,7 +10,7 @@
<xsd:documentation>
$Id$
-
+
</xsd:documentation>
</xsd:annotation>
@@ -18,9 +18,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -30,7 +30,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -40,9 +40,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -54,7 +54,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -73,25 +73,25 @@
web application's war file. All Servlet deployment descriptors
must indicate the web common schema by using the Java EE
namespace:
-
- http://java.sun.com/xml/ns/javaee
-
- and by indicating the version of the schema by
- using the version element as shown below:
-
+
+ http://java.sun.com/xml/ns/javaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
- version="3.0">
+ version="3.0">
...
</web-app>
-
+
The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Java EE
namespace with the following location:
-
+
http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -101,7 +101,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -110,7 +110,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -131,7 +131,7 @@
The context-param element contains the declaration
of a web application's servlet context
initialization parameters.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -187,17 +187,17 @@
files available to this module and packaged with
this application should be examined for annotations
that specify deployment information.
-
+
If metadata-complete is set to "true", the deployment
tool must ignore any annotations that specify deployment
information, which might be present in the class files
of the application.
-
+
If metadata-complete is not specified or is set to
"false", the deployment tool must examine the class
files of the application for annotations, as
specified by the specifications.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -253,7 +253,7 @@
to the portion of the web application described by the
containing security-constraint. The container matches
role names case sensitively when determining access.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -284,9 +284,9 @@
using the configured mechanism. Legal values are "BASIC",
"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
authentication scheme.
-
+
Used in: login-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -303,7 +303,7 @@
The dispatcher has five legal values: FORWARD, REQUEST,
INCLUDE, ASYNC, 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
@@ -314,11 +314,11 @@
calls dispatched from an AsyncContext.
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>
@@ -340,9 +340,9 @@
<xsd:documentation>
The error-code contains an HTTP error code, ex: 404
-
+
Used in: error-page
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -364,15 +364,15 @@
The error-pageType contains a mapping between an error code
or exception type to the path of a resource in the web
application.
-
+
Error-page declarations using the exception-type element in
the deployment descriptor must be unique up to the class name of
the exception-type. Similarly, error-page declarations using the
status-code element must be unique in the deployment descriptor
up to the status code.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -387,7 +387,7 @@
The exception-type contains a fully qualified class
name of a Java exception type.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -401,7 +401,7 @@
resource in the web application relative to the root of
the web application. The value of the location must have
a leading `/'.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -423,9 +423,9 @@
filter-name value to reference. Filters can access the
initialization parameters declared in the deployment
descriptor at runtime via the FilterConfig interface.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -440,7 +440,7 @@
<xsd:documentation>
The fully qualified classname of the filter.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -456,7 +456,7 @@
The init-param element contains a name/value pair as
an initialization param of a servlet filter
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -473,7 +473,7 @@
<xsd:documentation>
Declaration of the filter mappings in this web
- application is done by using filter-mappingType.
+ application is done by using filter-mappingType.
The container uses the filter-mapping
declarations to decide which filters to apply to a request,
and in what order. The container matches the request URI to
@@ -487,7 +487,7 @@
filter-name value must be the value of the filter-name
sub-elements of one of the filter declarations in the
deployment descriptor.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -518,7 +518,7 @@
This type defines a string which contains at least one
character.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -539,9 +539,9 @@
by using filter-nameType. This name is used to map the
filter. Each filter name is unique within the web
application.
-
+
Used in: filter, filter-mapping
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -559,9 +559,9 @@
The form-login-configType specifies the login and error
pages that should be used in form based login. If form based
authentication is not used, these elements are ignored.
-
+
Used in: login-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -574,7 +574,7 @@
app where the page that can be used for login can be
found. The path begins with a leading / and is interpreted
relative to the root of the WAR.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -585,10 +585,10 @@
The form-error-page element defines the location in
the web app where the error page that is displayed
- when login is not successful can be found.
+ when login is not successful can be found.
The path begins with a leading / and is interpreted
relative to the root of the WAR.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -602,7 +602,7 @@
<xsd:documentation>
A HTTP method type as defined in HTTP 1.1 section 2.2.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -631,9 +631,9 @@
method that should be used, the realm name that should be
used for this application, and the attributes that are
needed by the form login mechanism.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -648,7 +648,7 @@
The realm name element specifies the realm name to
use in HTTP Basic authorization.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -669,9 +669,9 @@
The mime-mappingType defines a mapping between an extension
and a mime type.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -680,7 +680,7 @@
The extension element contains a string describing an
extension. example: "txt"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:element name="extension"
@@ -700,12 +700,12 @@
<xsd:documentation>
The mime-typeType is used to indicate a defined mime type.
-
+
Example:
"text/plain"
-
+
Used in: mime-mapping
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -725,9 +725,9 @@
The security-constraintType is used to associate
security constraints with one or more web resource
collections
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -761,9 +761,9 @@
servlet. If a jsp-file is specified and the load-on-startup
element is present, then the JSP should be precompiled and
loaded.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -779,7 +779,7 @@
The servlet-class element contains the fully
qualified class name of the servlet.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -812,7 +812,7 @@
before servlets marked with higher integers. The
container may choose the order of loading of
servlets with the same load-on-start-up value.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -846,10 +846,10 @@
<xsd:documentation>
The servlet-mappingType defines a mapping between a
- servlet and a url pattern.
-
+ servlet and a url pattern.
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -874,7 +874,7 @@
The servlet-name element contains the canonical name of the
servlet. Each servlet name is unique within the web
application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -891,9 +891,9 @@
The session-configType defines the session parameters
for this web application.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -911,7 +911,7 @@
the default behaviour of sessions is never to time
out. If this element is not specified, the container
must set its default timeout period.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -923,7 +923,7 @@
The cookie-config element defines the configuration of the
session tracking cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -936,7 +936,7 @@
The tracking-mode element defines the tracking modes
for sessions created by this web application
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -954,9 +954,9 @@
The cookie-configType defines the configuration for the
session tracking cookies of this web application.
-
+
Used in: session-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -969,7 +969,7 @@
The name that will be assigned to any session tracking
cookies created by this web application.
The default is JSESSIONID
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -981,7 +981,7 @@
The domain name that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -993,7 +993,7 @@
The path that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1005,7 +1005,7 @@
The comment that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1015,9 +1015,9 @@
<xsd:annotation>
<xsd:documentation>
- Specifies whether any session tracking cookies created
+ Specifies whether any session tracking cookies created
by this web application will be marked as HttpOnly
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1027,11 +1027,11 @@
<xsd:annotation>
<xsd:documentation>
- Specifies whether any session tracking cookies created
+ Specifies whether any session tracking cookies created
by this web application will be marked as secure
even if the request that initiated the corresponding session
is using plain HTTP instead of HTTPS
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1044,7 +1044,7 @@
The lifetime (in seconds) that will be assigned to any
session tracking cookies created by this web application.
Default is -1
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1063,9 +1063,9 @@
The name that will be assigned to any session tracking
cookies created by this web application.
The default is JSESSIONID
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1082,9 +1082,9 @@
The domain name that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1101,9 +1101,9 @@
The path that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1120,9 +1120,9 @@
The comment that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1139,9 +1139,9 @@
The tracking modes for sessions created by this web
application
-
+
Used in: session-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1172,9 +1172,9 @@
transmission. In most cases, the presence of the INTEGRAL or
CONFIDENTIAL flag will indicate that the use of SSL is
required.
-
+
Used in: user-data-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1196,9 +1196,9 @@
The user-data-constraintType is used to indicate how
data communicated between the client and container should be
protected.
-
+
Used in: security-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1223,7 +1223,7 @@
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>
@@ -1240,7 +1240,7 @@
This type contains the recognized versions of
web-application supported. It is used to designate the
version of the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -1263,10 +1263,10 @@
elements, the security constraint applies to all methods
except those identified in the collection.
http-method-omission and http-method elements are never
- mixed in the same collection.
-
+ mixed in the same collection.
+
Used in: security-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1277,7 +1277,7 @@
The web-resource-name contains the name of this web
resource collection.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1299,7 +1299,7 @@
Each http-method names an HTTP method to which the
constraint applies.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1312,7 +1312,7 @@
Each http-method-omission names an HTTP method to
which the constraint does not apply.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1331,9 +1331,9 @@
The welcome-file-list contains an ordered list of welcome
files elements.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1345,7 +1345,7 @@
The welcome-file element contains file name to use
as a default welcome file, such as index.html
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1360,7 +1360,7 @@
The localeType defines valid locale defined by ISO-639-1
and ISO-3166.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1373,7 +1373,7 @@
<xsd:documentation>
The encodingType defines IANA character sets.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1390,7 +1390,7 @@
The locale-encoding-mapping-list contains one or more
locale-encoding-mapping(s).
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1413,7 +1413,7 @@
encoding name. The locale name must be either "Language-code",
such as "ja", defined by ISO-639 or "Language-code_Country-code",
such as "ja_JP". "Country code" is defined by ISO-3166.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1438,7 +1438,7 @@
of this application resource relative to other application
configuration resources.
See section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
@@ -1453,7 +1453,7 @@
<xsd:documentation>
Please see section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="0"
@@ -1477,7 +1477,7 @@
<xsd:documentation>
Please see section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1507,7 +1507,7 @@
comes
before or after other documents within the application.
See section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1531,7 +1531,7 @@
This element specifies configuration information related to the
handling of multipart/form-data requests.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1543,7 +1543,7 @@
<xsd:documentation>
The directory location where uploaded files will be stored
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1555,7 +1555,7 @@
<xsd:documentation>
The maximum size limit of uploaded files
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1567,7 +1567,7 @@
<xsd:documentation>
The maximum size limit of multipart/form-data requests
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1580,7 +1580,7 @@
The size threshold after which an uploaded file will be
written to disk
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
Modified: tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd Sat Oct 22 20:54:57 2011
@@ -10,7 +10,7 @@
<xsd:documentation>
$Id$
-
+
</xsd:documentation>
</xsd:annotation>
@@ -18,9 +18,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -30,7 +30,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -40,9 +40,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -54,7 +54,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -73,25 +73,25 @@
in the web fragment's jar file. All Servlet deployment descriptors
must indicate the web application schema by using the Java EE
namespace:
-
- http://java.sun.com/xml/ns/javaee
-
- and by indicating the version of the schema by
- using the version element as shown below:
-
+
+ http://java.sun.com/xml/ns/javaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
- version="3.0">
+ version="3.0">
...
</web-fragment>
-
+
The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Java EE
namespace with the following location:
-
+
http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -101,7 +101,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -110,7 +110,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -137,8 +137,8 @@
must concatenate the element contents. The multiple occurence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
- one distributable.
-
+ one distributable.
+
</xsd:documentation>
</xsd:annotation>
<xsd:unique name="web-common-servlet-name-uniqueness">
@@ -147,7 +147,7 @@
The servlet element contains the name of a servlet.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet"/>
@@ -159,7 +159,7 @@
The filter element contains the name of a filter.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:filter"/>
@@ -174,9 +174,9 @@
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-local-ref"/>
@@ -191,9 +191,9 @@
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-ref"/>
@@ -208,7 +208,7 @@
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-env-ref"/>
@@ -223,7 +223,7 @@
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:message-destination-ref"/>
@@ -237,7 +237,7 @@
resource manager connection factory reference. The name
is a JNDI name relative to the java:comp/env context.
The name must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-ref"/>
@@ -251,7 +251,7 @@
application's environment entry. The name is a JNDI
name relative to the java:comp/env context. The name
must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:env-entry"/>
@@ -263,7 +263,7 @@
A role-name-key is specified to allow the references
from the security-role-refs.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:security-role"/>
@@ -276,7 +276,7 @@
The keyref indicates the references from
security-role-ref to a specified role-name.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
Modified: tomcat/trunk/java/javax/servlet/resources/xml.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/xml.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/xml.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/xml.xsd Sat Oct 22 20:54:57 2011
@@ -44,7 +44,7 @@
<type . . .>
. . .
<attributeGroup ref="xml:specialAttrs"/>
-
+
will define a type which will schema-validate an instance
element with any of those attributes</xs:documentation>
</xs:annotation>
Modified: tomcat/trunk/java/javax/xml/ws/WebServiceRef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/xml/ws/WebServiceRef.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/xml/ws/WebServiceRef.java (original)
+++ tomcat/trunk/java/javax/xml/ws/WebServiceRef.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java (original)
+++ tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org