Adopt jakarta jaxws ns

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Sep 10, 2020 · 3e934bc · 3e934bc
1 parent b4dc696
commit 3e934bc
Show file tree

Hide file tree

Showing 35 changed files with 701 additions and 599 deletions.
diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-annotations.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-annotations.xml
@@ -854,7 +854,7 @@ public class AddNumbersImpl {
                     <title><literal>@jakarta.jws.HandlerChain</literal> -
                     Example - handlers.xml</title>
 
-                    <programlisting language="xml"><![CDATA[<jws:handler-config xmlns:jws="http://java.sun.com/xml/ns/javaee">
+                    <programlisting language="xml"><![CDATA[<jws:handler-config xmlns:jws="https://jakarta.ee/xml/ns/jakartaee">
     <jws:handler-chains>
         <jws:handler-chain>
             <jws:handler>

diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-asynchronous-client.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-asynchronous-client.xml
@@ -85,7 +85,7 @@
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocaption="http://localhost:8080/jaxws-async/addnumbers?WSDL"
-        xmlns="http://java.sun.com/xml/ns/jaxws">
+        xmlns="https://jakarta.ee/xml/ns/jaxws">
     <bindings node="wsdl:definitions">
         <package name="async.client"/>
         <enableAsyncMapping>true</enableAsyncMapping>

diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-handler.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-handler.xml
@@ -146,8 +146,8 @@ public class MyLogicalHandler implements
 
             <informalexample>
                 <programlisting language="xml"><![CDATA[<-- excerpt from customization file -->
-<bindings xmlns="http://java.sun.com/xml/ns/jaxws">
-    <handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxws">
+    <handler-chains xmlns="https://jakarta.ee/xml/ns/jakartaee">
         <handler-chain>
             <handler>
                 <handler-class>fromwsdl.handler_simple.common.TestHandler
@@ -167,7 +167,7 @@ public class MyLogicalHandler implements
 
             <informalexample>
                 <programlisting language="xml"><![CDATA[<-- excerpt -->
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
+<handler-chains xmlns="https://jakarta.ee/xml/ns/jakartaee">
     <handler-chain>
         <service-name-pattern xmlns:ns1="urn:namespace">ns1:My*Service
         </service-name-pattern>
@@ -215,7 +215,7 @@ public class MyServiceImpl {
 
             <informalexample>
                 <programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
+<jws:handler-chains xmlns:jws="https://jakarta.ee/xml/ns/jakartaee">
     <jws:handler-chain>
         <jws:handler>
             <jws:handler-class>fromjava.handler_simple.common.TestHandler
@@ -240,7 +240,7 @@ public class MyServiceImpl {
             <informalexample>
                 <programlisting language="xml"><![CDATA[<endpoints ...>
     <endpoint...>
-        <handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
+        <handler-chains xmlns="https://jakarta.ee/xml/ns/jakartaee">
             <handler-chain>
                 ...
             </handler-chain>

diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-provider.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-provider.xml
@@ -127,7 +127,7 @@ public class ProviderImpl implements Provider<Source> {
             <programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <bindings
         ...
-        wsdlLocaption="AddNumbers.wsdl"xmlns="http://java.sun.com/xml/ns/jaxws">
+        wsdlLocaption="AddNumbers.wsdl"xmlns="https://jakarta.ee/xml/ns/jaxws">
     <bindings node="wsdl:definitions">
         <package name="provider.server"/>
         <provider>true</provider>
@@ -265,7 +265,7 @@ public class ProviderImpl implements Provider<Source> {
         <informalexample>
             <programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime'
-        xmlns:javaee="http://java.sun.com/xml/ns/javaee" version='2.0'>
+        xmlns:javaee="https://jakarta.ee/xml/ns/jakartaee" version='2.0'>
     <endpoint name='AddNumbers'
             implementation='provider.server.AddNumbersImpl'
             wsdl='WEB-INF/wsdl/AddNumbers.wsdl'

diff --git a/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-wsdl-customization.xml b/jaxws-ri/docs/release-documentation/src/main/docbook/users-guide-wsdl-customization.xml
@@ -67,7 +67,7 @@
         <title>Declaring Customizations</title>
 
         <para>All the binding declaration elements live in
-        <literal>http://java.sun.com/xml/ns/jaxws</literal> namespace. There
+        <literal>https://jakarta.ee/xml/ns/jaxws</literal> namespace. There
         are two ways to specify binding declarations. In the first approach,
         all binding declarations pertaining to a given WSDL document are
         grouped together in a standalone document, called an
@@ -76,7 +76,7 @@
         document. In either case, the <literal>jaxws:bindings</literal>
         element is used as a container for &ws.spec.name; binding declarations. The
         <literal>jaxws</literal> prefix maps to the
-        <literal>http://java.sun.com/xml/ns/jaxws</literal> namespace.</para>
+        <literal>https://jakarta.ee/xml/ns/jaxws</literal> namespace.</para>
 
         <section xml:id="external-binding-declaration">
             <title>External Binding Declaration</title>
@@ -111,7 +111,7 @@
                 <informalexample>
                     <programlisting language="xml"><![CDATA[<jaxws:bindings
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        jaxws:xmlns="http://java.sun.com/xml/ns/jaxws">
+        jaxws:xmlns="https://jakarta.ee/xml/ns/jaxws">
     
     ...
 
@@ -134,7 +134,7 @@
                 <informalexample>
                     <programlisting language="xml"><![CDATA[<jaxws:bindings
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        jaxws:xmlns="http://java.sun.com/xml/ns/jaxws">
+        jaxws:xmlns="https://jakarta.ee/xml/ns/jaxws">
     <jaxws:bindings node="wsdl:definitions"
             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
         <jaxws:package name="external_customize.client"/>
@@ -193,7 +193,7 @@
             <informalexample>
                 <programlisting language="xml"><![CDATA[<wsdl:portType name="AddNumbersImpl">
     <!-- wsdl:portType customizations -->
-    <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+    <jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
         <!-- rename the generated SEI from AddNumbersImpl to MathUtil -->
         <jaxws:class name="MathUtil"/>
         ...
@@ -248,7 +248,7 @@
             <informalexample>
                 <programlisting language="xml"><![CDATA[<bindings xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        xmlns="http://java.sun.com/xml/ns/jaxws">
+        xmlns="https://jakarta.ee/xml/ns/jaxws">
     
     <package name="external_customize.client"/>
     <enableWrapperStyle>true</enableWrapperStyle>
@@ -287,7 +287,7 @@
             <informalexample>
                 <programlisting language="xml"><![CDATA[<bindings xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        xmlns="http://java.sun.com/xml/ns/jaxws">
+        xmlns="https://jakarta.ee/xml/ns/jaxws">
     <package name="external_customize.client">
         <javadoc>Mathutil package</javadoc>
     </package>
@@ -302,7 +302,7 @@
             <informalexample>
                 <programlisting language="xml"><![CDATA[<bindings xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        xmlns="http://java.sun.com/xml/ns/jaxws">
+        xmlns="https://jakarta.ee/xml/ns/jaxws">
     <bindings node="wsdl:definitions">
         <package name="external_customize.client">
             <javadoc>Mathutil package</javadoc>
@@ -357,7 +357,7 @@
             <informalexample>
                 <programlisting language="xml"><![CDATA[<bindings xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        xmlns="http://java.sun.com/xml/ns/jaxws">
+        xmlns="https://jakarta.ee/xml/ns/jaxws">
     
     <!-- applies to wsdl:definitions node, that would mean the entire wsdl -->
     <enableWrapperStyle>true</enableWrapperStyle>
@@ -427,7 +427,7 @@
             <informalexample>
                 <programlisting language="xml"><![CDATA[<bindings xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?WSDL"
-        xmlns="http://java.sun.com/xml/ns/jaxws">
+        xmlns="https://jakarta.ee/xml/ns/jaxws">
     
     <!-- applies to wsdl:definitions node, that would mean the entire wsdl -->
     <enableAsyncMapping>false</enableAsyncMapping>
@@ -741,8 +741,8 @@ public Future<?> addNumbers(int number1, int number2,
         xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         wsdlLocation="http://localhost:8080/jaxws-fromwsdlhandler/addnumbers?WSDL"
-        xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
-        xmlns:javaee="http://java.sun.com/xml/ns/javaee">
+        xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws"
+        xmlns:javaee="https://jakarta.ee/xml/ns/jakartaee">
     <jaxws:bindings node="wsdl:definitions">
         <javaee:handler-chain>
             <javaee:handler-chain-name>LoggingHandlers

diff --git a/jaxws-ri/docs/release-documentation/src/main/resources/sun-jaxws_3.0.xsd b/jaxws-ri/docs/release-documentation/src/main/resources/sun-jaxws_3.0.xsd
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Distribution License v. 1.0, which is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<xsd:schema
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:tns="http://java.sun.com/xml/ns/jax-ws/ri/runtime"
+        xmlns:javaee="https://jakarta.ee/xml/ns/jakartaee"
+        targetNamespace="http://java.sun.com/xml/ns/jax-ws/ri/runtime"
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        version="3.0">
+
+    <xsd:import namespace="http://java.sun.com/xml/ns/javaee"
+                schemaLocation="https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_metadata_handler_3_0.xsd"/>
+
+    <xsd:element name="endpoints">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="endpoint" type="tns:endpointType" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+            <xsd:attribute name="version" type="xsd:string" use="required"/>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:complexType name="externalMetadata">
+        <xsd:attribute name="file" type="xsd:string" use="optional"/>
+        <xsd:attribute name="resource" type="xsd:string" use="optional"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="endpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An endpoint definition has several attributes:
+                <ul>
+                    <li>name</li>
+                    - the endpoint name
+                    <li>implementation</li>
+                    - the name of the endpoint implementation class
+                    <li>wsdl</li>
+                    - the name of a resource corresponding to the WSDL document for the endpoint
+                    <li>service</li>
+                    - the QName of the WSDL service that owns this endpoint;
+                    <li>port</li>
+                    - the QName of the WSDL port for this endpoint;
+                    <li>url-pattern</li>
+                    - the URL pattern this endpoint is mapped to.
+                    <li>binding</li>
+                    - specify binding id for SOAP1.1 or SOAP1.2
+                    <li>databinding</li>
+                    - specify databinding type - "glassfish.jaxb" for JAX-B RI (default), "eclipselink.jaxb" for Toplink
+                    MOXy
+                    <li>enable-mtom</li>
+                    - Enables MTOM optimization
+                </ul>
+                <p>
+                    <b>wsdl, service, port</b>
+                    attributes are required for provider based endpoints
+                </p>
+                <p>Allowed nested element(s) is
+                    <b>external-metadata</b>
+                    defining xml descriptor to be used to supplement or override annotation metadata. One element
+                    defines
+                    one resource/file.
+                </p>
+            </xsd:documentation>
+        </xsd:annotation>
+
+        <xsd:sequence>
+            <xsd:element name="external-metadata" type="tns:externalMetadata" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="javaee:handler-chains" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+        <xsd:attribute name="implementation" type="xsd:string" use="required"/>
+        <xsd:attribute name="wsdl" type="xsd:anyURI"/>
+        <xsd:attribute name="service" type="xsd:anyURI"/>
+        <xsd:attribute name="port" type="xsd:anyURI"/>
+        <xsd:attribute name="url-pattern" type="xsd:anyURI" use="required"/>
+        <xsd:attribute name="databinding" type="xsd:string"/>
+        <xsd:attribute name="binding" type="xsd:string"/>
+        <xsd:attribute name="enable-mtom" type="xsd:boolean"/>
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/jaxws-ri/docs/samples/src/main/samples/async/etc/custom-client.xml b/jaxws-ri/docs/samples/src/main/samples/async/etc/custom-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -11,12 +11,12 @@
 
 -->
 
-<bindings 
+<bindings
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     wsdlLocation="http://localhost:8080/jaxws-async/addnumbers?wsdl"
-    xmlns="http://java.sun.com/xml/ns/jaxws">    
+    xmlns="https://jakarta.ee/xml/ns/jaxws">
     <bindings node="wsdl:definitions">
         <enableAsyncMapping>true</enableAsyncMapping>
-    </bindings>    
+    </bindings>
 </bindings>
diff --git a/jaxws-ri/docs/samples/src/main/samples/asyncservice/etc/web.xml b/jaxws-ri/docs/samples/src/main/samples/asyncservice/etc/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -11,9 +11,9 @@
 
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="5.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
          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/web-app_3_0.xsd">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
     <description>asyncservice</description>
     <display-name>asyncservice</display-name>
     <listener>

diff --git a/jaxws-ri/docs/samples/src/main/samples/efficient_handler/etc/custom-client.xml b/jaxws-ri/docs/samples/src/main/samples/efficient_handler/etc/custom-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,8 +14,8 @@
 <bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     wsdlLocation="http://localhost:8080/jaxws-efficient_handler/addnumbers?wsdl"
-    xmlns="http://java.sun.com/xml/ns/jaxws">
-    <bindings node="wsdl:definitions" xmlns:jws="http://java.sun.com/xml/ns/javaee">
+    xmlns="https://jakarta.ee/xml/ns/jaxws">
+    <bindings node="wsdl:definitions" xmlns:jws="https://jakarta.ee/xml/ns/jakartaee">
         <jws:handler-chains>
             <jws:handler-chain>
                 <jws:handler>

diff --git a/...docs/samples/src/main/samples/efficient_handler/src/efficient_handler/server/handlers.xml b/...docs/samples/src/main/samples/efficient_handler/src/efficient_handler/server/handlers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -11,7 +11,7 @@
 
 -->
 
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
+<handler-chains xmlns="https://jakarta.ee/xml/ns/jakartaee">
         <handler-chain>
             <handler>
                 <handler-class>efficient_handler.common.LoggingHandler</handler-class>

diff --git a/jaxws-ri/docs/samples/src/main/samples/external-customize/etc/custom-client.xml b/jaxws-ri/docs/samples/src/main/samples/external-customize/etc/custom-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -15,7 +15,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     wsdlLocation="http://localhost:8080/jaxws-external-customize/addnumbers?wsdl"
-    xmlns="http://java.sun.com/xml/ns/jaxws">
+    xmlns="https://jakarta.ee/xml/ns/jaxws">
     <package name="external_customize.client"/>
     <!-- default settings -->
     <enableWrapperStyle>true</enableWrapperStyle>

diff --git a/jaxws-ri/docs/samples/src/main/samples/fromjavahandler/etc/custom-client.xml b/jaxws-ri/docs/samples/src/main/samples/fromjavahandler/etc/custom-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -14,8 +14,8 @@
 <bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     wsdlLocation="http://localhost:8080/jaxws-fromjavahandler/addnumbers?wsdl"
-    xmlns="http://java.sun.com/xml/ns/jaxws">
-    <bindings node="wsdl:definitions" xmlns:jws="http://java.sun.com/xml/ns/javaee">
+    xmlns="https://jakarta.ee/xml/ns/jaxws">
+    <bindings node="wsdl:definitions" xmlns:jws="https://jakarta.ee/xml/ns/jakartaee">
         <jws:handler-chains>
             <jws:handler-chain>
                 <jws:handler>