Skip to content

Commit

Permalink
merge updates
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Sep 4, 2023
1 parent feda7e3 commit 10f8e1a
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions spec/src/main/asciidoc/appH-binary_data.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation
//

[appendix]
Expand Down Expand Up @@ -243,5 +243,5 @@ schema customization @attachmentRef of <jaxb:property>, specified in

.JAXB marshal/unmarshalling of optimized binary content.
[[opbin]]
image::xmlb-23.png[image]
image::xmlb-23.svg[image]

4 changes: 2 additions & 2 deletions spec/src/main/asciidoc/ch01-introduction.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation
//

== [[a2]]Introduction
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions spec/src/main/asciidoc/ch03-architecture.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
// Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation
//

== Architecture
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions spec/src/main/asciidoc/ch05-java_representation.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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`
Expand Down Expand Up @@ -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 <<Named Java Element instance>>
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 <<Java Element Class>>
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
Expand All @@ -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 <<table614>>.

Expand Down
6 changes: 3 additions & 3 deletions spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -1045,7 +1045,7 @@ illustrated in <<a999>>.

.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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/src/main/asciidoc/xml-binding-spec.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 10f8e1a

Please sign in to comment.