From 00c36c1705dd23f9279720c460da07e3539ead46 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 31 May 2017 20:42:09 +0200
Subject: [PATCH] Tidy up!

---
 pom.xml                                       |   1 -
 ws/Docbook/Config/chunk_custom.xsl            |  58 --
 ws/Docbook/Config/eclipse_custom.xsl          |  78 ---
 ws/Docbook/Config/epub_custom.xsl             |  55 --
 ws/Docbook/Config/print_custom.xsl            |  81 ---
 ws/Docbook/Config/webhelp_custom.xsl          |  80 ---
 .../xxe6/custom/DocBook v5+/custom.incl       |  33 --
 ws/Docbook/Config/xxe6/preferences.properties |  40 --
 ws/Docbook/Config/xxe6/spell/dict_de.txt      |  18 -
 ws/Docbook/Config/xxe6/spell/dict_en.txt      |  29 -
 ws/Docbook/Dbtools/.gitignore                 |   6 -
 .../org.eclipse.core.resources.prefs          |   4 -
 .../.settings/org.eclipse.jdt.core.prefs      |   5 -
 .../.settings/org.eclipse.m2e.core.prefs      |   4 -
 ws/Docbook/Dbtools/Testdata/method.xml        |  39 --
 ws/Docbook/Dbtools/pom.xml                    |  29 -
 .../mi/codeformat/Docbook2docbook.java        | 512 ------------------
 .../mi/codeformat/DomErrorHandler.java        |  36 --
 .../mi/codeformat/MyNamespaceContexts.java    |  26 -
 .../Dbtools/src/main/java/log4j.properties    |   9 -
 ws/Docbook/Id2topic/.gitignore                |   3 +
 ws/Docbook/Preprocess/Xsl/common.xsl          |  21 +
 ws/Docbook/Preprocess/Xsl/docbook2topics.xsl  |  15 +-
 ws/Docbook/Preprocess/make.rules              |   1 -
 24 files changed, 32 insertions(+), 1151 deletions(-)
 delete mode 100644 ws/Docbook/Config/chunk_custom.xsl
 delete mode 100644 ws/Docbook/Config/eclipse_custom.xsl
 delete mode 100644 ws/Docbook/Config/epub_custom.xsl
 delete mode 100644 ws/Docbook/Config/print_custom.xsl
 delete mode 100644 ws/Docbook/Config/webhelp_custom.xsl
 delete mode 100644 ws/Docbook/Config/xxe6/custom/DocBook v5+/custom.incl
 delete mode 100644 ws/Docbook/Config/xxe6/preferences.properties
 delete mode 100644 ws/Docbook/Config/xxe6/spell/dict_de.txt
 delete mode 100644 ws/Docbook/Config/xxe6/spell/dict_en.txt
 delete mode 100644 ws/Docbook/Dbtools/.gitignore
 delete mode 100644 ws/Docbook/Dbtools/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 ws/Docbook/Dbtools/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 ws/Docbook/Dbtools/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 ws/Docbook/Dbtools/Testdata/method.xml
 delete mode 100644 ws/Docbook/Dbtools/pom.xml
 delete mode 100644 ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/Docbook2docbook.java
 delete mode 100644 ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/DomErrorHandler.java
 delete mode 100644 ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/MyNamespaceContexts.java
 delete mode 100644 ws/Docbook/Dbtools/src/main/java/log4j.properties

diff --git a/pom.xml b/pom.xml
index 7d3bb13ca..470a356c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
 
 	<modules>
 		<module>ws/eclipse/HtmlExtensionTaglet</module>
-		<module>ws/Docbook/Dbtools</module>
 		<module>ws/eclipse/Jdbc</module>
 		<module>P</module>
 	</modules>
