replace jaxws and jaxrpc acronyms
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/spec/src/main/asciidoc/appH-binary_data.adoc b/spec/src/main/asciidoc/appH-binary_data.adoc
index 52ec96c..6f4a313 100644
--- a/spec/src/main/asciidoc/appH-binary_data.adoc
+++ b/spec/src/main/asciidoc/appH-binary_data.adoc
@@ -154,7 +154,7 @@
The abstract classes `AttachmentUnmarshaller`
and `AttachmentMarshaller` in package `jakarta.xml.bind.attachments` are
intended to be implemented by a MIME-based package processor, such as
-JAX-WS 2.0 implementation, and are called during JAXB unmarshal/marshal.
+Jakarta XML Web Services implementation, and are called during JAXB unmarshal/marshal.
The JAXB unmarshal/marshal processes the root part of a MIME-based
package, delegating knowledge of the overall package and its other parts
to the `Attachment*` class implementations.
diff --git a/spec/src/main/asciidoc/ch01-introduction.adoc b/spec/src/main/asciidoc/ch01-introduction.adoc
index 3ec5144..1cead14 100644
--- a/spec/src/main/asciidoc/ch01-introduction.adoc
+++ b/spec/src/main/asciidoc/ch01-introduction.adoc
@@ -171,11 +171,12 @@
marshalling of Java object graph is according to program annotations,
either explicit or defaulted, on the existing Java classes.
-* Meet data binding requirements for The Java API for XML Web Services(JAX-WS) 2.0 +
+* Meet data binding requirements for Jakarta XML Web Services +
+
-JAX-WS 2.0 will use the XML data binding
-facility defined by JAXB 2.0. Hence, JAXB 2.0 will meet all data binding
-requirements of JAX-WS 2.0.
+Jakarta XML Web Services will use the XML data binding
+facility defined by Jakarta XML Binding. Hence,
+Jakarta XML Binding will meet all data binding
+requirements of Jakarta XML Web Services.
* Ease of Development: Leverage J2SE 5.0 Language Extensions +
+
diff --git a/spec/src/main/asciidoc/ch02-requirements.adoc b/spec/src/main/asciidoc/ch02-requirements.adoc
index c5615df..72897af 100644
--- a/spec/src/main/asciidoc/ch02-requirements.adoc
+++ b/spec/src/main/asciidoc/ch02-requirements.adoc
@@ -56,23 +56,18 @@
mechanism ensures that if the default binding is not sufficient, it can
easily be overridden in a portable manner.
-==== JAX-WS 2.0
+==== Jakarta XML Web Services
===== Backward Compatibility
Mapping of XML Schema to schema derived Java
-classes as specified in versions of JAX-RPC 1.x either by default or by
+classes as specified in versions of Jakarta XML-RPC either by default or by
customization is out of scope.
===== Binding XML Schema to schema derived classes
A binding of XML Schema constructs to schema
-derived classes must be specified. JAXB 1.0 specified the binding of XML
-Schema constructs to schema derived interfaces. However, JAX-RPC 1.x
-specified the binding of XML Schema constructs to schema derived
-classes, not interfaces. To provide continued support for JAX-RPC 1.x
-programming model, a customization to enable the binding of XML Schema
-constructs to schema derived classes will be added.
+derived classes must be specified.
===== Accessing MIME content stored as an attachment
@@ -122,7 +117,7 @@
* customization mechanism using the JSR175
program annotation facility.
-==== JAX-WS 2.0
+==== Jakarta XML Web Services
===== WSDL <types>
@@ -136,7 +131,7 @@
===== Backward Compatibility
Mapping of existing Java constructs to XML
-Schema constructs as specified in JAX-RPC versions 1.x, either by
+Schema constructs as specified in Jakarta XML-RPC, either by
default or through customization, is out of scope.
=== Binding Framework
diff --git a/spec/src/main/asciidoc/ch05-java_representation.adoc b/spec/src/main/asciidoc/ch05-java_representation.adoc
index 1de8a3c..a9b81c0 100644
--- a/spec/src/main/asciidoc/ch05-java_representation.adoc
+++ b/spec/src/main/asciidoc/ch05-java_representation.adoc
@@ -899,11 +899,9 @@
An added benefit to the default binding
change is to reduce the overhead associated with always generating Java
-Element classes for every global element declaration.In JAXB 1.0, an
-interface was generated for every complex type definition and global
-element declaration. In JAXB 2.0, a value class is generated for every
-complex type definition and only a factory method needs to be generated
-for each global element declaration.
+Element classes for every global element declaration. A value class
+is generated for every complex type definition and only a factory
+method needs to be generated for each global element declaration.
=== Summary
diff --git a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
index c3b5947..13cfc93 100644
--- a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
+++ b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
@@ -850,8 +850,7 @@
JAXB provider.
The implementation class may have a
-dependency upon the runtime of the binding framework. Since a runtime
-was not specified for JAXB 1.0 interface/implementation binding, the
+dependency upon the runtime of the binding framework. The
implementation class may not be portable across JAXB provider
implementations. Hence one JAXB provider implementation is not required
to support the implementation class from another JAXB provider.
