tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r981565 [4/5] - /tomcat/trunk/java/javax/servlet/resources/
Date Mon, 02 Aug 2010 15:39:36 GMT
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd?rev=981565&r1=981564&r2=981565&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd Mon Aug  2 15:39:35 2010
@@ -891,8 +891,8 @@
         java.lang.Long
         java.lang.Float
         java.lang.Double
-        		  java.lang.Class
-        		  any enumeration type (i.e. a subclass of java.lang.Enum)
+        java.lang.Class
+        any enumeration type (i.e. a subclass of java.lang.Enum)
         
         Examples:
         
@@ -1061,8 +1061,8 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        	The following transaction isolation levels are allowed
-        	(see documentation for the java.sql.Connection interface):
+        The following transaction isolation levels are allowed
+        (see documentation for the java.sql.Connection interface):
         TRANSACTION_READ_UNCOMMITTED
         TRANSACTION_READ_COMMITTED
         TRANSACTION_REPEATABLE_READ

Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd?rev=981565&r1=981564&r2=981565&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd Mon Aug  2 15:39:35 2010
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.2">
+            targetNamespace="http://java.sun.com/xml/ns/javaee"
+            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified"
+            version="1.2">
   <xsd:annotation>
     <xsd:documentation>
-      @(#)javaee_web_services_1_2.xsds	1.18 02/13/06
+      @(#)javaee_web_services_1_2.xsds 1.18 02/13/06
     </xsd:documentation>
   </xsd:annotation>
 
@@ -75,38 +75,38 @@
     <xsd:documentation>
       <![CDATA[
 
-	The webservices element is the root element for the web services
-	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.  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
-		http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
-	      version="1.2">
-	      ...
-	    </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:
+        The webservices element is the root element for the web services
+        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.  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
+                http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
+              version="1.2">
+              ...
+            </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_2.xsd
+        http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd
 
-	]]>
+        ]]>
     </xsd:documentation>
   </xsd:annotation>
 
@@ -117,13 +117,13 @@
       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
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	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.
+        same JAR file, relative filenames (i.e., those not
+        starting with "/") are considered relative to the root of
+        the JAR file's namespace.  Absolute filenames (i.e., those
+        starting with "/") also specify names in the root of the
+        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,25 +137,25 @@
     <xsd:annotation>
       <xsd:documentation>
 
-	The webservices element is the root element for the web services
-	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.
+        The webservices element is the root element for the web services
+        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
+        Used in: webservices.xml
 
       </xsd:documentation>
     </xsd:annotation>
 
     <xsd:key name="webservice-description-name-key">
       <xsd:annotation>
-	<xsd:documentation>
+        <xsd:documentation>
 
-	  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.
+          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:documentation>
       </xsd:annotation>
       <xsd:selector xpath="javaee:webservice-description"/>
       <xsd:field xpath="javaee:webservice-description-name"/>
@@ -186,16 +186,16 @@
 
       <xsd:choice minOccurs="0" maxOccurs="1">
          <xsd:element name="service-name-pattern"
-		      type="javaee:qname-pattern" />
+                      type="javaee:qname-pattern" />
          <xsd:element name="port-name-pattern"
-		      type="javaee:qname-pattern" />
+                      type="javaee:qname-pattern" />
          <xsd:element name="protocol-bindings"
-		      type="javaee:protocol-bindingListType"/>
+                      type="javaee:protocol-bindingListType"/>
       </xsd:choice>
 
       <xsd:element name="handler"
                    type="javaee:port-component_handlerType"
-		   minOccurs="1" maxOccurs="unbounded"/>
+                   minOccurs="1" maxOccurs="unbounded"/>
     </xsd:sequence>
 
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -216,7 +216,7 @@
     <xsd:sequence>
       <xsd:element name="handler-chain"
                    type="javaee:handler-chainType"
-		   minOccurs="0" maxOccurs="unbounded"/>
+                   minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
 
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -228,97 +228,97 @@
     <xsd:annotation>
       <xsd:documentation>
 
-	The port-component element associates a WSDL port with a web service
-	interface and implementation.  It defines the name of the port as a
-	component, optional description, optional display name, optional iconic
-	representations, WSDL port QName, Service Endpoint Interface, Service
-	Implementation Bean.
+        The port-component element associates a WSDL port with a web service
+        interface and implementation.  It defines the name of the port as a
+        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.
+        This element also associates a WSDL service with a JAX-WS Provider
+        implementation.
 
       </xsd:documentation>
     </xsd:annotation>
 
     <xsd:sequence>
       <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
