From 4120dea82926caf6ea7ba3f3f024306e60dd39ac Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Tue, 29 Aug 2023 16:17:31 +0200 Subject: [PATCH] merge updates Signed-off-by: Lukas Jungmann --- spec/src/main/asciidoc/appH-binary_data.adoc | 4 ++-- spec/src/main/asciidoc/ch01-introduction.adoc | 4 ++-- spec/src/main/asciidoc/ch03-architecture.adoc | 6 +++--- .../main/asciidoc/ch05-java_representation.adoc | 14 +++++++------- .../src/main/asciidoc/ch06-binding_xml_schema.adoc | 6 +++--- .../main/asciidoc/ch07-customize_xml_schema.adoc | 4 ++-- spec/src/main/asciidoc/xml-binding-spec.adoc | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spec/src/main/asciidoc/appH-binary_data.adoc b/spec/src/main/asciidoc/appH-binary_data.adoc index 2b14bbe..d7aa6e4 100644 --- a/spec/src/main/asciidoc/appH-binary_data.adoc +++ b/spec/src/main/asciidoc/appH-binary_data.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation +// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation // [appendix] @@ -243,5 +243,5 @@ schema customization @attachmentRef of , specified in .JAXB marshal/unmarshalling of optimized binary content. [[opbin]] -image::xmlb-23.png[image] +image::xmlb-23.svg[image] diff --git a/spec/src/main/asciidoc/ch01-introduction.adoc b/spec/src/main/asciidoc/ch01-introduction.adoc index 89d523f..2679e0e 100644 --- a/spec/src/main/asciidoc/ch01-introduction.adoc +++ b/spec/src/main/asciidoc/ch01-introduction.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation +// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation // == [[a2]]Introduction @@ -120,7 +120,7 @@ to check incoming XML documents for validity with respect to the schema. + .Binding XML to Java objects -image::xmlb-2.png[image] +image::xmlb-2.svg[image] To sum up: Schemas describe the structure and meaning of an XML document, in much the same way that a class describes diff --git a/spec/src/main/asciidoc/ch03-architecture.adoc b/spec/src/main/asciidoc/ch03-architecture.adoc index 43b15a8..8d02ade 100644 --- a/spec/src/main/asciidoc/ch03-architecture.adoc +++ b/spec/src/main/asciidoc/ch03-architecture.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation +// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation // == Architecture @@ -48,7 +48,7 @@ between concepts introduced in this section. .Non-Normative Jakarta XML Binding Architecture diagram [[a210]] -image::xmlb-3.png[image] +image::xmlb-3.svg[image] JAXB-annotated classes are common to both binding schemes. They are either generated by a schema compiler or the @@ -62,7 +62,7 @@ within the schema or they can appear in an external binding file that is associated with the source schema. .JAXB 1.0 style binding of schema to interface/implementation classes. -image::xmlb-4.png[image] +image::xmlb-4.svg[image] Note that the application accesses only the schema-derived interfaces, factory methods and `jakarta.xml.bind` APIs diff --git a/spec/src/main/asciidoc/ch05-java_representation.adoc b/spec/src/main/asciidoc/ch05-java_representation.adoc index 66c13c4..72a42b7 100644 --- a/spec/src/main/asciidoc/ch05-java_representation.adoc +++ b/spec/src/main/asciidoc/ch05-java_representation.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation +// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation // == Java Representation of XML Content @@ -636,7 +636,7 @@ value. .States of a Property Value [[a623]] -image::xmlb-8.png[image] +image::xmlb-8.svg[image] *_Example:_* + In the purchase order schema, the `partNum` @@ -873,13 +873,13 @@ illustrate the binding changes for the following schema fragment: ---- .JAXB 1.0: isA Relationship between generated element interface and its type -image::xmlb-9.png[image] +image::xmlb-9.svg[image] .Jakarta XML Binding: hasA Relationship between element instance and its type as described in <> -image::xmlb-10.png[image] +image::xmlb-10.svg[image] .Jakarta XML Binding: hasA Relationship between generated element class and its type as described in <> -image::xmlb-11.png[image] +image::xmlb-11.svg[image] While a JAXB 1.0 Element interface implemented its type’s interface, a Jakarta XML Binding Element instance has a @@ -902,10 +902,10 @@ Java components introduced in this section are reflected in the following diagram. .UML diagram of Java Representationfootnote:[See next figure fordefault binding for anonymous type definition.] -image::xmlb-12.png[image] +image::xmlb-12.svg[image] .UML diagram when xs:element is bound to schema-derived Element class -image::xmlb-13.png[image] +image::xmlb-13.svg[image] See also <>. diff --git a/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc b/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc index fd28e8f..281e26e 100644 --- a/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc +++ b/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation +// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation // == Binding XML Schema to Java Representations @@ -1045,7 +1045,7 @@ illustrated in <>. .Binding for a reference to a model group definition. [[a999]] -image::xmlb-16.png[image] +image::xmlb-16.svg[image] This binding style results in the same properties occurring within both Java value class’s A and C to represent @@ -1155,7 +1155,7 @@ is bound to a Java value class with the name _FooBar_. The following figure illustrates this example. .Default binding for anonymous type def within a model group definition. -image::xmlb-17.png[image] +image::xmlb-17.svg[image] Note that even customization specified Java diff --git a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc index 45166a3..6fe2d57 100644 --- a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc +++ b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation +// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation // == Customizing XML Schema to Java Representation Binding @@ -287,7 +287,7 @@ applies only to the schema element that was annotated with the binding declaration. .Scoping Inheritance and Overriding For Binding Declarations -image::xmlb-18.png[image] +image::xmlb-18.svg[image] The different scopes form a taxonomy. The taxonomy defines both the inheritance and overriding semantics of diff --git a/spec/src/main/asciidoc/xml-binding-spec.adoc b/spec/src/main/asciidoc/xml-binding-spec.adoc index bd9165d..77cbb7e 100644 --- a/spec/src/main/asciidoc/xml-binding-spec.adoc +++ b/spec/src/main/asciidoc/xml-binding-spec.adoc @@ -1,5 +1,5 @@ // -// Copyright (c) 2017, 2020 Contributors to the Eclipse Foundation +// Copyright (c) 2017, 2023 Contributors to the Eclipse Foundation // = Jakarta XML Binding