[tomcat] branch master updated: Use consistent mark-up when electing to use the CDDL license

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f807ee  Use consistent mark-up when electing to use the CDDL license
4f807ee is described below

commit 4f807eea552981d36a8bb30a73aee7efb049ca6e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 31 22:20:55 2019 +0100

    Use consistent mark-up when electing to use the CDDL license
---
 java/javax/servlet/resources/javaee_8.xsd          |  6 ++-
 .../servlet/resources/javaee_web_services_1_4.xsd  | 30 ++++++-----
 .../resources/javaee_web_services_client_1_4.xsd   | 58 ++++++++++++----------
 java/javax/servlet/resources/web-app_4_0.xsd       |  6 ++-
 java/javax/servlet/resources/web-common_4_0.xsd    |  6 ++-
 java/javax/servlet/resources/web-fragment_4_0.xsd  |  6 ++-
 6 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/java/javax/servlet/resources/javaee_8.xsd 
b/java/javax/servlet/resources/javaee_8.xsd
index 8346758..f071a06 100644
--- a/java/javax/servlet/resources/javaee_8.xsd
+++ b/java/javax/servlet/resources/javaee_8.xsd
@@ -46,9 +46,13 @@
       only if the new code is made subject to such option by the copyright
       holder.
 
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       The Apache Software Foundation elects to include this software under the
       CDDL license.
-
     </xsd:documentation>
   </xsd:annotation>
 
diff --git a/java/javax/servlet/resources/javaee_web_services_1_4.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
index 34e7219..e32c5b7 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -47,9 +47,13 @@
       only if the new code is made subject to such option by the copyright
       holder.
 
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       The Apache Software Foundation elects to include this software under the
       CDDL license.
-
     </xsd:documentation>
   </xsd:annotation>
 
@@ -348,7 +352,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>
@@ -360,7 +364,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>
@@ -489,7 +493,7 @@
           <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
+            describes the JAX-RPC mapping between the Java interfaces used by
             the application and the WSDL description in the wsdl-file.  The
             file name is a relative path within the module.
 
@@ -534,17 +538,17 @@
           <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>
 
 
 
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd 
b/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd
index 842d75e..fbd00ce 100644
--- a/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd
@@ -47,9 +47,13 @@
       only if the new code is made subject to such option by the copyright
       holder.
 
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       The Apache Software Foundation elects to include this software under the
       CDDL license.
-
     </xsd:documentation>
   </xsd:annotation>
 
@@ -149,7 +153,7 @@
           <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
+            describes the JAX-RPC mapping between the Java interfaces used by
             the application and the WSDL description in the wsdl-file.  The
             file name is a relative path within the module file.
 
@@ -196,13 +200,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>
@@ -214,7 +218,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>
@@ -484,31 +488,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.
diff --git a/java/javax/servlet/resources/web-app_4_0.xsd 
b/java/javax/servlet/resources/web-app_4_0.xsd
index 083252e..b5cfa9e 100644
--- a/java/javax/servlet/resources/web-app_4_0.xsd
+++ b/java/javax/servlet/resources/web-app_4_0.xsd
@@ -47,9 +47,13 @@
       only if the new code is made subject to such option by the copyright
       holder.
 
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       The Apache Software Foundation elects to include this software under the
       CDDL license.
-
     </xsd:documentation>
   </xsd:annotation>
 
diff --git a/java/javax/servlet/resources/web-common_4_0.xsd 
b/java/javax/servlet/resources/web-common_4_0.xsd
index 35e077b..0905460 100644
--- a/java/javax/servlet/resources/web-common_4_0.xsd
+++ b/java/javax/servlet/resources/web-common_4_0.xsd
@@ -47,9 +47,13 @@
       only if the new code is made subject to such option by the copyright
       holder.
 
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       The Apache Software Foundation elects to include this software under the
       CDDL license.
-
     </xsd:documentation>
   </xsd:annotation>
 
diff --git a/java/javax/servlet/resources/web-fragment_4_0.xsd 
b/java/javax/servlet/resources/web-fragment_4_0.xsd
index c8fbdd8..ed2d760 100644
--- a/java/javax/servlet/resources/web-fragment_4_0.xsd
+++ b/java/javax/servlet/resources/web-fragment_4_0.xsd
@@ -47,9 +47,13 @@
       only if the new code is made subject to such option by the copyright
       holder.
 
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       The Apache Software Foundation elects to include this software under the
       CDDL license.
-
     </xsd:documentation>
   </xsd:annotation>
 


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