+                   type="javaee:descriptionType"
+                   minOccurs="0" maxOccurs="1"/>
       <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
+                   type="javaee:display-nameType"
+                   minOccurs="0" maxOccurs="1"/>
       <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
+                   type="javaee:iconType"
+                   minOccurs="0" maxOccurs="1"/>
       <xsd:element name="port-component-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The port-component-name element specifies a port component's
-	      name.  This name is assigned by the module 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>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
+                   type="javaee:string">
+        <xsd:annotation>
+          <xsd:documentation>
+            <![CDATA[
+
+              The port-component-name element specifies a port component's
+              name.  This name is assigned by the module 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>
+
+              ]]>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="wsdl-service"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    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.
+                   type="javaee:xsdQNameType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	  </xsd:documentation>
-	</xsd:annotation>
+            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>
       <xsd:element name="wsdl-port"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    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
+                   type="javaee:xsdQNameType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
+
+            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:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="enable-mtom"
                    type="javaee:true-falseType"
-		   minOccurs="0" maxOccurs="1">
+                   minOccurs="0" maxOccurs="1">
         <xsd:annotation>
           <xsd:documentation>
 
             Used to enable or disable SOAP MTOM/XOP mechanism for an
             endpoint implementation.
 
-	    Not to be specified for JAX-RPC runtime
+            Not to be specified for JAX-RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
       <xsd:element name="protocol-binding"
                    type="javaee:protocol-bindingType"
-		   minOccurs="0" maxOccurs="1">
+                   minOccurs="0" maxOccurs="1">
         <xsd:annotation>
           <xsd:documentation>
 
             Used to specify the protocol binding used by the port-component.
-	    If this element is not specified, then the default binding is
+            If this element is not specified, then the default binding is
             used (SOAP 1.1 over HTTP)
 
           </xsd:documentation>
@@ -326,54 +326,54 @@
       </xsd:element>
 
       <xsd:element name="service-endpoint-interface"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      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>
+                   type="javaee:fully-qualified-classType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
+            <![CDATA[
+
+              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>
       </xsd:element>
       <xsd:element name="service-impl-bean"
-		   type="javaee:service-impl-beanType"/>
+                   type="javaee:service-impl-beanType"/>
 
       <xsd:choice>
-	<xsd:element name="handler"
-		     type="javaee:port-component_handlerType"
-		     minOccurs="0" maxOccurs="unbounded">
-	  <xsd:annotation>
-	    <xsd:documentation>
-		 To be used with JAX-RPC based runtime only.
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="handler-chains"
-		     type="javaee:handler-chainsType"
-		     minOccurs="0" maxOccurs="1">
-	  <xsd:annotation>
-	    <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
+        <xsd:element name="handler"
+                     type="javaee:port-component_handlerType"
+                     minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>
+                 To be used with JAX-RPC based runtime only.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="handler-chains"
+                     type="javaee:handler-chainsType"
+                     minOccurs="0" maxOccurs="1">
+          <xsd:annotation>
+            <xsd:documentation>
+                 To be used with JAX-WS based runtime only.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
       </xsd:choice>
 
     </xsd:sequence>
@@ -386,63 +386,63 @@
     <xsd:annotation>
       <xsd:documentation>
 
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface.
+        Declares the handler for a port-component. Handlers can access the
+        init-param name/value pairs using the HandlerInfo interface.
 
-	Used in: port-component
+        Used in: port-component
 
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
       <xsd:group ref="javaee:descriptionGroup"/>
       <xsd:element name="handler-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:string">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    Defines the name of the handler. The name must be unique within the
-	    module.
+            Defines the name of the handler. The name must be unique within the
+            module.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="handler-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:fully-qualified-classType">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    Defines a fully qualified class name for the handler implementation.
+            Defines a fully qualified class name for the handler implementation.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
+                   type="javaee:param-valueType"
+                   minOccurs="0" maxOccurs="unbounded"/>
 
       <xsd:element name="soap-header"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:xsdQNameType"
+                   minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    Defines the QName of a SOAP header that will be processed by the
-	    handler.
+            Defines the QName of a SOAP header that will be processed by the
+            handler.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="soap-role"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee: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.
+            The soap-role element contains a SOAP actor definition that the
+            Handler will play as a role.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -453,20 +453,20 @@
   <xsd:simpleType name="protocol-URIAliasType">
      <xsd:annotation>
         <xsd:documentation>
-	   Defines the type that is used for specifying tokens that
-	   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.
+           Defines the type that is used for specifying tokens that
+           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:
+           The following tokens alias the standard protocol binding
+           URIs:
 
-	   ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-	   ##SOAP11_HTTP_MTOM =
+           ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
+           ##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 =
-		 "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
+                 "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
            ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
 
         </xsd:documentation>
@@ -481,10 +481,10 @@
   <xsd:simpleType name="protocol-bindingListType">
      <xsd:annotation>
         <xsd:documentation>
-	   Defines the type used for specifying a list of
-	   protocol-bindingType(s). For e.g.
+           Defines the type used for specifying a list of
+           protocol-bindingType(s). For e.g.
 
-	    ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
+            ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
 
         </xsd:documentation>
      </xsd:annotation>
@@ -496,19 +496,19 @@
   <xsd:simpleType name="protocol-bindingType">
      <xsd:annotation>
         <xsd:documentation>
-	   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:
-
-	    ##SOAP11_HTTP
-	    ##SOAP11_HTTP_MTOM
-	    ##SOAP12_HTTP
-	    ##SOAP12_HTTP_MTOM
-	    ##XML_HTTP
+           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:
+
+            ##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.
+           Other specifications could define tokens that start with ##
+           to alias new standard binding URIs that are introduced.
 
         </xsd:documentation>
      </xsd:annotation>
@@ -520,43 +520,43 @@
   <xsd:simpleType name="qname-pattern">
      <xsd:annotation>
         <xsd:documentation>
-	     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
-		 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
-		 content the prefixed markup occurs)
+             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
+                 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
+                 content the prefixed markup occurs)
 