diff --git a/ws/Docbook/Config/chunk_custom.xsl b/ws/Docbook/Config/chunk_custom.xsl
deleted file mode 100644
index 08b2fc371..000000000
--- a/ws/Docbook/Config/chunk_custom.xsl
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--CREATED BY XMLmind XSL Customizer. PLEASE DO NOT EDIT BY HAND!-->
-<?stylesheet-label Multi page conversion parameters?>
-<xsl:stylesheet exclude-result-prefixes="NodeInfo cf d date doc dyn exsl fm l lxslt mml ng ptbl redirect s6hl saxon sbhl set sf simg stbl stext suwl sverb xhl ximg xlink xslthl xtbl xtext xverb"
-                version="1.0" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"
-                xmlns:xtext="xalan://com.nwalsh.xalan.Text"
-                xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
-                xmlns:xslthl="http://xslthl.sf.net"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics"
-                xmlns:xhl="http://net.sf.xslthl/ConnectorXalan"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:svg="http://www.w3.org/2000/svg"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:ssb="http://sideshowbarker.net/ns"
-                xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics"
-                xmlns:sf="http://sourceforge.net/"
-                xmlns:set="http://exslt.org/sets"
-                xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
-                xmlns:saxonb="http://saxon.sf.net/"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:mml="http://www.w3.org/1998/Math/MathML"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:date="http://exslt.org/dates-and-times"
-                xmlns:d="http://docbook.org/ns/docbook"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo">
-  <xsl:import href="xxe-config:docbook5/xsl/html/chunk.xsl"/>
-
-  <xsl:param name="chunk.section.depth">3</xsl:param>
-
-  <xsl:param name="graphicsize.use.img.src.path">1</xsl:param>
-
-  <xsl:param name="highlight.source">1</xsl:param>
-
-  <xsl:param name="id.warnings">1</xsl:param>
-
-  <xsl:param name="olink.debug">1</xsl:param>
-
-  <xsl:param name="use.id.as.filename">1</xsl:param>
-
-  <!-- REDEFINE PARAMETERS AND ATTRIBUTE-SETS HERE -->
-</xsl:stylesheet>
diff --git a/ws/Docbook/Config/eclipse_custom.xsl b/ws/Docbook/Config/eclipse_custom.xsl
deleted file mode 100644
index 0321969a7..000000000
--- a/ws/Docbook/Config/eclipse_custom.xsl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--CREATED BY XMLmind XSL Customizer. PLEASE DO NOT EDIT BY HAND!-->
-<?stylesheet-label Goik's lecture notes?>
-<xsl:stylesheet exclude-result-prefixes="NodeInfo cf d date doc dyn exsl fm l lxslt ng ptbl redirect s6hl saxon sbhl set sf simg stbl stext suwl sverb xhl ximg xlink xslthl xtbl xtext xverb"
-                version="1.0" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"
-                xmlns:xtext="xalan://com.nwalsh.xalan.Text"
-                xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
-                xmlns:xslthl="http://xslthl.sf.net"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics"
-                xmlns:xhl="http://net.sf.xslthl/ConnectorXalan"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:svg="http://www.w3.org/2000/svg"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:ssb="http://sideshowbarker.net/ns"
-                xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics"
-                xmlns:sf="http://sourceforge.net/"
-                xmlns:set="http://exslt.org/sets"
-                xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
-                xmlns:saxonb="http://saxon.sf.net/"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:m="http://www.w3.org/1998/Math/MathML"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:date="http://exslt.org/dates-and-times"
-                xmlns:d="http://docbook.org/ns/docbook"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo">
-  <xsl:import href="xxe-config:docbook5/xslCustom/eclipseHdm.xsl"/>
-
-  <xsl:param name="callout.graphics">0</xsl:param>
-
-  <xsl:param name="callout.unicode">1</xsl:param>
-
-  <xsl:param name="generate.toc">appendix  toc,title
-article/appendix  nop
-article   toc,title
-book      toc,title,figure,table,example,equation
-chapter   toc,title
-part      toc,title
-preface   toc,title
-reference toc,title
-sect1     toc
-sect2     toc
-sect3     toc
-sect4     toc
-sect5     toc
-section   toc
-set       toc,title</xsl:param>
-
-  <xsl:param name="graphicsize.use.img.src.path">0</xsl:param>
-
-  <xsl:param name="highlight.source">1</xsl:param>
-
-  <xsl:param name="id.warnings">1</xsl:param>
-
-  <xsl:param name="olink.debug">1</xsl:param>
-
-  <xsl:param name="ulink.target">_blank</xsl:param>
-
-  <xsl:param name="use.id.as.filename">1</xsl:param>
-
-  <!-- REDEFINE PARAMETERS AND ATTRIBUTE-SETS HERE -->
-</xsl:stylesheet>
diff --git a/ws/Docbook/Config/epub_custom.xsl b/ws/Docbook/Config/epub_custom.xsl
deleted file mode 100644
index 1a676cafc..000000000
--- a/ws/Docbook/Config/epub_custom.xsl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--CREATED BY XMLmind XSL Customizer. PLEASE DO NOT EDIT BY HAND!-->
-<?stylesheet-label Epub customization file?>
-<xsl:stylesheet exclude-result-prefixes="NodeInfo cf date db doc dyn exsl fm l lxslt ng ptbl redirect s6hl saxon sbhl set sf simg stbl stext suwl sverb uu uuid xhl ximg xlink xslthl xtbl xtext xverb"
-                version="1.0" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"
-                xmlns:xtext="xalan://com.nwalsh.xalan.Text"
-                xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
-                xmlns:xslthl="http://xslthl.sf.net"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics"
-                xmlns:xhl="http://net.sf.xslthl/ConnectorXalan"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:uuid="java:java.util.UUID"
-                xmlns:uu="java:com.xmlmind.util.URLUtil"
-                xmlns:svg="http://www.w3.org/2000/svg"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:ssb="http://sideshowbarker.net/ns"
-                xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics"
-                xmlns:sf="http://sourceforge.net/"
-                xmlns:set="http://exslt.org/sets"
-                xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
-                xmlns:saxonb="http://saxon.sf.net/"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                xmlns:opf="http://www.idpf.org/2007/opf"
-                xmlns:ns="http://www.w3.org/1999/xhtml"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/"
-                xmlns:m="http://www.w3.org/1998/Math/MathML"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:dcterms="http://purl.org/dc/terms/"
-                xmlns:dc="http://purl.org/dc/elements/1.1/"
-                xmlns:db="http://docbook.org/ns/docbook"
-                xmlns:date="http://exslt.org/dates-and-times"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo">
-  <xsl:import href="xxe-config:docbook5/xsl/epub/epub.xsl"/>
-
-  <xsl:param name="use.id.as.filename">1</xsl:param>
-
-  <!-- REDEFINE PARAMETERS AND ATTRIBUTE-SETS HERE -->
-</xsl:stylesheet>
diff --git a/ws/Docbook/Config/print_custom.xsl b/ws/Docbook/Config/print_custom.xsl
deleted file mode 100644
index b87f5fa0a..000000000
--- a/ws/Docbook/Config/print_custom.xsl
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--CREATED BY XMLmind XSL Customizer. PLEASE DO NOT EDIT BY HAND!-->
-<?stylesheet-label Print related customization parameters?>
-<xsl:stylesheet exclude-result-prefixes="NodeInfo d date doc dyn exsl fm l lxslt mml ng ptbl redirect s6hl saxon sbhl set sf stbl stext sverb xhl xlink xslthl xtbl xtext xverb"
-                version="1.0" xmlns:xverb="com.nwalsh.xalan.Verbatim"
-                xmlns:xtext="com.nwalsh.xalan.Text"
-                xmlns:xtbl="com.nwalsh.xalan.Table"
-                xmlns:xslthl="http://xslthl.sf.net"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xmp="http://ns.adobe.com/xap/1.0/"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:xhl="http://net.sf.xslthl/ConnectorXalan"
-                xmlns:xfc="http://www.xmlmind.com/foconverter/xsl/extensions"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:x="adobe:ns:meta/"
-                xmlns:svg="http://www.w3.org/2000/svg"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:ssb="http://sideshowbarker.net/ns"
-                xmlns:sf="http://sourceforge.net/"
-                xmlns:set="http://exslt.org/sets"
-                xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
-                xmlns:saxonb="http://saxon.sf.net/"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:mml="http://www.w3.org/1998/Math/MathML"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:fox2="http://xml.apache.org/fop/extensions"
-                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:dc="http://purl.org/dc/elements/1.1/"
-                xmlns:date="http://exslt.org/dates-and-times"
-                xmlns:d="http://docbook.org/ns/docbook"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo">
-  <xsl:import href="xxe-config:docbook5/xsl/fo/docbook.xsl"/>
-
-  <xsl:param name="generate.toc">appendix  toc,title
-article/appendix  nop
-article   toc,title
-book      toc,title,figure,table,example,equation
-part      toc,title</xsl:param>
-
-  <xsl:param name="glosslist.as.blocks">1</xsl:param>
-
-  <xsl:param name="insert.xref.page.number">1</xsl:param>
-
-  <xsl:param name="qanda.inherit.numeration">1</xsl:param>
-
-  <xsl:param name="sidebar.float.type">outside</xsl:param>
-
-  <xsl:param name="ulink.show">1</xsl:param>
-
-  <xsl:param name="use.extensions">1</xsl:param>
-
-  <xsl:param name="use.role.for.mediaobject"/>
-
-  <xsl:param name="xep.extensions">1</xsl:param>
-
-  <xsl:attribute-set name="olink.properties">
-    <xsl:attribute name="color">blue</xsl:attribute>
-  </xsl:attribute-set>
-
-  <xsl:attribute-set name="xref.properties">
-    <xsl:attribute name="color">blue</xsl:attribute>
-  </xsl:attribute-set>
-
-  <!-- REDEFINE PARAMETERS AND ATTRIBUTE-SETS HERE -->
-</xsl:stylesheet>
diff --git a/ws/Docbook/Config/webhelp_custom.xsl b/ws/Docbook/Config/webhelp_custom.xsl
deleted file mode 100644
index 6304e18ec..000000000
--- a/ws/Docbook/Config/webhelp_custom.xsl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--CREATED BY XMLmind XSL Customizer. PLEASE DO NOT EDIT BY HAND!-->
-<?stylesheet-label Local modifications?>
-<xsl:stylesheet exclude-result-prefixes="NodeInfo cf date db doc dyn exsl fm its l lxslt mml ng ptbl redirect s6hl saxon sbhl set sf simg stbl stext suwl sverb xhl ximg xlink xslthl xtbl xtext xverb"
-                version="1.0" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"
-                xmlns:xtext="xalan://com.nwalsh.xalan.Text"
-                xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
-                xmlns:xslthl="http://xslthl.sf.net"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics"
-                xmlns:xhl="http://net.sf.xslthl/ConnectorXalan"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:whc="http://www.xmlmind.com/whc/schema/whc"
-                xmlns:svg="http://www.w3.org/2000/svg"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:ssb="http://sideshowbarker.net/ns"
-                xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics"
-                xmlns:sf="http://sourceforge.net/"
-                xmlns:set="http://exslt.org/sets"
-                xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
-                xmlns:saxonb="http://saxon.sf.net/"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                xmlns:ns="http://www.w3.org/1999/xhtml"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:mml="http://www.w3.org/1998/Math/MathML"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:its="http://www.w3.org/2005/11/its"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:db="http://docbook.org/ns/docbook"
-                xmlns:date="http://exslt.org/dates-and-times"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo">
-  <xsl:import href="xxe-config:docbook5/xslCustom/webhelpHdm.xsl"/>
-
-  <xsl:param name="callout.graphics">0</xsl:param>
-
-  <xsl:param name="callout.unicode">1</xsl:param>
-
-  <xsl:param name="generate.toc">appendix  toc,title
-article/appendix  nop
-article   toc,title
-book      toc,title,figure,table,example,equation
-chapter   toc,title
-part      toc,title
-preface   toc,title
-reference toc,title
-sect1     toc
-sect2     toc
-sect3     toc
-sect4     toc
-sect5     toc
-section   toc
-set       toc,title</xsl:param>
-
-  <xsl:param name="graphicsize.use.img.src.path">0</xsl:param>
-
-  <xsl:param name="highlight.source">1</xsl:param>
-
-  <xsl:param name="id.warnings">1</xsl:param>
-
-  <xsl:param name="olink.debug">1</xsl:param>
-
-  <xsl:param name="ulink.target">_blank</xsl:param>
-
-  <xsl:param name="use.id.as.filename">1</xsl:param>
-
-  <!-- REDEFINE PARAMETERS AND ATTRIBUTE-SETS HERE -->
-</xsl:stylesheet>
diff --git a/ws/Docbook/Config/xxe6/custom/DocBook v5+/custom.incl b/ws/Docbook/Config/xxe6/custom/DocBook v5+/custom.incl
deleted file mode 100644
index e1b920da9..000000000
--- a/ws/Docbook/Config/xxe6/custom/DocBook v5+/custom.incl	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cfg:configuration
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:xlink="http://www.w3.org/1999/xlink"
-xmlns:xi="http://www.w3.org/2001/XInclude"
-xmlns:svg="http://www.w3.org/2000/svg"
-xmlns:m="http://www.w3.org/1998/Math/MathML"
-xmlns:html="http://www.w3.org/1999/xhtml"
-xmlns:db="http://docbook.org/ns/docbook"
-xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration"
-><cfg:property
-name="DocBook v5+.db5.toEclipseHelp.alternateXSLT"
->Goik's lecture notes
-file:/ma/goik/workspace/GoikLectures/ws/Docbook/Config/eclipse_custom.xsl</cfg:property
-><cfg:property
-name="DocBook v5+.db5.toPS.alternateXSLT"
->Goik pdf configs
-file:/ma/goik/workspace/GoikLectures/ws/Docbook/Config/print_custom.xsl</cfg:property
-><cfg:property
-name="DocBook v5+.db5.toWebHelp.alternateXSLT"
->Standard XSL parameter
-file:/ma/goik/workspace/GoikLectures/ws/Docbook/Config/webhelp_custom.xsl</cfg:property
-><cfg:property
-name="db5.toEclipseHelp.transform"
->file:/ma/goik/workspace/GoikLectures/ws/Docbook/Config/eclipse_custom.xsl</cfg:property
-><cfg:property
-name="db5.toPS.transform"
->file:/ma/goik/workspace/GoikLectures/ws/Docbook/Config/print_custom.xsl</cfg:property
-><cfg:property
-name="db5.toWebHelp.transform"
->file:/ma/goik/workspace/GoikLectures/ws/Docbook/Config/webhelp_custom.xsl</cfg:property
-></cfg:configuration
->
diff --git a/ws/Docbook/Config/xxe6/preferences.properties b/ws/Docbook/Config/xxe6/preferences.properties
deleted file mode 100644
index 376138507..000000000
--- a/ws/Docbook/Config/xxe6/preferences.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#XMLmind XML Editor Professional Edition 6.4.0
-#Sat Sep 12 14:01:38 CEST 2015
-rightTab.includePane.atStart=true
-rightTab.editPane.atStart=true
-autoCheckForUpdates.date=1442057246424
-rightTabs.horizontalRatio=0.33
-lastConvertURLForDocument=file\:/ma/goik/Downloads/Untitled.xml\nfile\:/ma/goik/Downloads/Untitled/
-warnAboutAdvancedXInclude=false
-rightTab.checkSpellingPane.selected=false
-firstCharDisplayedByTable=0
-rightTab.checkSpellingPane.atStart=false
-rightTab.checkValidityPane.atStart=false
-rightPanes.width=0.25
-rightTab.insertCharacterPane.selected=false
-fileChooserSize=1118 809
-lastSelectedTemplates=xml "DocBook v5+/5.0" Section
-rightTab.textSearchReplacePane.atStart=false
-geometry=10 108 1542 1049
-selectedLanguage=en
-rightPanes.collapsed=false
-lastOpenedFiles=file\:/ma/goik/Downloads/Untitled.xml\nfile\:/ma/goik/workspace/GoikLectures/Doc/lectures.xml\nfile\:/usr/share/xmlmind/demo/dita-sample.ditamap\nfile\:/usr/share/xmlmind/demo/docbook5-sample.xml\nfile\:/usr/share/xmlmind/demo/docbook-image.xml\nfile\:/usr/share/xmlmind/demo/docbook-table.xml\nfile\:/usr/share/xmlmind/demo/docbook-modular-book.xml\nfile\:/usr/share/xmlmind/demo/xhtml5-objects.html\nfile\:/usr/share/xmlmind/demo/xhtml-table.xhtml\nfile\:/usr/share/xmlmind/demo/form-sampler.xml
-rightTab.insertCharacterPane.atStart=false
-rightTab.mathmlPane.selected=false
-rightTab.mathmlPane.atStart=true
-wrapSearch=false
-maximized=no
-includedDocumentItems=
-rightTab.checkValidityPane.selected=false
-rightTab.textSearchReplacePane.selected=false
-startFromCaret=true
-allowAdvancedXInclude=false
-helperApplications.defaultViewer=firefox "%U"
-xxeVersion=6.4.0
-rightTab.includePane.selected=false
-rightTab.editAttributePane.atStart=false
-rightTab.editAttributePane.selected=true
-rightTab.editPane.selected=true
-passwords=
-helperApplications.entries=\:text/plain\:txt\:\:\:emacs "%F"
-infoAboutReadOnlyInclusions=false
diff --git a/ws/Docbook/Config/xxe6/spell/dict_de.txt b/ws/Docbook/Config/xxe6/spell/dict_de.txt
deleted file mode 100644
index 0670659b1..000000000
--- a/ws/Docbook/Config/xxe6/spell/dict_de.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Arrays	
-Debugger	
-Eclipse	
-Entpacken	
-Exceptions	
-Explorer	
-Ilias	
-Implementierung	
-Javadoc	
-Junit	
-Konstruktor	
-Package	
-resultierende	
-resultierenden	
-Statements	
-String	
-Tip	
-Zweigs	
diff --git a/ws/Docbook/Config/xxe6/spell/dict_en.txt b/ws/Docbook/Config/xxe6/spell/dict_en.txt
deleted file mode 100644
index dbf3f604d..000000000
--- a/ws/Docbook/Config/xxe6/spell/dict_en.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-backend	
-basename	
-bytecode	
-checkbox	
-checkboxes	
-drag'n	
-emails	
-filesystem	
-formedness	
-frontend	
-greylisting	
-inline	
-nameserver	
-namespace	
-namespaces	
-no-brainer	
-nullable	
-objectclass	
-passphrases	
-plugin	
-plugins	
-preconfigured	
-pregenerated	
-pythagorean	
-refactoring	
-serializer	
-Unicode	
-validators	
-well-formedness	
diff --git a/ws/Docbook/Dbtools/.gitignore b/ws/Docbook/Dbtools/.gitignore
deleted file mode 100644
index bddccf7bc..000000000
--- a/ws/Docbook/Dbtools/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target
-/.classpath
-/.project
-.idea/
-Dbtools.iml
-
diff --git a/ws/Docbook/Dbtools/.settings/org.eclipse.core.resources.prefs b/ws/Docbook/Dbtools/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f9fe34593..000000000
--- a/ws/Docbook/Dbtools/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/ws/Docbook/Dbtools/.settings/org.eclipse.jdt.core.prefs b/ws/Docbook/Dbtools/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 714351aec..000000000
--- a/ws/Docbook/Dbtools/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/ws/Docbook/Dbtools/.settings/org.eclipse.m2e.core.prefs b/ws/Docbook/Dbtools/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/ws/Docbook/Dbtools/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/ws/Docbook/Dbtools/Testdata/method.xml b/ws/Docbook/Dbtools/Testdata/method.xml
deleted file mode 100644
index 18aaf05ea..000000000
--- a/ws/Docbook/Dbtools/Testdata/method.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book version="5.0" xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:svg="http://www.w3.org/2000/svg"
-      xmlns:m="http://www.w3.org/1998/Math/MathML"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns:db="http://docbook.org/ns/docbook">
-  <info>
-    <title/>
-
-    <author>
-      <personname><firstname/><surname/></personname>
-
-      <affiliation>
-        <orgname/>
-      </affiliation>
-    </author>
-
-    <pubdate/>
-  </info>
-
-  <chapter xml:id="chap">
-    <title>Methods</title>
-
-    <para>Lets assume a non static method
-    <methodname>java.lang.String.equals(java.lang.Object)</methodname> an a
-    static method <methodname>String.indexOf(String,int)</methodname>,
-    <methodname>String.hashCode()</methodname>.</para>
-
-    <para><methodname>String.getChars(int,int,char[],int)</methodname></para>
-
-    <para><methodname>org.xml.sax.helpers.DefaultHandler.characters(char[],int
-    a,int)</methodname></para>
-
-    <para><methodname>org.xml.sax.helpers.DefaultHandler.endElement(String
-    uri, String localName, String qName)</methodname></para>
-  </chapter>
-</book>
diff --git a/ws/Docbook/Dbtools/pom.xml b/ws/Docbook/Dbtools/pom.xml
deleted file mode 100644
index 7a8d19ed7..000000000
--- a/ws/Docbook/Dbtools/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>de.hdm-stuttgart.mi</groupId>
-    <artifactId>lecturenotes-base-pom</artifactId>
-    <version>1.0</version>
-    <relativePath>../../../pom.xml</relativePath>
-  </parent>
-
-
-  <groupId>Dbtools</groupId>
-  <artifactId>Dbtools</artifactId>
-  <version>1.0</version>
-
-  <packaging>jar</packaging>
-
-  <name>Dbtools</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/Docbook2docbook.java b/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/Docbook2docbook.java
deleted file mode 100644
index 4d264cb60..000000000
--- a/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/Docbook2docbook.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package de.hdm_stuttgart.mi.codeformat;
-
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.log4j.Logger;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSParser;
-import org.w3c.dom.ls.LSSerializer;
-
-
-/** 
- * Adding documentation links
- */
-public class Docbook2docbook {
-
-	private static final Logger logger = Logger.getLogger(Docbook2docbook.class);
-	private final static String srcPrefixDir = "Ref/api",
-			docbookNamespace = "http://docbook.org/ns/docbook";
-	private final static Package[] knownPackages;
-	private final static Map<String, Package> package2name;
-	private static final Map<String, Class<?>> BUILT_IN_MAP = 
-			new ConcurrentHashMap<String, Class<?>>();
-
-
-	private final XPathFactory xpf = XPathFactory.newInstance();
-
-	/** Searching a document of type docbook for programlistings with java classes. If the class can be retrieved
-	 * a url reference is being constructed.
-	 * @param args
-	 * @throws ClassCastException
-	 * @throws FileNotFoundException
-	 * @throws ClassNotFoundException
-	 * @throws InstantiationException
-	 * @throws IllegalAccessException
-	 * @throws XPathExpressionException
-	 */
-
-	static {
-		knownPackages = Package.getPackages();
-		package2name = new HashMap<String, Package>();
-		for (final Package p: Package.getPackages()) {
-			package2name.put(p.getName(), p);
-		}
-		for (Class<?> c : new Class[]{void.class,
-				boolean.class,   byte.class,   char.class,   short.class,   int.class,
-				boolean[].class, byte[].class, char[].class, short[].class, int[].class,
-
-				float.class,   double.class,   long.class,
-				float[].class, double[].class, long[].class
-		})
-			BUILT_IN_MAP.put(c.getCanonicalName(), c);
-	}
-	public static Class<?> forName(String name) throws ClassNotFoundException {
-		Class<?> c = BUILT_IN_MAP.get(name);
-		if (c == null) {
-			return Class.forName(name);
-		} else {
-			return c;
-		}
-	}
-	public static void main(String[] args) throws 
-	ClassCastException, FileNotFoundException, ClassNotFoundException,
-	InstantiationException, IllegalAccessException, XPathExpressionException {
-		if (1 != args.length) {
-			logger.fatal("Usage: Docbook2docbook <xmlfileBasename>");
-		} else {
-			Docbook2docbook d2d = new Docbook2docbook(args[0]);
-			d2d.process();
-			logger.info("Successfully finished conversion");
-		}
-	}
-	private 
-	final String docbookBasename;
-	/**
-	 * @param basename the XML document's basename e.g. for a XML instance "somdirectory/mydoc.xml"
-	 * this will be "somdirectory/mydoc"
-	 */
-	public Docbook2docbook (final String basename){
-		this.docbookBasename = basename;
-	}
-	private void process() throws ClassCastException, ClassNotFoundException,
-	InstantiationException, IllegalAccessException,
-	XPathExpressionException {
-		final DOMImplementationRegistry registry =
-				DOMImplementationRegistry.newInstance();
-
-		DOMImplementationLS impl = (DOMImplementationLS)registry.getDOMImplementation("LS");
-
-		LSParser db = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
-		final DOMConfiguration config = db.getDomConfig();
-		config.setParameter("error-handler", new DomErrorHandler(System.err));
-		final String xmlInfileName = docbookBasename + ".xml";
-		final Document dbInput = db.parseURI(xmlInfileName);
-		addClassReferences(dbInput);
-
-		final LSSerializer serial = impl.createLSSerializer();
-		serial.getDomConfig().setParameter("format-pretty-print", false);
-		final LSOutput lsOut = impl.createLSOutput();
-		PrintWriter out;
-		try {
-			out = new PrintWriter(docbookBasename + ".convert.xml");
-			lsOut.setCharacterStream(out);
-			serial.write(dbInput, lsOut);
-			out.flush();
-		} catch (FileNotFoundException e) {
-			logger.fatal("Unable to parse xml file " + xmlInfileName);
-		}
-	}
-
-	private void addClassReferences(final Document top) throws XPathExpressionException{
-
-		final XPath searchBlockObjects = xpf.newXPath();
-		searchBlockObjects.setNamespaceContext(new MyNamespaceContexts());
-
-		final NodeList classnames = 
-				(NodeList) searchBlockObjects.evaluate(
-						"//db:classname[not(contains(@annotations, 'nojavadoc'))]",
-						top, XPathConstants.NODESET);
-		for (int i = 0; i < classnames.getLength(); i++){
-			processClassName((Element) classnames.item(i));
-		}
-
-		final NodeList listings = 
-				(NodeList) searchBlockObjects.evaluate(
-						"//db:programlisting[not(contains(@annotations, 'nojavadoc'))]",
-						top, XPathConstants.NODESET);
-		for (int i = 0; i < listings.getLength(); i++){
-			processListing((Element) listings.item(i));
-		}      
-		final NodeList methodNames = 
-				(NodeList) searchBlockObjects.evaluate(
-						"//db:methodname[not(contains(@annotations, 'nojavadoc'))]",
-						top, XPathConstants.NODESET);
-		for (int i = 0; i < methodNames.getLength(); i++){
-			processMethodName((Element) methodNames.item(i));
-		}
-	}
-
-	private void processClassName(final Element classnameElement) {
-		final Node firstClassnameNode =  classnameElement.getFirstChild();
-		if (firstClassnameNode instanceof Text) {
-			final Text firstClassnameTextNode = (Text) firstClassnameNode;
-			final String fullyQualifiedClassname = firstClassnameTextNode.getData().trim();
-
-			final Class<?> cl = findClass(fullyQualifiedClassname);
-			if (null == cl) {
-				logger.warn("Unable to find prefix for '" + fullyQualifiedClassname);
-			} else {
-
-				final Element link = createLink(classnameElement, cl.getSimpleName(), urlPrefix (cl));
-				classnameElement.replaceChild(link, firstClassnameTextNode);
-			}
-		}
-	}
-
-	final String urlPrefix (final Method method) {
-		final Class<?> cl = method.getDeclaringClass();
-		final StringBuffer buff = new StringBuffer();
-		buff.append(urlPrefix(cl));
-		buff.append('#');
-		buff.append(method.getName());
-		buff.append('(');
-		for (int i = 0; i < method.getParameterTypes().length; i++) {
-			final Class<?> type = method.getParameterTypes()[i];
-			buff.append(type.getCanonicalName());
-			if (i < method.getParameterTypes().length - 1) {
-				buff.append(", ");
-			}
-		}
-		buff.append(')');
-		return buff.toString();
-	}
-
-	final String urlPrefix (final Class<?> cl) {
-		final String urlPrefix, implementationVendor;
-		final String fullyQualifiedClassname = cl.getCanonicalName();
-		if (fullyQualifiedClassname.startsWith("javax.")) {
-			urlPrefix="http://docs.oracle.com/javase/7/docs/api";
-			implementationVendor = "oracle corporation (fixed by javax.*)";
-		} else {
-			implementationVendor = cl.getPackage().getImplementationVendor();
-			if (null == implementationVendor) {
-				urlPrefix = srcPrefixDir;
-			} else {
-				switch(implementationVendor.toLowerCase()) {
-				case "oracle corporation":
-					urlPrefix="http://docs.oracle.com/javase/7/docs/api";
-					break;
-				case "jdom.org":
-					urlPrefix="http://www.jdom.org/docs/apidocs";
-					break;
-				case "hibernate.org":
-					urlPrefix = "http://docs.jboss.org/hibernate/orm/4.1/javadocs";
-					break;
-				default:
-					urlPrefix="unknown vendor '" + implementationVendor + "'";
-					logger.warn("No vendor found for " + fullyQualifiedClassname);
-					break;
-				}
-			}
-		}
-		return urlPrefix + "/" + package2path(cl.getCanonicalName()) + ".html";
-	}
-
-	private static String join(final String[] components, final String seperator, int start, int length) {
-		final StringBuffer b = new StringBuffer();
-		for (int i = start; i < start + length; i++) {
-			b.append(components[i]);
-			if (i < start + length - 1) {
-				b.append(seperator);
-			}
-		}
-		return b.toString();
-	}
-
-	private static Package package2name(final String[] components, int startIndex, int length) {
-		for (String c: components) {
-			logger.info("component:" + c);
-		}
-
-		final String packageName = join(components, ".", startIndex, length);
-		logger.info("searching for package '" + packageName + "'");
-		return  Package.getPackage(packageName);
-	}
-	private final Class<?> findUniqueClass(final String classname) {
-
-		try {
-			return forName(classname); //primitive type?
-		} catch (ClassNotFoundException ex) {}
-
-
-		int packageCount = 0;
-		Class<?> lastFound = null;
-		for (final Package p: knownPackages) {
-			final String fullyQualifiedClassName = p.getName().concat(".").concat(classname);
-			final Class<?> candidate = findClass(fullyQualifiedClassName);
-			if (null != candidate) {
-				lastFound = candidate;
-				packageCount++;
-				logger.info("found class '" + lastFound.getCanonicalName());
-			}
-		}
-		if (0 == packageCount) {
-			logger.warn("Class '" + classname + "' not found in any package");
-		} else if (1 < packageCount) {
-			logger.warn("Class '" + classname + "' found in " + packageCount + " packages");
-		}
-		return lastFound;
-	}
-	private final Class<?> findClass(final String className) {
-		if (className.contains(".")) {
-			try {
-				//logger.info("Looking for class '" + className + "'");
-				return forName(className) ;
-			} catch (ClassNotFoundException ex) {
-				logger.info("No such class '" + className + "'");
-				return null;
-			}
-		} else {
-			return findUniqueClass(className);
-		}
-	}
-	private void processMethodName(final Element methodNameElement) {
-		final Node firstMethodNameNode =  methodNameElement.getFirstChild();
-		if (firstMethodNameNode instanceof Text) {
-			final Text firstMethodNameTextNode = (Text) firstMethodNameNode;
-			final String fullyQualifiedMethodName = firstMethodNameTextNode.getData().trim().replaceAll("[ \t\n]+", " ");
-			final String mainSignatureComponents[] = fullyQualifiedMethodName.split("[ \t]*[()][ \t]*");
-			logger.info("----------------------------------------------------------");
-			final String returnQualifiedMethodname = mainSignatureComponents[0];
-			//argumentList = mainSignatureComponents[1];
-			logger.info("return plus methodname:'" + returnQualifiedMethodname + "'");
-			final String[] methodComponents = returnQualifiedMethodname.split("\\.");
-
-			final Class<?> uniqueClass;
-			final String errMsg;
-			final String methodName;
-			if (2 == methodComponents.length) { //Unqualified Class, e.g. String.clone()
-				final String unqualifiedClassname = methodComponents [0];
-				methodName = methodComponents [1];
-				uniqueClass = findUniqueClass(unqualifiedClassname);
-				errMsg = "No unique lookup of class '" + unqualifiedClassname + "'";
-			} else {
-				final Package pack = package2name(methodComponents, 0, methodComponents.length - 2);
-				if (null == pack) {
-				  logger.fatal("Unable to resolve method's package of '" + returnQualifiedMethodname + "'");
-	        System.exit(1);
-				}
-        final String packageName = pack.getName();
-				methodName = methodComponents [methodComponents.length - 1];
-				final String classname = methodComponents[methodComponents.length - 2];
-				final String fullyQualifiedClassName = packageName.concat(".").concat(classname);
-
-				uniqueClass = findClass(fullyQualifiedClassName);
-				errMsg = "Unable to find class '" + fullyQualifiedClassName + "'";
-			}
-			if (null == uniqueClass) {
-				logger.fatal(errMsg);
-				System.exit(1);
-			}
-			logger.info("found class '" + uniqueClass.getCanonicalName() + "'");
-
-			final List<Class<?>> parameterTypes = new ArrayList<Class<?>>();
-			if (1 < mainSignatureComponents.length) { // Argument list may be void
-				final String[] argumentStrings = mainSignatureComponents[1].split("[ \t]*[,][ \t]*");
-				for (final String argumentTypeVariable: argumentStrings) {
-				  // Argument may have formal parameter like e.g String.contains(String cont)
-				  final String[] argumentTypeVariableComponents = argumentTypeVariable.split("[ \t\n]");
-				  final String argumentType = argumentTypeVariableComponents[0];
-				  
-					final Class<?> argType = findClass(argumentType);
-					if (null == argType) {
-						logger.fatal("No such type '" + argumentType + "' in method '" +
-								methodName + "'");
-						System.exit(1);
-					}
-					parameterTypes.add(argType);
-				}
-			}
-			Method method = null;
-			try {
-				method = uniqueClass.getDeclaredMethod(methodName, parameterTypes.toArray(new Class<?>[0]));
-			} catch (NoSuchMethodException ex) {
-				logger.error("Unable to find method '" + uniqueClass.getCanonicalName() + "." 
-						+ methodName + "'");
-				System.exit(1);
-			}
-
-			if (Modifier.isPrivate(method.getModifiers())) {
-              logger.info("Method '" + method.getName() + "' is declared private");
-			} else {
-              logger.info("Adding Link '" + urlPrefix(method) + "'");
-              final Element link = createElementNode(methodNameElement, "link", docbookNamespace, method.getName() + "(...)");
-              link.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", urlPrefix(method));
-              methodNameElement.replaceChild(link, firstMethodNameTextNode);
-			}
-		}
-	}
-
-	private void processListing(final Element plisting) throws XPathExpressionException{
-		final Text[] textNodes = findTextNodes(plisting);
-
-		final Pattern searchPackage = Pattern.compile(
-				"(?s).*package[ \\t]+" + 
-						"([\\w]|\\w[\\w|.]*[\\w])"+
-				"[ \t]*;.*");
-
-		String packageName = null;
-		for (final Text tNode : textNodes){
-			Matcher matchPackage = searchPackage.matcher(tNode.getData());
-			if (matchPackage.find()){
-				packageName = matchPackage.group(1);
-				break;
-			}
-		}
-		if (null != packageName){
-			final Pattern searchClass = Pattern.compile(
-					"(?s)(.*[ \\t]+class[ \\t]+)" +
-							"(\\w+)" +
-					"(.*)");
-			// May use the following regexp excluding non-public classes with group(4):
-			//      "(?s)(.*public)([ \\t]+\\w+)*[ \\t]+(class[ \\t]+)" +
-			//      "(\\w+)" +
-			//      "(.*)");
-			for (final Text tNode : textNodes){
-				Matcher matchClass = searchClass.matcher(tNode.getData());
-				if (matchClass.find()){
-					final String className = matchClass.group(2);
-
-					final Class<?> cl = findClass(packageName + "." + className);
-					if (null != cl){
-						final Text beforeText = createTextNode(plisting, matchClass.group(1)),
-								afterText = createTextNode(plisting, matchClass.group(3));
-						plisting.replaceChild(afterText, tNode);
-						final Element link = createLink(plisting, className, srcPrefixDir + "/" + package2path(cl.getCanonicalName()) + ".html");
-						plisting.insertBefore(link, afterText);
-						plisting.insertBefore(beforeText, link);
-					}
-					break;
-				}
-			}
-		}
-	}
-
-	private Element createLink(final Element root, final String content, final String href) {
-		final Element link = createElementNode(root, "link", docbookNamespace, content);
-		link.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", href);
-		return link;
-	}
-
-	//Helper functions
-
-	/**
-	 * @param current classpath components being found in @annotations attribute
-	 * @return the classpath being defined within element's the ancestry hierarchy
-	 */
-	public String findExtraClasspath(final Element current) {
-
-		logger.info("line:" + current.getUserData("lineNumber"));
-		//    final String annotations = current.getAttributeNS(docbookNamespace, "annotations");
-		final String annotations = current.getAttribute("annotations");
-		if (null != annotations) {
-			final String ret = annotations.trim();
-			if (!ret.equals("")) {
-				return ret;
-			} 
-		}
-		final Node parentNode = current.getParentNode();
-
-		if (parentNode instanceof Document) {
-			logger.error("Document root being reached while scanning for classpath related annotation");
-			System.exit(1);
-		}
-		final Element parent = (Element) parentNode;
-		return findExtraClasspath(parent);
-	}
-
-//	/**
-//	 * @param path
-//	 */
-//	public static void addURL(String path)  {
-//		File filePath = new File(path);
-//		try {
-//			addURL(filePath.toURI().toURL());
-//		} catch (MalformedURLException e) {
-//			e.printStackTrace();
-//			logger.fatal("Error, could not create URL from '" + path + "'");
-//			System.exit(1);
-//		}
-//	}
-//
-//	/**
-//	 * @param u
-//	 */
-//	public static void addURL(URL u) {
-//
-//		URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
-//		Class<URLClassLoader> sysclass = URLClassLoader.class;
-//		final Class<?>[] parameters = new Class[]{URL.class};
-//
-//		try {
-//			Method method = sysclass.getDeclaredMethod("addURL", parameters);
-//			method.setAccessible(true);
-//			method.invoke(sysloader, new Object[]{u});
-//		} catch (Throwable t) {
-//			t.printStackTrace();
-//			logger.error("Error, could not add URL to system classloader");
-//			System.exit(1);
-//		}
-//	}
-
-	private final String package2path(final String packageName){
-		String searchDot = "\\.";
-		Pattern pattern = Pattern.compile(searchDot);
-		Matcher matcher = pattern.matcher(packageName);
-		return matcher.replaceAll("/");
-	}
-	private Text createTextNode(final Node node, final String data){
-		if (node instanceof Document){
-			return ((Document) node).createTextNode(data);
-		} else{
-			return node.getOwnerDocument().createTextNode(data);
-		}
-	}
-	private Element createElementNode(final Node node,
-			final String type, final String ns, final String data){
-		final Element ret;
-		if (node instanceof Document){
-			ret = ((Document) node).createElementNS(ns, type);
-		} else{
-			ret = node.getOwnerDocument().createElementNS(ns, type);
-		}
-		final Text t = createTextNode(node, data);
-		ret.appendChild(t);
-		return ret;
-	}
-	private Text[] findTextNodes(final Element parent) throws XPathExpressionException{
-		final XPath searchTextNodes = xpf.newXPath();
-		final NodeList textNodes = 
-				(NodeList) searchTextNodes.evaluate(
-						"text()",
-						parent, XPathConstants.NODESET);
-		final Text [] t = new Text[textNodes.getLength()];
-		for (int i = 0; i < textNodes.getLength(); i++){
-			t[i] = (Text) textNodes.item(i);
-		}
-		return t;
-	}
-}
diff --git a/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/DomErrorHandler.java b/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/DomErrorHandler.java
deleted file mode 100644
index c25d33e94..000000000
--- a/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/DomErrorHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package de.hdm_stuttgart.mi.codeformat;
-
-import java.io.PrintStream;
-
-import org.w3c.dom.DOMError;
-import org.w3c.dom.DOMErrorHandler;
-
-/**
- * @author $Author$
- * @version $Rev$ $Date$
- *
- * $URL$.
- *
- */
-public class DomErrorHandler implements DOMErrorHandler {
-  public boolean handleError(DOMError error) {
-    out.print(getParseExceptionInfo(error));
-    switch(error.getSeverity()){
-    case org.w3c.dom.DOMError.SEVERITY_FATAL_ERROR: return false;
-      default: return true;
-    }
-  }
-  /**
-   * @param out Error messages will go here.
-   */
-  public DomErrorHandler(final PrintStream out) {
-    this.out = out;
-  }
-  private String getParseExceptionInfo //Returns a string describing
-  (DOMError error) { //parse exception details.
-    return "Error '" + error.getMessage() + "' at line " + 
-     error.getLocation().getLineNumber() + ", column " +
-        error.getLocation().getColumnNumber();
-  }
-  private PrintStream out; //The error handler's output goes here
-}
diff --git a/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/MyNamespaceContexts.java b/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/MyNamespaceContexts.java
deleted file mode 100644
index d25e936cc..000000000
--- a/ws/Docbook/Dbtools/src/main/java/de/hdm_stuttgart/mi/codeformat/MyNamespaceContexts.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.hdm_stuttgart.mi.codeformat;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.NamespaceContext;
-
-/** Mapping docbook's namespace to the prefix db
- * @author $Author: goik $
- * @version $Rev: 289 $ $Date: 2007-11-19 12:05:47 +0100 (Mon, 19 Nov 2007) $
- *
- * $URL: https://version/my.java $.
- *
- */
-public class MyNamespaceContexts implements NamespaceContext{
-
-  public String getNamespaceURI(String prefix) {
-    return "http://docbook.org/ns/docbook";
-  }
-
-  public String getPrefix(String namespaceURI) {
-    return "db";
-  }
-  public Iterator<String> getPrefixes(String namespaceURI) {
-    return null;
-  }
-}
diff --git a/ws/Docbook/Dbtools/src/main/java/log4j.properties b/ws/Docbook/Dbtools/src/main/java/log4j.properties
deleted file mode 100644
index bb6f00c0a..000000000
--- a/ws/Docbook/Dbtools/src/main/java/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=WARN, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%p: %m at %c.%M(%C{1}.java:%L)%n
diff --git a/ws/Docbook/Id2topic/.gitignore b/ws/Docbook/Id2topic/.gitignore
index 916e17c09..c801fe35d 100644
--- a/ws/Docbook/Id2topic/.gitignore
+++ b/ws/Docbook/Id2topic/.gitignore
@@ -1 +1,4 @@
 dependency-reduced-pom.xml
