From 858aeea4eedb1439a1b338beb577fdc2461577a9 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Mon, 24 Nov 2014 15:33:02 +0100
Subject: [PATCH] Adding more links

---
 Sd1/swd1.xml     |  45 ++++++++++++++----
 bibliography.xml | 119 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 127 insertions(+), 37 deletions(-)

diff --git a/Sd1/swd1.xml b/Sd1/swd1.xml
index 94bd66263..634a8dbb8 100644
--- a/Sd1/swd1.xml
+++ b/Sd1/swd1.xml
@@ -94,16 +94,43 @@
           <glossterm>Books / Literature</glossterm>
 
           <glossdef>
-            <itemizedlist>
-              <listitem>
-                <para><xref linkend="bib_Koelling2010"/> or <xref
-                linkend="bib_Koelling2010Ger"/>.</para>
-              </listitem>
+            <glosslist>
+              <glossentry>
+                <glossterm>Primary</glossterm>
 
-              <listitem>
-                <para><xref linkend="bib_Horton2011"/></para>
-              </listitem>
-            </itemizedlist>
+                <glossdef>
+                  <itemizedlist>
+                    <listitem>
+                      <para><xref linkend="bib_Koelling2010"/> or <xref
+                      linkend="bib_Koelling2010Ger"/>.</para>
+                    </listitem>
+
+                    <listitem>
+                      <para><xref linkend="bib_Horton2011"/></para>
+                    </listitem>
+                  </itemizedlist>
+                </glossdef>
+              </glossentry>
+
+              <glossentry>
+                <glossterm>Secondary</glossterm>
+
+                <glossdef>
+                  <itemizedlist>
+                    <listitem>
+                      <para><xref linkend="bib_Jobst2014"/>.</para>
+                    </listitem>
+
+                    <listitem>
+                      <para>Older free online copy <xref
+                      linkend="bib_Ullenboom2011"/> or current book <xref
+                      linkend="bib_Ullenboom2014"/> including <xref
+                      linkend="glo_Java"/> 8.</para>
+                    </listitem>
+                  </itemizedlist>
+                </glossdef>
+              </glossentry>
+            </glosslist>
           </glossdef>
         </glossentry>
 
diff --git a/bibliography.xml b/bibliography.xml
index ed42951f2..eeb582c87 100644
--- a/bibliography.xml
+++ b/bibliography.xml
@@ -7,7 +7,6 @@
               xmlns:html="http://www.w3.org/1999/xhtml"
               xmlns:db="http://docbook.org/ns/docbook">
   <title>Bibliographic links</title>
-  
 
   <biblioentry xml:id="bib_Bauer05">
     <abbrev>Bauer05</abbrev>
@@ -218,25 +217,48 @@
 
   <biblioentry xml:id="bib_Horton2011">
     <abbrev>Horton2011</abbrev>
-    
+
     <author>
       <personname>Ivor Horton</personname>
     </author>
-    
+
     <date>2011</date>
-    
+
     <biblioid class="isbn">978-0-470-40414-0</biblioid>
-    
+
     <publisher>
       <publishername>Wrox / Wiley</publishername>
     </publisher>
-    
+
+    <title xlink:href="http://www.greenfoot.org/book"><productname
+    xlink:href="http://www.wrox.com/WileyCDA/WroxTitle/Ivor-Horton-s-Beginning-Java-Java-7-Edition.productCd-0470404140.html">Ivor
+    Horton's Beginning Java, Java 7 Edition</productname></title>
+  </biblioentry>
+
+  <biblioentry xml:id="bib_Jobst2014">
+    <abbrev>Jobst2014</abbrev>
+
+    <author>
+      <personname>Fritz Jobst</personname>
+    </author>
+
+    <date>11/2014</date>
+
+    <biblioid class="isbn" xml:lang="de">ISBN 978-3-446-44134-7
+    (Print)</biblioid>
+
+    <biblioid class="isbn">ISBN 978-3-446-44150-7 (PDF E-Book)</biblioid>
+
+    <edition>7. Auflage</edition>
+
+    <publisher>
+      <publishername>Hanser</publishername>
+    </publisher>
+
     <title xlink:href="http://www.greenfoot.org/book"><productname