-	     Wild Card : service-name-pattern="*"
+             Wild Card : service-name-pattern="*"
 
-		In this case, handlers specified in this handler-chain
-		element will apply to ports of all service names.
+                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.
+            The same can be applied to port-name attribute in
+            handler-chain element.
 
         </xsd:documentation>
      </xsd:annotation>
@@ -573,20 +573,20 @@
     <xsd:annotation>
       <xsd:documentation>
 
-	The service-impl-bean element defines the web service implementation.
-	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.
+        The service-impl-bean element defines the web service implementation.
+        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
+        Used in: port-component
 
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice>
       <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"/>
+                   type="javaee:ejb-linkType"/>
       <xsd:element name="servlet-link"
-		   type="javaee:servlet-linkType"/>
+                   type="javaee:servlet-linkType"/>
     </xsd:choice>
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
@@ -596,21 +596,21 @@
   <xsd:complexType name="servlet-linkType">
     <xsd:annotation>
       <xsd:documentation>
-	<![CDATA[
+        <![CDATA[
 
-	  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 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.
+          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
+          Used in: service-impl-bean
 
-	  Example:
-		  <servlet-link>StockQuoteService</servlet-link>
+          Example:
+                  <servlet-link>StockQuoteService</servlet-link>
 
-	  ]]>
+          ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -624,84 +624,84 @@
     <xsd:annotation>
       <xsd:documentation>
 
-	The webservice-description element defines a WSDL document file
-	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.
+        The webservice-description element defines a WSDL document file
+        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.
+        All WSDL file ports must have a corresponding port-component element
+        defined.
 
-	Used in: webservices
+        Used in: webservices
 
       </xsd:documentation>
     </xsd:annotation>
 
     <xsd:sequence>
       <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
+                   type="javaee:descriptionType"
+                   minOccurs="0" maxOccurs="1"/>
       <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
+                   type="javaee:display-nameType"
+                   minOccurs="0" maxOccurs="1"/>
       <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
+                   type="javaee:iconType"
+                   minOccurs="0" maxOccurs="1"/>
       <xsd:element name="webservice-description-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    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.
+                   type="javaee:string">
+        <xsd:annotation>
+          <xsd:documentation>
+
+            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:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="wsdl-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:pathType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    The wsdl-file element contains the name of a WSDL file in the
-	    module.  The file name is a relative path within the module.
+            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:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="jaxrpc-mapping-file"
-		   type="javaee: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.
+                   type="javaee:pathType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    This is not required when JAX-WS based runtime is used.
+            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.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+            This is not required when JAX-WS based runtime is used.
+
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="port-component"
-		   type="javaee:port-componentType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component_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="javaee:handler"/>
-	  <xsd:field xpath="javaee:handler-name"/>
-	</xsd:key>
+                   type="javaee:port-componentType"
+                   minOccurs="1" maxOccurs="unbounded">
+        <xsd:key name="port-component_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="javaee:handler"/>
+          <xsd:field xpath="javaee:handler-name"/>
+        </xsd:key>
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -713,44 +713,44 @@
     <xsd:sequence>
       <xsd:group ref="javaee:descriptionGroup"/>
       <xsd:element name="webservice-description"
-		   type="javaee:webservice-descriptionType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	      <![CDATA[
-
-		The port-component-name element specifies a port
-		component's name.  This name is assigned by the module
-		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>
-
-		]]>
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:port-component"/>
-	  <xsd:field xpath="javaee:port-component-name"/>
-	</xsd:key>
+                   type="javaee:webservice-descriptionType"
+                   minOccurs="1" maxOccurs="unbounded">
+        <xsd:key name="port-component-name-key">
+          <xsd:annotation>
+            <xsd:documentation>
+              <![CDATA[
+
+                The port-component-name element specifies a port
+                component's name.  This name is assigned by the module
+                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>
+
+                ]]>
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:selector xpath="javaee:port-component"/>
+          <xsd:field xpath="javaee:port-component-name"/>
+        </xsd:key>
       </xsd:element>
     </xsd:sequence>
 
     <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="1.2"
