diff --git a/Doc/Sda1/Ref/Video/eclipseBasicSql.txt b/Doc/Sda1/Ref/Video/eclipseBasicSql.txt
deleted file mode 100644
index 53ee752eac953fc03cd8f997408ea9adae77858e..0000000000000000000000000000000000000000
--- a/Doc/Sda1/Ref/Video/eclipseBasicSql.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-a.ogv:
-
-This video illustrates the usage of eclipse's database tools
-to cummunicate with a database server.
-
-
-We start bei creating a new Java project ... Structured...
-... and switch to the
-database development perspective.
-
-
-Adding the Navigator view to the perspective is helpful.
-
-We drag the navigator next to the
-Data Source Explorer ...
-
-b.ogv:
-We create a Subfolder Sql ...
-and within a new file schema.sql
-
-c.ogv
-
-Our intention is to store some personal data:
-
-CREATE TABLE Person (
- name CHAR(15) NOT NULL primary key
- ,email CHAR(20)
-)
-
-We open a connection to our database server ...
-and trigger the statement's execution.
-
-
-d.ogv
-
-The Person relation can now be populated with data:
-
-INSERT INTO Person VALUES('Jim', 'jim@pepper.org');
-INSERT INTO Person (name) VALUES('Eve');
-
-and we may read these enttries:
-
-SELECT * FROM Person
-
-Lets have a close look:
-
-So our data indeed reached the database server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Doc/Sda1/Ref/Video/eclipseBasicSql.webm b/Doc/Sda1/Ref/Video/eclipseBasicSql.webm
deleted file mode 100644
index 4ff101a78508f846fd8e3972fd94ffe0ce06b0d8..0000000000000000000000000000000000000000
Binary files a/Doc/Sda1/Ref/Video/eclipseBasicSql.webm and /dev/null differ
diff --git a/Doc/Sda1/Ref/Video/jdbcConnection.txt b/Doc/Sda1/Ref/Video/jdbcConnection.txt
deleted file mode 100644
index 92cae95fdfd5526d5be582126d72a2e4fbed2a51..0000000000000000000000000000000000000000
--- a/Doc/Sda1/Ref/Video/jdbcConnection.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-This video demonstrates the configuration of a JDBC connection to a
-Mysql database server
-
-
-
-
-Opening the Database development perspective
-
-
-
-
-We add a new connection to the yet emty set
-
-
-
-
-The name field allows to easily distinguish between multiple JDBC
-connection profiles later
-
-
-
-
-The template values are quite fine but our database is named hdm
-
-
-
-
-We take the credentials of our preconfigured Mysql Account "hdmuser"
-
-
-
-
-Success!
-
-
-
-
-The connection is ready to use. For now we just browse the
-server's structure
-
-
-
-
-Our database hdm does not contain any tables yes
diff --git a/Doc/Sda1/Ref/Video/jdbcConnection.webm b/Doc/Sda1/Ref/Video/jdbcConnection.webm
deleted file mode 100644
index f5dbcde7964452f93d8d6622bab7f724bb4fa19c..0000000000000000000000000000000000000000
Binary files a/Doc/Sda1/Ref/Video/jdbcConnection.webm and /dev/null differ
diff --git a/Doc/Sda1/Ref/Video/jdbcDriverConfig.txt b/Doc/Sda1/Ref/Video/jdbcDriverConfig.txt
deleted file mode 100644
index c3f9fa4adc4a78ea12db2e73921933c8d8e0a52b..0000000000000000000000000000000000000000
--- a/Doc/Sda1/Ref/Video/jdbcDriverConfig.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-This video shows the configuration of a JDBC driver
-inside the eclipse Data management plugin
-
-We open Data Management in preferences and select Driver definitions" below "Connectivity"
-
-No JDBC driver has yet been configured. We add a new
-profile.
-
-
-We limit our choices to Drivers of type Mysql and
-choose the appropriate version 5.1
-
-
-The error indicates a missing Jar implementation. We
-remove the dummy and add a Driver from our local
-filesystem
-
-
-Our new profile is ready to use.
diff --git a/Doc/Sda1/Ref/Video/jdbcDriverConfig.webm b/Doc/Sda1/Ref/Video/jdbcDriverConfig.webm
deleted file mode 100644
index 7f4d075a8af6576bff314c965ecfab306d700902..0000000000000000000000000000000000000000
Binary files a/Doc/Sda1/Ref/Video/jdbcDriverConfig.webm and /dev/null differ
diff --git a/Doc/Sda1/prerequisites.xml b/Doc/Sda1/prerequisites.xml
index 1ccd7caaa4554da08189a31adf004e7daee565ae..102168c6a4e1c0ca62c54a3b470441186200d4f7 100644
--- a/Doc/Sda1/prerequisites.xml
+++ b/Doc/Sda1/prerequisites.xml
@@ -166,14 +166,14 @@
<section xml:id="eclipse">
<title><productname
xlink:href="http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html">JDK</productname>
- and Eclipse</title>
+ and IntelliJ IDEA</title>
<para>So you like to take the hard way rather than using <link
xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.vdi">the
virtualbox image</link>? Good! Real programmers tend to complicate
things!</para>
- <para>The Eclipse IDE will be used as the primary coding tool especially
+ <para>The Idea IDE will be used as the primary coding tool especially
for <xref linkend="glo_Java"/> and XML. Users may use different tools
like e.g. <productname
xlink:href="https://netbeans.org">Netbeans</productname> or <productname
@@ -192,21 +192,6 @@
</listitem>
</itemizedlist>
- <para>Installation of eclipse requires a suitable <xref
- linkend="glo_Java"/> Development Kit.</para>
-
- <caution>
- <para>Your <productname
- xlink:href="http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html">JDK</productname>
- selection may be affected by your system's hardware. On a 64 bit
- system you may install either a 32 bit or a 64 bit <productname
- xlink:href="http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html">JDK</productname>.
- If you subsequently install eclipse you must select the appropriate 32
- or 64 Bit version matching your <productname
- xlink:href="http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html">JDK</productname>
- choice.</para>
- </caution>
-
<para>Due to Oracle's (end-user unfriendly) licensing policy you may
have to install this component manually. For <productname
xlink:href="http://www.ubuntu.com">Ubuntu</productname> and <productname
@@ -235,18 +220,6 @@ apt-get install oracle-jdk8-installer</screen>
java version "1.8.0_60"
Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)</screen>
-
- <para>The Eclipse IDE comes <link
- xlink:href="https://www.eclipse.org/downloads">with various
- flavours</link> depending on which plugins are already being shipped.
- For our purposes <quote><productname>Eclipse IDE for Java EE
- Developers</productname></quote> is appropriate. Remember to download
- the correct 32 or 64 bit version corresponding to your<productname
- xlink:href="http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html">JDK</productname>.</para>
-
- <para>Follow <uri
- xlink:href="https://askubuntu.com/questions/26632/how-to-install-eclipse#answer-145018">http://askubuntu.com/questions/26632/how-to-install-eclipse#answer-145018</uri>
- to install eclipse on your system.</para>
</section>
<section xml:id="oxygenxmlInstall">
@@ -263,14 +236,6 @@ Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)</screen>
key.</para>
</section>
- <section xml:id="erMaster">
- <title>ERMaster</title>
-
- <para>Visual editing of physical entity relationship diagrams. See <link
- xlink:href="http://ermaster.sourceforge.net">installation
- instructions</link> on top of an existing eclipse installation.</para>
- </section>
-
<section xml:id="mysql">
<title><productname
xlink:href="https://www.mysql.com">Mysql</productname> Database
@@ -413,74 +378,6 @@ lrwxrwxrwx 1 ... 2011 <emphasis role="bold">mysql.jar -> mysql-connector-java
xlink:href="https://www.jetbrains.com/help/idea/connecting-to-a-database.html#mysql">https://www.jetbrains.com/help/idea/connecting-to-a-database.html#mysql</uri>.</para>
</section>
- <section xml:id="toolingConfigJdbc">
- <title>Configuring and using the <link
- xlink:href="https://www.eclipse.org/datatools">Eclipse database
- development</link> plugin</title>
-
- <para>For some basic SQL communications the Eclipse environment offers
- a standard plugin (Database development). Establishing connections to
- a specific database server generally requires prior installation of a
- <trademark
- xlink:href="https://en.wikipedia.org/wiki/Java_Database_Connectivity">JDBC</trademark>
- driver on the client side as being shown in the following
- video:</para>
-
- <figure xml:id="figureConfigJdbcDriver">
- <title>Adding a <trademark
- xlink:href="https://en.wikipedia.org/wiki/Java_Database_Connectivity">JDBC</trademark>
- Driver for <productname
- xlink:href="https://www.mysql.com">Mysql</productname> to the
- database plugin.</title>
-
- <mediaobject>
- <videoobject>
- <videodata fileref="Ref/Video/jdbcDriverConfig.webm"/>
- </videoobject>
- </mediaobject>
- </figure>
-
- <para>During the exercises the eclipse database development
- perspective may be used to browse and structure SQL tables and data.
- The following video demonstrates the configuration of a <trademark
- xlink:href="https://en.wikipedia.org/wiki/Java_Database_Connectivity">JDBC</trademark>
- connection to a local (<varname>localhost</varname> network interface)
- database server. With respect to the introduction given in <xref
- linkend="mysql"/> we assume the existence of a database
- <code>hdm</code> and a corresponding account <quote>hdmuser</quote>
- and password <quote><code>XYZ</code></quote> (<emphasis
- role="bold">capital letters!</emphasis>) on our database
- server.</para>
-
- <figure xml:id="figureConfigJdbcConnection">
- <title>Configuring a <trademark
- xlink:href="https://en.wikipedia.org/wiki/Java_Database_Connectivity">JDBC</trademark>
- connection to a (local) <productname
- xlink:href="https://www.mysql.com">Mysql</productname> database
- server.</title>
-
- <mediaobject>
- <videoobject>
- <videodata fileref="Ref/Video/jdbcConnection.webm"/>
- </videoobject>
- </mediaobject>
- </figure>
-
- <para>We are now ready to communicate with our database server. The
- last video in this section shows some basic SQL tasks:</para>
-
- <figure xml:id="figureEclipseBasicSql">
- <title>Executing SQL statements, browsing schema and retrieving
- data</title>
-
- <mediaobject>
- <videoobject>
- <videodata fileref="Ref/Video/eclipseBasicSql.webm"/>
- </videoobject>
- </mediaobject>
- </figure>
- </section>
-
<section xml:id="sda1ConfigOracleSqldevelop">
<title>Configuring <productname
xlink:href="http://www.oracle.com/technetwork/developer-tools/sql-developer">Oracle
diff --git a/Doc/Sda1/xmlintro.xml b/Doc/Sda1/xmlintro.xml
index 3185c59e1dac58017ce1f0c4ef9a2bc5ada73d64..5189b01316ef7ebefd4cd64a14e865338450caa4 100644
--- a/Doc/Sda1/xmlintro.xml
+++ b/Doc/Sda1/xmlintro.xml
@@ -86,7 +86,8 @@
<itemizedlist>
<listitem>
- <para>Tons of well-defined standards i.e. SOAP,...</para>
+ <para>Tons of well-defined <link
+ xlink:href="https://www.w3.org/standards/xml">standards</link>.</para>
<!-- Add W3C standards list examples-->
</listitem>
@@ -94,7 +95,7 @@
<listitem>
<para>Tons of sound framework implementations.</para>
- <!-- Add parsers / JAXB/JDK, XSLT, FOP,...-->
+ <!-- Parsers, JAXB, XSLT, FOP, ...-->
</listitem>
</itemizedlist>
</figure>
@@ -215,7 +216,7 @@
<listitem>
<para>Nesting rules e.g. <quote>The <tag class="starttag">body</tag>
element may contain <tag class="starttag">p</tag>, <tag
- class="starttag">ul</tag>, <tag class="starttag">table</tag>,...
+ class="starttag">ul</tag>, <tag class="starttag">table</tag> etc.
elements</quote>.</para>
</listitem>
@@ -227,7 +228,7 @@
</listitem>
<listitem>
- <para>Visualization capable software (renderer).</para>
+ <para>Visualization software (renderer).</para>
</listitem>
</itemizedlist>
</figure>
@@ -573,7 +574,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput>
<qandaset defaultlabel="qanda"
xml:id="sda1_xmlintro_quanda_attributeQuotes">
- <title>Single and double attribute value quotes </title>
+ <title>Single and double attribute value quotes</title>
<qandadiv>
<qandaentry>
diff --git a/Doc/Sda1/xmlschema.xml b/Doc/Sda1/xmlschema.xml
index 7e26b99bb55d5df42888a058320a327ac0f1c3cd..c98b7b7eb8fa049063cf69d945a2dfd8bcc7b0aa 100644
--- a/Doc/Sda1/xmlschema.xml
+++ b/Doc/Sda1/xmlschema.xml
@@ -2920,101 +2920,6 @@ public class Memo {
with building a schema usable to edit books. This schema gets extended
as our knowledge about XML advances. We start with an initial
exercise:</para>
-
- <qandaset defaultlabel="qanda" xml:id="example_bookDtd">
- <title>A schema for editing books</title>
-
- <qandadiv>
- <qandaentry>
- <question>
- <para>Write a schema describing book document instances with the
- following features:</para>
-
- <itemizedlist>
- <listitem>
- <para>A book shall have a title to describe the book
- itself.</para>
- </listitem>
-
- <listitem>
- <para>A book shall have at least one but possibly a sequence
- of chapters.</para>
- </listitem>
-
- <listitem>
- <para>Each chapter shall have a title and at least one
- paragraph.</para>
- </listitem>
-
- <listitem>
- <para>The titles and paragraphs shall consist of ordinary
- text.</para>
- </listitem>
- </itemizedlist>
- </question>
-
- <answer>
- <para>A possible schema looks like:</para>
-
- <figure xml:id="figure_book.dtd_v1">
- <title>A first schema version for book documents</title>
-
- <programlisting language="xml"><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified"
- vc:minVersion="1.0" vc:maxVersion="1.1">
-
- <xs:element name="book">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="title"/>
- <xs:element ref="chapter" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="title" type="xs:string"/>
- <xs:element name="chapter">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="title"/>
- <xs:element ref="para" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="para" type="xs:string"/>
-
-</xs:schema></programlisting>
- </figure>
-
- <para>We supply a valid document instance:</para>
-
- <informalfigure xml:id="bookInitialInstance">
- <programlisting language="xml"><?xml version="1.0" encoding="UTF-8"?>
-<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="book.xsd">
- <title>Introduction to Java</title>
- <chapter>
- <title>Introduction</title>
- <para>Java is a programming language</para>
- </chapter>
- <chapter>
- <title>The virtual machine</title>
- <para>We also call it the runtime system.</para>
- </chapter>
- <chapter>
- <title>Annotations</title>
- <para>Annotations provide a means to add meta information.</para>
- <para>This is especially useful for framework authors.</para>
- </chapter>
-</book></programlisting>
- </informalfigure>
-
- <para>.</para>
- </answer>
- </qandaentry>
- </qandadiv>
- </qandaset>
</section>
<section xml:id="dtdVsSqlDdl">
@@ -3664,6 +3569,101 @@ public class Memo {
<section xml:id="sectQandaBookV1">
<title>Book documents</title>
+ <qandaset defaultlabel="qanda" xml:id="example_bookDtd">
+ <title>A schema for editing books</title>
+
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para>Write a schema describing book document instances with
+ the following features:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>A book shall have a title to describe the book
+ itself.</para>
+ </listitem>
+
+ <listitem>
+ <para>A book shall have at least one but possibly a
+ sequence of chapters.</para>
+ </listitem>
+
+ <listitem>
+ <para>Each chapter shall have a title and at least one
+ paragraph.</para>
+ </listitem>
+
+ <listitem>
+ <para>The titles and paragraphs shall consist of ordinary
+ text.</para>
+ </listitem>
+ </itemizedlist>
+ </question>
+
+ <answer>
+ <para>A possible schema looks like:</para>
+
+ <figure xml:id="figure_book.dtd_v1">
+ <title>A first schema version for book documents</title>
+
+ <programlisting language="xml"><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified"
+ vc:minVersion="1.0" vc:maxVersion="1.1">
+
+ <xs:element name="book">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="title"/>
+ <xs:element ref="chapter" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="title" type="xs:string"/>
+ <xs:element name="chapter">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="title"/>
+ <xs:element ref="para" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="para" type="xs:string"/>
+
+</xs:schema></programlisting>
+ </figure>
+
+ <para>We supply a valid document instance:</para>
+
+ <informalfigure xml:id="bookInitialInstance">
+ <programlisting language="xml"><?xml version="1.0" encoding="UTF-8"?>
+<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="book.xsd">
+ <title>Introduction to Java</title>
+ <chapter>
+ <title>Introduction</title>
+ <para>Java is a programming language</para>
+ </chapter>
+ <chapter>
+ <title>The virtual machine</title>
+ <para>We also call it the runtime system.</para>
+ </chapter>
+ <chapter>
+ <title>Annotations</title>
+ <para>Annotations provide a means to add meta information.</para>
+ <para>This is especially useful for framework authors.</para>
+ </chapter>
+</book></programlisting>
+ </informalfigure>
+
+ <para>.</para>
+ </answer>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+
<qandaset defaultlabel="qanda" xml:id="example_operatorprecedence">
<title>Book documents with mixed content and itemized lists</title>
@@ -3832,13 +3832,9 @@ public class Memo {
</qandaentry>
</qandadiv>
</qandaset>
- </section>
-
- <section xml:id="sectQandaBookLang">
- <title>Allow different languages</title>
<qandaset defaultlabel="qanda" xml:id="example_book.dtd_v3">
- <title>book.xsd and languages</title>
+ <title><filename>book.xsd</filename> and languages</title>
<qandadiv>
<qandaentry>
@@ -3917,13 +3913,11 @@ public class Memo {
</qandaentry>
</qandadiv>
</qandaset>
- </section>
-
- <section xml:id="sda1SectSetInternRef">
- <title>Supporting <tag class="starttag">table</tag> and internal
- references in <filename>book.xsd</filename>.</title>
<qandaset defaultlabel="qanda" xml:id="example_book.dtd_v5">
+ <title>Supporting <tag class="starttag">table</tag> and internal
+ references in <filename>book.xsd</filename>.</title>
+
<qandadiv>
<qandaentry>
<question>