+.idea/
+id2topic.iml
+
diff --git a/ws/Docbook/Preprocess/Xsl/common.xsl b/ws/Docbook/Preprocess/Xsl/common.xsl
index 65a0a5047..ec7c82986 100644
--- a/ws/Docbook/Preprocess/Xsl/common.xsl
+++ b/ws/Docbook/Preprocess/Xsl/common.xsl
@@ -34,4 +34,25 @@
     </link>
   </xsl:template>
   
+  <xsl:template match="db:qandaset" mode="selectOwnOrInheritedTitleFlat">
+      <xsl:choose>
+        <xsl:when test="db:title">
+          <xsl:apply-templates select="db:title" mode="flatten"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="preceding-sibling::db:title[1]" mode="flatten"/>
+        </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+  
+  
+  <xsl:template match="*" mode="flatten">
+    <xsl:apply-templates select="text()|*" mode="flatten"/>
+  </xsl:template>
+  
+  <xsl:template match="text()" mode="flatten">
+    <xsl:value-of select="normalize-space(.)"/>
+    <xsl:text> </xsl:text>
+  </xsl:template>
+  
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl b/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl
index 0c75fe5ba..79550853c 100644
--- a/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbook2topics.xsl
@@ -3,7 +3,12 @@
   xmlns:d="http://docbook.org/ns/docbook"
   exclude-result-prefixes="d">
     