-		   use="required">
+                   type="javaee:dewey-versionType"
+                   fixed="1.2"
+                   use="required">
       <xsd:annotation>
-	<xsd:documentation>
+        <xsd:documentation>
 
-	  The required value for the version is 1.2.
+          The required value for the version is 1.2.
 
-	</xsd:documentation>
+        </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
 

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=981565&r1=981564&r2=981565&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 Mon Aug  2 15:39:35 2010
@@ -96,7 +96,7 @@
       <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
-      	http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"
+        http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"
       version="1.3">
       ...
       </webservices>
@@ -208,8 +208,8 @@
             Used in: port-component
             
             Example:
-            	      <port-component-name>EmployeeService
-            	      </port-component-name>
+                      <port-component-name>EmployeeService
+                      </port-component-name>
             
 ]]>
           </xsd:documentation>
@@ -337,7 +337,7 @@
             Used in: port-component
             
             Example:
-            	      <remote>com.wombat.empl.EmployeeService</remote>
+                      <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
@@ -360,7 +360,7 @@
           <xsd:annotation>
             <xsd:documentation>
 
-              	 To be used with JAX-RPC based runtime only.
+                 To be used with JAX-RPC based runtime only.
               
             </xsd:documentation>
           </xsd:annotation>
@@ -372,7 +372,7 @@
           <xsd:annotation>
             <xsd:documentation>
 
-              	 To be used with JAX-WS based runtime only.
+                 To be used with JAX-WS based runtime only.
               
             </xsd:documentation>
           </xsd:annotation>
@@ -426,7 +426,7 @@
         Used in: service-impl-bean
         
         Example:
-        	  <servlet-link>StockQuoteService</servlet-link>
+              <servlet-link>StockQuoteService</servlet-link>
         
 ]]>
       </xsd:documentation>
