From 3b2742bc86f4f465f4d44d2a2fc85a40ba027a46 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 27 Nov 2014 21:54:11 +0100
Subject: [PATCH] Glossary entries
---
Sda2/sda2.xml | 43 +++++++++++++++++++++++++++++--------------
glossary.xml | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/Sda2/sda2.xml b/Sda2/sda2.xml
index 24af4a0d9..345dc59ca 100644
--- a/Sda2/sda2.xml
+++ b/Sda2/sda2.xml
@@ -732,6 +732,19 @@
</mediaobject>
</figure>
+ <para>An interfering transaction obeying the protocol causes a
+ transaction failure:</para>
+
+ <figure xml:id="concurrentObtimisticFail">
+ <title>Failure with optimistic transactions</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/Fig/concurrentOptimisticFail.svg"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>Considerations:</para>
<itemizedlist>
@@ -2204,7 +2217,8 @@
</section>
<section xml:id="sectionXmlJpaJaxb">
- <title>Xml to JPA using Jaxb</title>
+ <title><xref linkend="glo_XML"/> to <xref linkend="glo_JPA"/> using
+ <xref linkend="glo_JAXB"/></title>
<para>Consider the following Xml dataset example:</para>
@@ -2237,8 +2251,8 @@
<qandadiv>
<qandaentry>
<question>
- <para>Create a suitable XML schema supplying to enforce the
- following integrity constraints:</para>
+ <para>Create a suitable XML schema enforcing the following
+ integrity constraints:</para>
<itemizedlist>
<listitem>
@@ -2305,21 +2319,22 @@
</section>
<section xml:id="sectionXmlJpaJaxbImport">
- <title>Importing Xml data to a RDBMS</title>
+ <title>Importing <xref linkend="glo_XML"/> data to a RDBMS</title>
<qandaset defaultlabel="qanda" xml:id="qandaXmlJpaJaxbImport">
- <title>Reading XML, write using JPA</title>
+ <title>Reading XML, write using <xref linkend="glo_JPA"/></title>
<qandadiv>
<qandaentry>
<question>
- <para>Read the given XML data example using Jaxb and persist
- the corresponding objects to a RDBMS. This requires the
- following steps:</para>
+ <para>Read the given XML data example using <xref
+ linkend="glo_JAXB"/> and persist the corresponding objects
+ to a RDBMS. This requires the following steps:</para>
<itemizedlist>
<listitem>
- <para>Use the JaxB schema compiler <command
+ <para>Use the <xref linkend="glo_JAXB"/> schema compiler
+ <command
xlink:href="http://docs.oracle.com/javase/8/docs/technotes/tools/unix/xjc.html">xjc</command>
accordingly to create domain classes corresponding to
<tag class="starttag">catalog</tag> and <tag
@@ -2337,8 +2352,8 @@
</listitem>
<listitem>
- <para>Supply <acronym>JPA</acronym> annotations to the
- <command
+ <para>Supply <xref linkend="glo_JPA"/> annotations to
+ the <command
xlink:href="http://docs.oracle.com/javase/8/docs/technotes/tools/unix/xjc.html">xjc</command>
generated
<classname>de.hdm_stuttgart.mi.sda2.jpa.cd.domain.Catalog</classname>
@@ -2348,7 +2363,7 @@
<para>Hint: The Maven archetype <link
xlink:href="http://maven-repository.com/artifact/com.github.lalyos/standalone-jpa-eclipselink-archetype">standalone-jpa-eclipselink-archetype</link>
- may help getting started with <acronym>JPA</acronym>
+ may help getting started with <xref linkend="glo_JPA"/>
configuration issues. You may want to add <link
xlink:href="http://repo1.maven.org/maven2/archetype-catalog.xml">http://repo1.maven.org/maven2/archetype-catalog.xml</link>
to your list of archetype repositories.</para>
@@ -3736,8 +3751,8 @@
<question>
<para>Replace <classname>java.util.Set</classname> by
<classname>java.util.List</classname> and assure that the
- order of components is being preserved in a JPA2 compliant
- manner.</para>
+ order of components is being preserved in a <xref
+ linkend="glo_JPA"/> 2 compliant manner.</para>
</question>
</qandaentry>
</qandadiv>
diff --git a/glossary.xml b/glossary.xml
index 176b4b94b..6ed589999 100644
--- a/glossary.xml
+++ b/glossary.xml
@@ -172,6 +172,33 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="glo_JAXB">
+ <glossterm>Jaxb</glossterm>
+
+ <glossdef>
+ <para>Java Architecture for XML Binding</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><link xlink:href="https://jaxb.java.net">JAXB
+ homepage</link></para>
+ </listitem>
+
+ <listitem>
+ <para><link
+ xlink:href="https://docs.oracle.com/javase/tutorial/jaxb">Oracle
+ tutorial</link></para>
+ </listitem>
+
+ <listitem>
+ <para><link
+ xlink:href="https://www.jcp.org/en/jsr/detail?id=222">JSR 222:
+ JavaTM Architecture for XML Binding (JAXB) 2.0</link></para>
+ </listitem>
+ </itemizedlist>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="glo_Jar">
<glossterm><acronym>Jar</acronym></glossterm>
@@ -421,6 +448,14 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="glo_xjc">
+ <glossterm>xjc</glossterm>
+
+ <glossdef>
+ <para/>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="glo_XML">
<glossterm><acronym>XML</acronym></glossterm>
--
GitLab