-  <xsl:import href="../../docbook-xsl/xhtml/chunk.xsl"/>
+<!-- 
+    <xsl:import href="../../docbook-xsl/xhtml/chunk.xsl"/>
+  
+  -->
+
+  <xsl:import href="../../docbook-xsl/webhelp/xsl/webhelp.xsl"/>
   
   <xsl:include href="common.xsl"/>
   
@@ -17,11 +22,6 @@
   </xsl:template>
   
   <xsl:template match="d:qandaset">
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($linkend.targets)[1]"/>
-    <xsl:param name="referrer" select="."/>
-    
-    
     
     <entry >
       <xsl:attribute name="id">
@@ -29,8 +29,9 @@
         <xsl:text>:</xsl:text>
         <xsl:value-of select="@xml:id"/>
       </xsl:attribute>
+      
       <xsl:variable name="title">
-        <xsl:apply-templates select="." mode="selectOwnOrInheritedTitle"/>
+        <xsl:apply-templates select="." mode="selectOwnOrInheritedTitleFlat"/>
       </xsl:variable>
       <title>
         <xsl:text>Exercise "</xsl:text>
diff --git a/ws/Docbook/Preprocess/make.rules b/ws/Docbook/Preprocess/make.rules
index 0d6ecfb7e..e8e98c550 100644
--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -72,7 +72,6 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
 # Docbook related build rules
 #
 # Basic profiling
-#	#${SAXON6CMD} $< ${DBOOK_XSL_PREPROCESS}/Xsl/docbook2topics.xsl ${dbookXslWebhelpParam} > ${*}.topics.xml
 
 %.print.xml %.html.xml: %.xml
 	mkdir -p $(@D);  ln -sf /usr/share/hdmwebhelp/extern $(@D)/..
-- 
GitLab