@@ -546,19 +546,19 @@
           <xsd:annotation>
             <xsd:documentation>
 <![CDATA[[
-              	The port-component-name element specifies a port
-              	component's name.  This name is assigned by the module
-              	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.
+                The port-component-name element specifies a port
+                component's name.  This name is assigned by the module
+                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
+                Used in: port-component
               
-              	Example:
-              		<port-component-name>EmployeeService
-              		</port-component-name>
+                Example:
+                    <port-component-name>EmployeeService
+                    </port-component-name>
               
-              	
+                
               
 ]]>
             </xsd:documentation>

Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd?rev=981565&r1=981564&r2=981565&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd Mon Aug  2 15:39:35 2010
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.2">
+            targetNamespace="http://java.sun.com/xml/ns/javaee"
+            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified"
+            version="1.2">
   <xsd:annotation>
     <xsd:documentation>
-      @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
+      @(#)javaee_web_services_client_1_2.xsds 1.19 02/13/06
     </xsd:documentation>
   </xsd:annotation>
 
@@ -78,61 +78,61 @@
     <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.
+        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="javaee: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.
+                   type="javaee:fully-qualified-classType">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	  </xsd:documentation>
-	</xsd:annotation>
+            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="enable-mtom"
                    type="javaee:true-falseType"
-		   minOccurs="0" maxOccurs="1">
+                   minOccurs="0" maxOccurs="1">
         <xsd:annotation>
           <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
+            Not to be specified for JAX-RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="port-component-link"
-		   type="javaee: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.
+                   type="javaee: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:documentation>
+        </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -143,20 +143,20 @@
   <xsd:group name="service-refGroup">
     <xsd:sequence>
       <xsd:element name="service-ref"
-		   type="javaee: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="javaee:handler"/>
-	  <xsd:field xpath="javaee:handler-name"/>
-	</xsd:key>
+                   type="javaee: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="javaee:handler"/>
+          <xsd:field xpath="javaee:handler-name"/>
+        </xsd:key>
       </xsd:element>
     </xsd:sequence>
   </xsd:group>
@@ -167,13 +167,13 @@
     <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.
+        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>
@@ -181,141 +181,141 @@
     <xsd:sequence>
       <xsd:group ref="javaee:descriptionGroup"/>
       <xsd:element name="service-ref-name"
-		   type="javaee:jndi-nameType">
-	<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/".
+                   type="javaee:jndi-nameType">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	  </xsd:documentation>
-	</xsd:annotation>
+            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="javaee: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.
+                   type="javaee: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:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="service-ref-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    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
-	    @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
-	    always a Service interface/class.
-	  </xsd:documentation>
-	</xsd:annotation>
+                   type="javaee:fully-qualified-classType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
+
+            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
+            @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
+            always a Service interface/class.
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="wsdl-file"
-		   type="javaee:xsdAnyURIType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee: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.
+            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:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="jaxrpc-mapping-file"
-		   type="javaee: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.
+                   type="javaee: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.
 
-	    This is not required when JAX-WS based runtime is used.
+            This is not required when JAX-WS based runtime is used.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="service-qname"
-		   type="javaee: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.
+                   type="javaee:xsdQNameType"
+                   minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	  </xsd:documentation>
-	</xsd:annotation>
+            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="javaee: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.
+                   type="javaee: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:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:choice>
-	  <xsd:element name="handler"
-		       type="javaee: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.
-
-		To be used with JAX-RPC based runtime only.
-
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
-	  <xsd:element name="handler-chains"
-		       type="javaee:service-ref_handler-chainsType"
-		       minOccurs="0" maxOccurs="1">
-	    <xsd:annotation>
-	      <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
+          <xsd:element name="handler"
+                       type="javaee: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.
+
+                To be used with JAX-RPC based runtime only.
+
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="handler-chains"
+                       type="javaee:service-ref_handler-chainsType"
+                       minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+              <xsd:documentation>
+                 To be used with JAX-WS based runtime only.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
       </xsd:choice>
 
       <xsd:group ref="javaee:resourceGroup"/>
@@ -348,16 +348,16 @@
 
       <xsd:choice minOccurs="0" maxOccurs="1">
          <xsd:element name="service-name-pattern"
-		      type="javaee:service-ref_qname-pattern" />
+                      type="javaee:service-ref_qname-pattern" />
          <xsd:element name="port-name-pattern"
-	              type="javaee:service-ref_qname-pattern" />
+                      type="javaee:service-ref_qname-pattern" />
          <xsd:element name="protocol-bindings"
-	              type="javaee:service-ref_protocol-bindingListType"/>
+                      type="javaee:service-ref_protocol-bindingListType"/>
       </xsd:choice>
 
       <xsd:element name="handler"
                    type="javaee:service-ref_handlerType"
-		   minOccurs="1" maxOccurs="unbounded"/>
+                   minOccurs="1" maxOccurs="unbounded"/>
     </xsd:sequence>
 
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -378,7 +378,7 @@
     <xsd:sequence>
       <xsd:element name="handler-chain"
                    type="javaee:service-ref_handler-chainType"
-		   minOccurs="0" maxOccurs="unbounded"/>
+                   minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
 
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -390,80 +390,80 @@
     <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.
+        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
+        Used in: service-ref
 
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
       <xsd:group ref="javaee:descriptionGroup"/>
       <xsd:element name="handler-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:string">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    Defines the name of the handler. The name must be unique
-	    within the module.
+            Defines the name of the handler. The name must be unique
+            within the module.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="handler-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:fully-qualified-classType">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    Defines a fully qualified class name for the handler
-	    implementation.
+            Defines a fully qualified class name for the handler
+            implementation.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
       <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
+                   type="javaee:param-valueType"
+                   minOccurs="0" maxOccurs="unbounded"/>
 
       <xsd:element name="soap-header"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee:xsdQNameType"
+                   minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
 
-	    Defines the QName of a SOAP header that will be processed
-	    by the handler.
+            Defines the QName of a SOAP header that will be processed
+            by the handler.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="soap-role"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee: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.
+            The soap-role element contains a SOAP actor definition that
+            the Handler will play as a role.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
 
       <xsd:element name="port-name"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
+                   type="javaee: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.
+            The port-name element defines the WSDL port-name that a
+            handler should be associated with.
 
-	  </xsd:documentation>
-	</xsd:annotation>
+          </xsd:documentation>
+        </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
@@ -474,16 +474,16 @@
   <xsd:simpleType name="service-ref_protocol-URIAliasType">
      <xsd:annotation>
         <xsd:documentation>
-	   Defines the type that is used for specifying tokens that
-	   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.
+           Defines the type that is used for specifying tokens that
+           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:
+           The following tokens alias the standard protocol binding
+           URIs:
 
-	   ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-	   ##SOAP11_HTTP_MTOM =
+           ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
+           ##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 =
@@ -502,10 +502,10 @@
   <xsd:simpleType name="service-ref_protocol-bindingListType">
      <xsd:annotation>
         <xsd:documentation>
-	   Defines the type used for specifying a list of
-	   protocol-bindingType(s). For e.g.
+           Defines the type used for specifying a list of
+           protocol-bindingType(s). For e.g.
 
-	    ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
+            ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
 
         </xsd:documentation>
      </xsd:annotation>
@@ -517,19 +517,19 @@
   <xsd:simpleType name="service-ref_protocol-bindingType">
      <xsd:annotation>
         <xsd:documentation>
-	   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:
+           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:
 
-	    ##SOAP11_HTTP
-	    ##SOAP11_HTTP_MTOM
+            ##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.
+           Other specifications could define tokens that start with ##
+           to alias new standard binding URIs that are introduced.
 
         </xsd:documentation>
      </xsd:annotation>
@@ -541,43 +541,43 @@
   <xsd:simpleType name="service-ref_qname-pattern">
      <xsd:annotation>
         <xsd:documentation>
-	     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
-		 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
-		 content the prefixed markup occurs)
+             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
+                 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
+                 content the prefixed markup occurs)
 
