Skip to content

Commit 5a561bc

Browse files
poutsmapoutsma
committed
Minor changes to OXM chapter
1 parent 1facd45 commit 5a561bc

File tree

4 files changed

+66
-19
lines changed

4 files changed

+66
-19
lines changed

‎spring-framework-reference/images/oxm-exceptions.png

20.3 KB
Loading

‎spring-framework-reference/images/oxm-exceptions.svg

+48
Loading

‎spring-framework-reference/src/oxm.xml

+13-18
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,21 @@ public interface Marshaller {
7878
<tgroup cols="2">
7979
<thead>
8080
<row>
81-
<entry><interfacename>javax.xml.transform.Result</interfacename> implementation</entry>
81+
<entry><interfacename>Result</interfacename> implementation</entry>
8282
<entry>Wraps XML representation</entry>
8383
</row>
8484
</thead>
8585
<tbody>
8686
<row>
87-
<entry><classname>javax.xml.transform.dom.DOMResult</classname></entry>
87+
<entry><classname>DOMResult</classname></entry>
8888
<entry><interfacename>org.w3c.dom.Node</interfacename></entry>
8989
</row>
9090
<row>
91-
<entry><classname>javax.xml.transform.sax.SAXResult</classname></entry>
91+
<entry><classname>SAXResult</classname></entry>
9292
<entry><interfacename>org.xml.sax.ContentHandler</interfacename></entry>
9393
</row>
9494
<row>
95-
<entry><interfacename>javax.xml.transform.stream.StreamResult</interfacename></entry>
95+
<entry><interfacename>StreamResult</interfacename></entry>
9696
<entry>
9797
<classname>java.io.File</classname>,
9898
<classname>java.io.OutputStream</classname>, or
@@ -106,9 +106,9 @@ public interface Marshaller {
106106
<para>
107107
Although the <methodname>marshal</methodname> method accepts a plain object as its first
108108
parameter, most <classname>Marshaller</classname> implementations cannot handle arbitrary
109-
objects. Instead, an object class must be mapped in a mapping file, registered with the
110-
marshaller, or have a common base class. Refer to the further sections in this chapter to
111-
determine how your O/X technology of choice manages this.
109+
objects. Instead, an object class must be mapped in a mapping file, marked with an annotation,
110+
registered with the marshaller, or have a common base class. Refer to the further sections
111+
in this chapter to determine how your O/X technology of choice manages this.
112112
</para>
113113
</note>
114114
</para>
@@ -135,24 +135,24 @@ public interface Unmarshaller {
135135
<tgroup cols="2">
136136
<thead>
137137
<row>
138-
<entry><interfacename>javax.xml.transform.Source</interfacename> implementation</entry>
138+
<entry><interfacename>Source</interfacename> implementation</entry>
139139
<entry>Wraps XML representation</entry>
140140
</row>
141141
</thead>
142142
<tbody>
143143
<row>
144-
<entry><classname>javax.xml.transform.dom.DOMSource</classname></entry>
144+
<entry><classname>DOMSource</classname></entry>
145145
<entry><interfacename>org.w3c.dom.Node</interfacename></entry>
146146
</row>
147147
<row>
148-
<entry><classname>javax.xml.transform.sax.SAXSource</classname></entry>
148+
<entry><classname>SAXSource</classname></entry>
149149
<entry>
150150
<classname>org.xml.sax.InputSource</classname>, and
151151
<interfacename>org.xml.sax.XMLReader</interfacename>
152152
</entry>
153153
</row>
154154
<row>
155-
<entry><classname>javax.xml.transform.stream.StreamSource</classname></entry>
155+
<entry><classname>StreamSource</classname></entry>
156156
<entry>
157157
<classname>java.io.File</classname>,
158158
<classname>java.io.InputStream</classname>, or
@@ -185,13 +185,8 @@ public interface Unmarshaller {
185185
<para>
186186
The O/X Mapping exception hierarchy is shown in the following figure:
187187
<mediaobject>
188-
<imageobject role="fo">
189-
<imagedata fileref="src/docbkx/resources/images/oxm-exceptions.svg"
190-
format="SVG" align="center"/>
191-
</imageobject>
192-
<imageobject role="html">
193-
<imagedata fileref="images/oxm-exceptions.png"
194-
format="PNG" align="center"/>
188+
<imageobject>
189+
<imagedata fileref="images/oxm-exceptions.png" align="center"/>
195190
</imageobject>
196191
<caption>
197192
<para>

‎spring-framework-reference/src/spring-framework-reference.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,16 @@
9595
<firstname>Arjen</firstname>
9696
<surname>Poutsma</surname>
9797
</author>
98+
<author>
99+
<firstname>Tareq</firstname>
100+
<surname>Abed Rabbo</surname>
101+
</author>
98102
</authorgroup>
99103
<copyright>
100104
<year>2004-2009</year>
101105
<holder>Rod Johnson, Juergen Hoeller, Alef Arendsen, Colin Sampaleanu, Rob Harrop, Thomas Risberg, Darren Davison,
102106
Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis,
103-
Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma
107+
Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma, Tareq Abbed Rabbo
104108
</holder>
105109
</copyright>
106110
<legalnotice>

0 commit comments

Comments
 (0)