-      xlink:href="http://www.wrox.com/WileyCDA/WroxTitle/Ivor-Horton-s-Beginning-Java-Java-7-Edition.productCd-0470404140.html">Ivor
-      Horton's Beginning Java, Java 7 Edition</productname></title>
+    xlink:href="http://www.wrox.com/WileyCDA/WroxTitle/Ivor-Horton-s-Beginning-Java-Java-7-Edition.productCd-0470404140.html">Programmieren
+    in JAVA</productname></title>
   </biblioentry>
-  
-  
 
   <biblioentry xml:id="bib_Keith09">
     <abbrev>Keith09</abbrev>
@@ -289,48 +311,45 @@
 
     <title>SQL in a nutshell</title>
   </biblioentry>
-  
+
   <biblioentry xml:id="bib_Koelling2010">
     <abbrev>Koelling2010</abbrev>
-    
+
     <author>
       <personname>Michael Kölling</personname>
     </author>
-    
+
     <date>2010</date>
-    
+
     <biblioid class="isbn">978-0-13-603753-8</biblioid>
-    
+
     <publisher>
       <publishername>Prentice Hall</publishername>
     </publisher>
-    
+
     <title xlink:href="http://www.greenfoot.org/book">Introduction to
-      Programming with <productname>Greenfoot</productname></title>
+    Programming with <productname>Greenfoot</productname></title>
   </biblioentry>
-  
+
   <biblioentry xml:id="bib_Koelling2010Ger">
     <abbrev>Koelling2010Ger</abbrev>
-    
+
     <author>
       <personname>Michael Kölling</personname>
     </author>
-    
+
     <date>2010</date>
-    
+
     <biblioid class="isbn">978-3-8689-4902-5</biblioid>
-    
+
     <publisher>
       <publishername>Prentice Hall</publishername>
     </publisher>
-    
+
     <title xlink:href="http://www.greenfoot.org/book"><productname
-      xlink:href="http://www.pearson-studium.de/386894902X.html">Einführung in
-      Java mit Greenfoot</productname></title>
+    xlink:href="http://www.pearson-studium.de/386894902X.html">Einführung in
+    Java mit Greenfoot</productname></title>
   </biblioentry>
-  
-  
-  
 
   <biblioentry xml:id="bib_Patel96">
     <abbrev>Patel96</abbrev>
@@ -387,6 +406,50 @@
     <abbrev>JAXP</abbrev></title>
   </biblioentry>
 
+  <biblioentry xml:id="bib_Ullenboom2011">
+    <abbrev>Ullenboom2011</abbrev>
+
+    <author>
+      <personname><link
+      xlink:href="https://www.galileo-press.de/java-ist-auch-eine-insel_2672/autor">Christian
+      Ullenboom</link></personname>
+    </author>
+
+    <date>2011</date>
+
+    <biblioid class="isbn" xml:lang="de">978-3-8362-1802-3</biblioid>
+
+    <edition>10. Auflage</edition>
+
+    <publisher>
+      <publishername>Galileo</publishername>
+    </publisher>
+
+    <title>Java ist auch eine Insel </title>
+  </biblioentry>
+
+  <biblioentry xml:id="bib_Ullenboom2014">
+    <abbrev>Ullenboom2014</abbrev>
+
+    <author>
+      <personname><link
+      xlink:href="https://www.galileo-press.de/java-ist-auch-eine-insel_2672/autor">Christian
+      Ullenboom</link></personname>
+    </author>
+
+    <date>05/2014</date>
+
+    <biblioid class="isbn" xml:lang="de">978-3-8362-2873-2</biblioid>
+
+    <edition>11. Auflage</edition>
+
+    <publisher>
+      <publishername>Galileo</publishername>
+    </publisher>
+
+    <title>Java ist auch eine Insel</title>
+  </biblioentry>
+
   <biblioentry xml:id="bib_Walmsley02">
     <abbrev>Walmsley02</abbrev>
 
-- 
GitLab