-	     Wild Card : service-name-pattern="*"
+             Wild Card : service-name-pattern="*"
 
-		In this case, handlers specified in this handler-chain
-		element will apply to ports of all service names.
+                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.
+            The same can be applied to port-name attribute in
+            handler-chain element.
 
         </xsd:documentation>
      </xsd:annotation>

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=981565&r1=981564&r2=981565&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 Mon Aug  2 15:39:35 2010
@@ -208,13 +208,13 @@
           <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.
+                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.
               
-              	To be used with JAX-RPC based runtime only.
+                To be used with JAX-RPC based runtime only.
               
             </xsd:documentation>
           </xsd:annotation>
@@ -226,7 +226,7 @@
           <xsd:annotation>
             <xsd:documentation>
 
-              	 To be used with JAX-WS based runtime only.
+                 To be used with JAX-WS based runtime only.
               
             </xsd:documentation>
           </xsd:annotation>
@@ -496,31 +496,31 @@
         
         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 
-        	 prefixed markup occurs)
-        	 
+             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 
+             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 
-        	 content the prefixed markup occurs)
+             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 
+             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.
+            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.

Modified: tomcat/trunk/java/javax/servlet/resources/web-app_2_3.dtd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_2_3.dtd?rev=981565&r1=981564&r2=981565&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message