From 4e4fea109512d6ef1c97aefa36bb0ac1e9ff77d3 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Fri, 6 Feb 2015 11:04:30 +0100
Subject: [PATCH] Hierarch renaming
---
Doc/Sda1/Ref/Fig/{ => Sda1}/Makefile | 2 +-
.../Ref/Fig/{ => Sda1}/attribInElement.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/attributes.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/blockprop.fo.pdf | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/booknavigate.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/clientserv.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/contentmixed.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/cpp.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/crossmedia.fig | 0
.../Ref/Fig/{ => Sda1}/dictionary.1.fo.eps | 0
.../Ref/Fig/{ => Sda1}/dictionary.2.fo.eps | 0
.../Ref/Fig/{ => Sda1}/dictionaryStack.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/domtree.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/entityresolve.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/externalize.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/filtering.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/firefoxrender.png | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/hacker.jpg | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/headfoot.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/heartland.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/impropernest.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/invoicedata.fig | 0
.../Fig/{ => Sda1}/invoicedataimplement.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/itemize.fo.pdf | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcFourTier.fig | 0
.../Ref/Fig/{ => Sda1}/jdbcObjectRelation.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcReadWrite.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcSniffing.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcThreeTier.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcarch.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcread.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcurl.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/leader.fo.pdf | Bin
.../Ref/Fig/{ => Sda1}/leadermulti.fo.pdf | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/memofour.fig | 0
.../Ref/Fig/{ => Sda1}/memorelativexpath.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/memotree.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/memoxpath.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/nodeHierarchy.svg | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/overlay.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.1.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.2.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.3.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.4.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/pageStack.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/pageref.1.fo.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/pageref.2.fo.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/pagerefStack.fig | 0
.../Ref/Fig/{ => Sda1}/pagerefhyper.1.fo.eps | 0
.../Ref/Fig/{ => Sda1}/pagerefhyper.2.fo.eps | 0
.../Ref/Fig/{ => Sda1}/pagerefhyperStack.fig | 0
.../Fig/{ => Sda1}/persistHandlerStates.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/persistence.fig | 0
.../Ref/Fig/{ => Sda1}/persistentStates.fig | 0
.../Ref/Fig/{ => Sda1}/pitr_Syringe_icon.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/pre.tex | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/preceding.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/propernest.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/regions.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/saxapparch.odg | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/saxapparch.pdf | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/saxcharacter.odg | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/saxcharacter.pdf | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/saxmodel.odg | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/saxmodel.pdf | Bin
Doc/Sda1/Ref/Fig/{ => Sda1}/saxxmlrdbms.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/separate.fo.pdf | Bin
.../Ref/Fig/{ => Sda1}/sequenceDomParser.svg | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/skull.eps | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/sqlTransport.fig | 0
.../Fig/{ => Sda1}/sqlTransportPrepare.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/sqlinject.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/sqrtree.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/sqrtrender.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/updateinfo.fig | 0
.../Ref/Fig/{ => Sda1}/wellformedandvalid.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xhtml.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xhtmlexample.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xml2fo2pdf.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xml2html.fig | 0
.../Ref/Fig/{ => Sda1}/xmlattribandjava.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xmlbase.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xpath.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xsl_id.fig | 0
Doc/Sda1/Ref/Fig/{ => Sda1}/xslconvert.fig | 0
Doc/Sda1/dom.xml | 8 ++---
Doc/Sda1/fo.xml | 28 +++++++--------
Doc/Sda1/jdbc.xml | 34 +++++++++---------
Doc/Sda1/sax.xml | 10 +++---
Doc/Sda1/xmlintro.xml | 18 +++++-----
Doc/Sda1/xmlschema.xml | 10 +++---
Doc/Sda1/xslt.xml | 16 ++++-----
P/pom.xml | 16 +++++++++
93 files changed, 79 insertions(+), 63 deletions(-)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/Makefile (90%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/attribInElement.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/attributes.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/blockprop.fo.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/booknavigate.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/clientserv.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/contentmixed.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/cpp.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/crossmedia.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/dictionary.1.fo.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/dictionary.2.fo.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/dictionaryStack.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/domtree.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/entityresolve.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/externalize.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/filtering.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/firefoxrender.png (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/hacker.jpg (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/headfoot.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/heartland.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/impropernest.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/invoicedata.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/invoicedataimplement.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/itemize.fo.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcFourTier.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcObjectRelation.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcReadWrite.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcSniffing.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcThreeTier.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcarch.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcread.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/jdbcurl.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/leader.fo.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/leadermulti.fo.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/memofour.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/memorelativexpath.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/memotree.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/memoxpath.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/nodeHierarchy.svg (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/overlay.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.1.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.2.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.3.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/page.fo.4.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pageStack.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pageref.1.fo.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pageref.2.fo.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pagerefStack.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pagerefhyper.1.fo.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pagerefhyper.2.fo.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pagerefhyperStack.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/persistHandlerStates.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/persistence.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/persistentStates.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pitr_Syringe_icon.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/pre.tex (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/preceding.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/propernest.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/regions.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxapparch.odg (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxapparch.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxcharacter.odg (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxcharacter.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxmodel.odg (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxmodel.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/saxxmlrdbms.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/separate.fo.pdf (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/sequenceDomParser.svg (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/skull.eps (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/sqlTransport.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/sqlTransportPrepare.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/sqlinject.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/sqrtree.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/sqrtrender.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/updateinfo.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/wellformedandvalid.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xhtml.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xhtmlexample.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xml2fo2pdf.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xml2html.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xmlattribandjava.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xmlbase.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xpath.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xsl_id.fig (100%)
rename Doc/Sda1/Ref/Fig/{ => Sda1}/xslconvert.fig (100%)
diff --git a/Doc/Sda1/Ref/Fig/Makefile b/Doc/Sda1/Ref/Fig/Sda1/Makefile
similarity index 90%
rename from Doc/Sda1/Ref/Fig/Makefile
rename to Doc/Sda1/Ref/Fig/Sda1/Makefile
index c2df99bb7..d8fe4b39a 100644
--- a/Doc/Sda1/Ref/Fig/Makefile
+++ b/Doc/Sda1/Ref/Fig/Sda1/Makefile
@@ -28,7 +28,7 @@ xhtml xml2fo2pdf xml2html xmlattribandjava xmlbase xpath xslconvert xsl_id
pdf:$(foreach figfile, $(FIGFILES), $(figfile)-0.pdf) $(foreach figfile, $(FIGFILES), ../$(figfile).fig.pdf)
all:
- mkdir -p Generate;cd Generate;export PATH=../../../../bin:${PATH}; $(MAKE) -f ../Makefile pdf # PATH contains additional tools
+ mkdir -p Generate;cd Generate;export PATH=../../../../../bin:${PATH}; $(MAKE) -f ../Makefile pdf # PATH contains additional tools
clean:
rm -rf Generate $(foreach figfile, $(FIGFILES), $(figfile).pdf) $(foreach figfile, $(FIGFILES), $(figfile).fig.pdf)
diff --git a/Doc/Sda1/Ref/Fig/attribInElement.fig b/Doc/Sda1/Ref/Fig/Sda1/attribInElement.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/attribInElement.fig
rename to Doc/Sda1/Ref/Fig/Sda1/attribInElement.fig
diff --git a/Doc/Sda1/Ref/Fig/attributes.fig b/Doc/Sda1/Ref/Fig/Sda1/attributes.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/attributes.fig
rename to Doc/Sda1/Ref/Fig/Sda1/attributes.fig
diff --git a/Doc/Sda1/Ref/Fig/blockprop.fo.pdf b/Doc/Sda1/Ref/Fig/Sda1/blockprop.fo.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/blockprop.fo.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/blockprop.fo.pdf
diff --git a/Doc/Sda1/Ref/Fig/booknavigate.fig b/Doc/Sda1/Ref/Fig/Sda1/booknavigate.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/booknavigate.fig
rename to Doc/Sda1/Ref/Fig/Sda1/booknavigate.fig
diff --git a/Doc/Sda1/Ref/Fig/clientserv.fig b/Doc/Sda1/Ref/Fig/Sda1/clientserv.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/clientserv.fig
rename to Doc/Sda1/Ref/Fig/Sda1/clientserv.fig
diff --git a/Doc/Sda1/Ref/Fig/contentmixed.fig b/Doc/Sda1/Ref/Fig/Sda1/contentmixed.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/contentmixed.fig
rename to Doc/Sda1/Ref/Fig/Sda1/contentmixed.fig
diff --git a/Doc/Sda1/Ref/Fig/cpp.fig b/Doc/Sda1/Ref/Fig/Sda1/cpp.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/cpp.fig
rename to Doc/Sda1/Ref/Fig/Sda1/cpp.fig
diff --git a/Doc/Sda1/Ref/Fig/crossmedia.fig b/Doc/Sda1/Ref/Fig/Sda1/crossmedia.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/crossmedia.fig
rename to Doc/Sda1/Ref/Fig/Sda1/crossmedia.fig
diff --git a/Doc/Sda1/Ref/Fig/dictionary.1.fo.eps b/Doc/Sda1/Ref/Fig/Sda1/dictionary.1.fo.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/dictionary.1.fo.eps
rename to Doc/Sda1/Ref/Fig/Sda1/dictionary.1.fo.eps
diff --git a/Doc/Sda1/Ref/Fig/dictionary.2.fo.eps b/Doc/Sda1/Ref/Fig/Sda1/dictionary.2.fo.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/dictionary.2.fo.eps
rename to Doc/Sda1/Ref/Fig/Sda1/dictionary.2.fo.eps
diff --git a/Doc/Sda1/Ref/Fig/dictionaryStack.fig b/Doc/Sda1/Ref/Fig/Sda1/dictionaryStack.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/dictionaryStack.fig
rename to Doc/Sda1/Ref/Fig/Sda1/dictionaryStack.fig
diff --git a/Doc/Sda1/Ref/Fig/domtree.fig b/Doc/Sda1/Ref/Fig/Sda1/domtree.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/domtree.fig
rename to Doc/Sda1/Ref/Fig/Sda1/domtree.fig
diff --git a/Doc/Sda1/Ref/Fig/entityresolve.fig b/Doc/Sda1/Ref/Fig/Sda1/entityresolve.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/entityresolve.fig
rename to Doc/Sda1/Ref/Fig/Sda1/entityresolve.fig
diff --git a/Doc/Sda1/Ref/Fig/externalize.fig b/Doc/Sda1/Ref/Fig/Sda1/externalize.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/externalize.fig
rename to Doc/Sda1/Ref/Fig/Sda1/externalize.fig
diff --git a/Doc/Sda1/Ref/Fig/filtering.fig b/Doc/Sda1/Ref/Fig/Sda1/filtering.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/filtering.fig
rename to Doc/Sda1/Ref/Fig/Sda1/filtering.fig
diff --git a/Doc/Sda1/Ref/Fig/firefoxrender.png b/Doc/Sda1/Ref/Fig/Sda1/firefoxrender.png
similarity index 100%
rename from Doc/Sda1/Ref/Fig/firefoxrender.png
rename to Doc/Sda1/Ref/Fig/Sda1/firefoxrender.png
diff --git a/Doc/Sda1/Ref/Fig/hacker.jpg b/Doc/Sda1/Ref/Fig/Sda1/hacker.jpg
similarity index 100%
rename from Doc/Sda1/Ref/Fig/hacker.jpg
rename to Doc/Sda1/Ref/Fig/Sda1/hacker.jpg
diff --git a/Doc/Sda1/Ref/Fig/headfoot.fig b/Doc/Sda1/Ref/Fig/Sda1/headfoot.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/headfoot.fig
rename to Doc/Sda1/Ref/Fig/Sda1/headfoot.fig
diff --git a/Doc/Sda1/Ref/Fig/heartland.fig b/Doc/Sda1/Ref/Fig/Sda1/heartland.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/heartland.fig
rename to Doc/Sda1/Ref/Fig/Sda1/heartland.fig
diff --git a/Doc/Sda1/Ref/Fig/impropernest.fig b/Doc/Sda1/Ref/Fig/Sda1/impropernest.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/impropernest.fig
rename to Doc/Sda1/Ref/Fig/Sda1/impropernest.fig
diff --git a/Doc/Sda1/Ref/Fig/invoicedata.fig b/Doc/Sda1/Ref/Fig/Sda1/invoicedata.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/invoicedata.fig
rename to Doc/Sda1/Ref/Fig/Sda1/invoicedata.fig
diff --git a/Doc/Sda1/Ref/Fig/invoicedataimplement.fig b/Doc/Sda1/Ref/Fig/Sda1/invoicedataimplement.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/invoicedataimplement.fig
rename to Doc/Sda1/Ref/Fig/Sda1/invoicedataimplement.fig
diff --git a/Doc/Sda1/Ref/Fig/itemize.fo.pdf b/Doc/Sda1/Ref/Fig/Sda1/itemize.fo.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/itemize.fo.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/itemize.fo.pdf
diff --git a/Doc/Sda1/Ref/Fig/jdbcFourTier.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcFourTier.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcFourTier.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcFourTier.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcObjectRelation.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcObjectRelation.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcObjectRelation.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcObjectRelation.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcReadWrite.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcReadWrite.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcReadWrite.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcReadWrite.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcSniffing.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcSniffing.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcSniffing.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcSniffing.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcThreeTier.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcThreeTier.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcThreeTier.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcThreeTier.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcarch.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcarch.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcarch.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcarch.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcread.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcread.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcread.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcread.fig
diff --git a/Doc/Sda1/Ref/Fig/jdbcurl.fig b/Doc/Sda1/Ref/Fig/Sda1/jdbcurl.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/jdbcurl.fig
rename to Doc/Sda1/Ref/Fig/Sda1/jdbcurl.fig
diff --git a/Doc/Sda1/Ref/Fig/leader.fo.pdf b/Doc/Sda1/Ref/Fig/Sda1/leader.fo.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/leader.fo.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/leader.fo.pdf
diff --git a/Doc/Sda1/Ref/Fig/leadermulti.fo.pdf b/Doc/Sda1/Ref/Fig/Sda1/leadermulti.fo.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/leadermulti.fo.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/leadermulti.fo.pdf
diff --git a/Doc/Sda1/Ref/Fig/memofour.fig b/Doc/Sda1/Ref/Fig/Sda1/memofour.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/memofour.fig
rename to Doc/Sda1/Ref/Fig/Sda1/memofour.fig
diff --git a/Doc/Sda1/Ref/Fig/memorelativexpath.fig b/Doc/Sda1/Ref/Fig/Sda1/memorelativexpath.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/memorelativexpath.fig
rename to Doc/Sda1/Ref/Fig/Sda1/memorelativexpath.fig
diff --git a/Doc/Sda1/Ref/Fig/memotree.fig b/Doc/Sda1/Ref/Fig/Sda1/memotree.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/memotree.fig
rename to Doc/Sda1/Ref/Fig/Sda1/memotree.fig
diff --git a/Doc/Sda1/Ref/Fig/memoxpath.fig b/Doc/Sda1/Ref/Fig/Sda1/memoxpath.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/memoxpath.fig
rename to Doc/Sda1/Ref/Fig/Sda1/memoxpath.fig
diff --git a/Doc/Sda1/Ref/Fig/nodeHierarchy.svg b/Doc/Sda1/Ref/Fig/Sda1/nodeHierarchy.svg
similarity index 100%
rename from Doc/Sda1/Ref/Fig/nodeHierarchy.svg
rename to Doc/Sda1/Ref/Fig/Sda1/nodeHierarchy.svg
diff --git a/Doc/Sda1/Ref/Fig/overlay.fig b/Doc/Sda1/Ref/Fig/Sda1/overlay.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/overlay.fig
rename to Doc/Sda1/Ref/Fig/Sda1/overlay.fig
diff --git a/Doc/Sda1/Ref/Fig/page.fo.1.eps b/Doc/Sda1/Ref/Fig/Sda1/page.fo.1.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/page.fo.1.eps
rename to Doc/Sda1/Ref/Fig/Sda1/page.fo.1.eps
diff --git a/Doc/Sda1/Ref/Fig/page.fo.2.eps b/Doc/Sda1/Ref/Fig/Sda1/page.fo.2.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/page.fo.2.eps
rename to Doc/Sda1/Ref/Fig/Sda1/page.fo.2.eps
diff --git a/Doc/Sda1/Ref/Fig/page.fo.3.eps b/Doc/Sda1/Ref/Fig/Sda1/page.fo.3.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/page.fo.3.eps
rename to Doc/Sda1/Ref/Fig/Sda1/page.fo.3.eps
diff --git a/Doc/Sda1/Ref/Fig/page.fo.4.eps b/Doc/Sda1/Ref/Fig/Sda1/page.fo.4.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/page.fo.4.eps
rename to Doc/Sda1/Ref/Fig/Sda1/page.fo.4.eps
diff --git a/Doc/Sda1/Ref/Fig/pageStack.fig b/Doc/Sda1/Ref/Fig/Sda1/pageStack.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pageStack.fig
rename to Doc/Sda1/Ref/Fig/Sda1/pageStack.fig
diff --git a/Doc/Sda1/Ref/Fig/pageref.1.fo.eps b/Doc/Sda1/Ref/Fig/Sda1/pageref.1.fo.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pageref.1.fo.eps
rename to Doc/Sda1/Ref/Fig/Sda1/pageref.1.fo.eps
diff --git a/Doc/Sda1/Ref/Fig/pageref.2.fo.eps b/Doc/Sda1/Ref/Fig/Sda1/pageref.2.fo.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pageref.2.fo.eps
rename to Doc/Sda1/Ref/Fig/Sda1/pageref.2.fo.eps
diff --git a/Doc/Sda1/Ref/Fig/pagerefStack.fig b/Doc/Sda1/Ref/Fig/Sda1/pagerefStack.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pagerefStack.fig
rename to Doc/Sda1/Ref/Fig/Sda1/pagerefStack.fig
diff --git a/Doc/Sda1/Ref/Fig/pagerefhyper.1.fo.eps b/Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.1.fo.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pagerefhyper.1.fo.eps
rename to Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.1.fo.eps
diff --git a/Doc/Sda1/Ref/Fig/pagerefhyper.2.fo.eps b/Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.2.fo.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pagerefhyper.2.fo.eps
rename to Doc/Sda1/Ref/Fig/Sda1/pagerefhyper.2.fo.eps
diff --git a/Doc/Sda1/Ref/Fig/pagerefhyperStack.fig b/Doc/Sda1/Ref/Fig/Sda1/pagerefhyperStack.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pagerefhyperStack.fig
rename to Doc/Sda1/Ref/Fig/Sda1/pagerefhyperStack.fig
diff --git a/Doc/Sda1/Ref/Fig/persistHandlerStates.fig b/Doc/Sda1/Ref/Fig/Sda1/persistHandlerStates.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/persistHandlerStates.fig
rename to Doc/Sda1/Ref/Fig/Sda1/persistHandlerStates.fig
diff --git a/Doc/Sda1/Ref/Fig/persistence.fig b/Doc/Sda1/Ref/Fig/Sda1/persistence.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/persistence.fig
rename to Doc/Sda1/Ref/Fig/Sda1/persistence.fig
diff --git a/Doc/Sda1/Ref/Fig/persistentStates.fig b/Doc/Sda1/Ref/Fig/Sda1/persistentStates.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/persistentStates.fig
rename to Doc/Sda1/Ref/Fig/Sda1/persistentStates.fig
diff --git a/Doc/Sda1/Ref/Fig/pitr_Syringe_icon.eps b/Doc/Sda1/Ref/Fig/Sda1/pitr_Syringe_icon.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pitr_Syringe_icon.eps
rename to Doc/Sda1/Ref/Fig/Sda1/pitr_Syringe_icon.eps
diff --git a/Doc/Sda1/Ref/Fig/pre.tex b/Doc/Sda1/Ref/Fig/Sda1/pre.tex
similarity index 100%
rename from Doc/Sda1/Ref/Fig/pre.tex
rename to Doc/Sda1/Ref/Fig/Sda1/pre.tex
diff --git a/Doc/Sda1/Ref/Fig/preceding.fig b/Doc/Sda1/Ref/Fig/Sda1/preceding.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/preceding.fig
rename to Doc/Sda1/Ref/Fig/Sda1/preceding.fig
diff --git a/Doc/Sda1/Ref/Fig/propernest.fig b/Doc/Sda1/Ref/Fig/Sda1/propernest.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/propernest.fig
rename to Doc/Sda1/Ref/Fig/Sda1/propernest.fig
diff --git a/Doc/Sda1/Ref/Fig/regions.fig b/Doc/Sda1/Ref/Fig/Sda1/regions.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/regions.fig
rename to Doc/Sda1/Ref/Fig/Sda1/regions.fig
diff --git a/Doc/Sda1/Ref/Fig/saxapparch.odg b/Doc/Sda1/Ref/Fig/Sda1/saxapparch.odg
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxapparch.odg
rename to Doc/Sda1/Ref/Fig/Sda1/saxapparch.odg
diff --git a/Doc/Sda1/Ref/Fig/saxapparch.pdf b/Doc/Sda1/Ref/Fig/Sda1/saxapparch.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxapparch.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/saxapparch.pdf
diff --git a/Doc/Sda1/Ref/Fig/saxcharacter.odg b/Doc/Sda1/Ref/Fig/Sda1/saxcharacter.odg
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxcharacter.odg
rename to Doc/Sda1/Ref/Fig/Sda1/saxcharacter.odg
diff --git a/Doc/Sda1/Ref/Fig/saxcharacter.pdf b/Doc/Sda1/Ref/Fig/Sda1/saxcharacter.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxcharacter.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/saxcharacter.pdf
diff --git a/Doc/Sda1/Ref/Fig/saxmodel.odg b/Doc/Sda1/Ref/Fig/Sda1/saxmodel.odg
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxmodel.odg
rename to Doc/Sda1/Ref/Fig/Sda1/saxmodel.odg
diff --git a/Doc/Sda1/Ref/Fig/saxmodel.pdf b/Doc/Sda1/Ref/Fig/Sda1/saxmodel.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxmodel.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/saxmodel.pdf
diff --git a/Doc/Sda1/Ref/Fig/saxxmlrdbms.fig b/Doc/Sda1/Ref/Fig/Sda1/saxxmlrdbms.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/saxxmlrdbms.fig
rename to Doc/Sda1/Ref/Fig/Sda1/saxxmlrdbms.fig
diff --git a/Doc/Sda1/Ref/Fig/separate.fo.pdf b/Doc/Sda1/Ref/Fig/Sda1/separate.fo.pdf
similarity index 100%
rename from Doc/Sda1/Ref/Fig/separate.fo.pdf
rename to Doc/Sda1/Ref/Fig/Sda1/separate.fo.pdf
diff --git a/Doc/Sda1/Ref/Fig/sequenceDomParser.svg b/Doc/Sda1/Ref/Fig/Sda1/sequenceDomParser.svg
similarity index 100%
rename from Doc/Sda1/Ref/Fig/sequenceDomParser.svg
rename to Doc/Sda1/Ref/Fig/Sda1/sequenceDomParser.svg
diff --git a/Doc/Sda1/Ref/Fig/skull.eps b/Doc/Sda1/Ref/Fig/Sda1/skull.eps
similarity index 100%
rename from Doc/Sda1/Ref/Fig/skull.eps
rename to Doc/Sda1/Ref/Fig/Sda1/skull.eps
diff --git a/Doc/Sda1/Ref/Fig/sqlTransport.fig b/Doc/Sda1/Ref/Fig/Sda1/sqlTransport.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/sqlTransport.fig
rename to Doc/Sda1/Ref/Fig/Sda1/sqlTransport.fig
diff --git a/Doc/Sda1/Ref/Fig/sqlTransportPrepare.fig b/Doc/Sda1/Ref/Fig/Sda1/sqlTransportPrepare.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/sqlTransportPrepare.fig
rename to Doc/Sda1/Ref/Fig/Sda1/sqlTransportPrepare.fig
diff --git a/Doc/Sda1/Ref/Fig/sqlinject.fig b/Doc/Sda1/Ref/Fig/Sda1/sqlinject.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/sqlinject.fig
rename to Doc/Sda1/Ref/Fig/Sda1/sqlinject.fig
diff --git a/Doc/Sda1/Ref/Fig/sqrtree.fig b/Doc/Sda1/Ref/Fig/Sda1/sqrtree.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/sqrtree.fig
rename to Doc/Sda1/Ref/Fig/Sda1/sqrtree.fig
diff --git a/Doc/Sda1/Ref/Fig/sqrtrender.fig b/Doc/Sda1/Ref/Fig/Sda1/sqrtrender.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/sqrtrender.fig
rename to Doc/Sda1/Ref/Fig/Sda1/sqrtrender.fig
diff --git a/Doc/Sda1/Ref/Fig/updateinfo.fig b/Doc/Sda1/Ref/Fig/Sda1/updateinfo.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/updateinfo.fig
rename to Doc/Sda1/Ref/Fig/Sda1/updateinfo.fig
diff --git a/Doc/Sda1/Ref/Fig/wellformedandvalid.fig b/Doc/Sda1/Ref/Fig/Sda1/wellformedandvalid.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/wellformedandvalid.fig
rename to Doc/Sda1/Ref/Fig/Sda1/wellformedandvalid.fig
diff --git a/Doc/Sda1/Ref/Fig/xhtml.fig b/Doc/Sda1/Ref/Fig/Sda1/xhtml.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xhtml.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xhtml.fig
diff --git a/Doc/Sda1/Ref/Fig/xhtmlexample.fig b/Doc/Sda1/Ref/Fig/Sda1/xhtmlexample.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xhtmlexample.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xhtmlexample.fig
diff --git a/Doc/Sda1/Ref/Fig/xml2fo2pdf.fig b/Doc/Sda1/Ref/Fig/Sda1/xml2fo2pdf.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xml2fo2pdf.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xml2fo2pdf.fig
diff --git a/Doc/Sda1/Ref/Fig/xml2html.fig b/Doc/Sda1/Ref/Fig/Sda1/xml2html.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xml2html.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xml2html.fig
diff --git a/Doc/Sda1/Ref/Fig/xmlattribandjava.fig b/Doc/Sda1/Ref/Fig/Sda1/xmlattribandjava.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xmlattribandjava.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xmlattribandjava.fig
diff --git a/Doc/Sda1/Ref/Fig/xmlbase.fig b/Doc/Sda1/Ref/Fig/Sda1/xmlbase.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xmlbase.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xmlbase.fig
diff --git a/Doc/Sda1/Ref/Fig/xpath.fig b/Doc/Sda1/Ref/Fig/Sda1/xpath.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xpath.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xpath.fig
diff --git a/Doc/Sda1/Ref/Fig/xsl_id.fig b/Doc/Sda1/Ref/Fig/Sda1/xsl_id.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xsl_id.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xsl_id.fig
diff --git a/Doc/Sda1/Ref/Fig/xslconvert.fig b/Doc/Sda1/Ref/Fig/Sda1/xslconvert.fig
similarity index 100%
rename from Doc/Sda1/Ref/Fig/xslconvert.fig
rename to Doc/Sda1/Ref/Fig/Sda1/xslconvert.fig
diff --git a/Doc/Sda1/dom.xml b/Doc/Sda1/dom.xml
index 9737da833..71d95370c 100644
--- a/Doc/Sda1/dom.xml
+++ b/Doc/Sda1/dom.xml
@@ -169,7 +169,7 @@ public interface Node {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/domtree.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/domtree.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -205,7 +205,7 @@ public interface Node {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/nodeHierarchy.svg"/>
+ <imagedata fileref="Ref/Fig/Sda1/nodeHierarchy.svg"/>
</imageobject>
</mediaobject>
</figure>
@@ -488,7 +488,7 @@ Article: 200W Stereo Amplifier, order number: 9921</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/sequenceDomParser.svg"/>
+ <imagedata fileref="Ref/Fig/Sda1/sequenceDomParser.svg"/>
</imageobject>
</mediaobject>
@@ -1402,7 +1402,7 @@ INSERT INTO Product VALUES('w-124', 110.40);</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xml2html.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/xml2html.fig"/>
</imageobject>
</mediaobject>
diff --git a/Doc/Sda1/fo.xml b/Doc/Sda1/fo.xml
index f40464dd1..dc61e258d 100644
--- a/Doc/Sda1/fo.xml
+++ b/Doc/Sda1/fo.xml
@@ -182,7 +182,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/regions.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/regions.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -300,7 +300,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/overlay.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/overlay.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -487,7 +487,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/headfoot.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/headfoot.fig"/>
</imageobject>
</mediaobject>
@@ -527,7 +527,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/blockprop.fo.pdf"/>
+ <imagedata fileref="Ref/Fig/Sda1/blockprop.fo.pdf"/>
</imageobject>
</mediaobject>
@@ -611,7 +611,7 @@
<mediaobject>
<imageobject>
- <imagedata align="left" fileref="Ref/Fig/itemize.fo.pdf"/>
+ <imagedata align="left" fileref="Ref/Fig/Sda1/itemize.fo.pdf"/>
</imageobject>
</mediaobject>
</figure>
@@ -649,7 +649,7 @@ page 42</fo:block> ...</programlisting>
<mediaobject>
<imageobject>
- <imagedata align="left" fileref="Ref/Fig/leader.fo.pdf"/>
+ <imagedata align="left" fileref="Ref/Fig/Sda1/leader.fo.pdf"/>
</imageobject>
</mediaobject>
</figure>
@@ -678,7 +678,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/leadermulti.fo.pdf"/>
+ <imagedata fileref="Ref/Fig/Sda1/leadermulti.fo.pdf"/>
</imageobject>
</mediaobject>
</figure>
@@ -712,7 +712,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata align="left" fileref="Ref/Fig/separate.fo.pdf"/>
+ <imagedata align="left" fileref="Ref/Fig/Sda1/separate.fo.pdf"/>
</imageobject>
</mediaobject>
</figure>
@@ -771,7 +771,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata align="left" fileref="Ref/Fig/pageStack.fig"/>
+ <imagedata align="left" fileref="Ref/Fig/Sda1/pageStack.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -819,7 +819,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata align="left" fileref="Ref/Fig/dictionaryStack.fig"/>
+ <imagedata align="left" fileref="Ref/Fig/Sda1/dictionaryStack.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -904,7 +904,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata align="left" fileref="Ref/Fig/pagerefStack.fig"/>
+ <imagedata align="left" fileref="Ref/Fig/Sda1/pagerefStack.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -942,7 +942,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/pagerefhyperStack.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/pagerefhyperStack.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -995,7 +995,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/crossmedia.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/crossmedia.fig" scale="65"/>
</imageobject>
<caption>
@@ -1128,7 +1128,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xml2fo2pdf.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/xml2fo2pdf.fig"/>
</imageobject>
</mediaobject>
diff --git a/Doc/Sda1/jdbc.xml b/Doc/Sda1/jdbc.xml
index 4269ad64e..e0cb75819 100644
--- a/Doc/Sda1/jdbc.xml
+++ b/Doc/Sda1/jdbc.xml
@@ -49,7 +49,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/persistence.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/persistence.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -85,7 +85,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/clientserv.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/clientserv.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -105,7 +105,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcThreeTier.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcThreeTier.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -126,7 +126,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcFourTier.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcFourTier.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -188,7 +188,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcurl.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcurl.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -252,7 +252,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcarch.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcarch.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -357,7 +357,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcObjectRelation.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcObjectRelation.fig"/>
</imageobject>
</mediaobject>
</figure></para>
@@ -937,7 +937,7 @@ public someClass {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/externalize.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/externalize.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -1427,7 +1427,7 @@ PersistenceHandler.username=foo</pre>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/persistHandlerStates.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/persistHandlerStates.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -1787,7 +1787,7 @@ public class InsertPerson extends JFrame {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcSniffing.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcSniffing.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -1905,7 +1905,7 @@ public class InsertPerson extends JFrame {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/heartland.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/heartland.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -1934,7 +1934,7 @@ public class InsertPerson extends JFrame {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/sqlinject.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/sqlinject.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -2153,7 +2153,7 @@ public class InsertPerson extends JFrame {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/filtering.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/filtering.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -2451,7 +2451,7 @@ public class InsertPerson extends JFrame {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/sqlTransport.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/sqlTransport.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -2503,7 +2503,7 @@ INSERT INTO Person VALUES ('Pete', 'p@rr.com')
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/sqlTransportPrepare.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/sqlTransportPrepare.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -2726,7 +2726,7 @@ public class SimpleInsert {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcReadWrite.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcReadWrite.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -2749,7 +2749,7 @@ public class SimpleInsert {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcread.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/jdbcread.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/Doc/Sda1/sax.xml b/Doc/Sda1/sax.xml
index 70ce88838..712a9107d 100644
--- a/Doc/Sda1/sax.xml
+++ b/Doc/Sda1/sax.xml
@@ -31,7 +31,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/saxxmlrdbms.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/saxxmlrdbms.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -142,7 +142,7 @@ INSERT INTO Product VALUES('<emphasis role="bold">9921</emphasis>', 121.50)</pro
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/updateinfo.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/updateinfo.fig"/>
</imageobject>
</mediaobject>
@@ -191,7 +191,7 @@ INSERT INTO Product VALUES('<emphasis role="bold">9921</emphasis>', 121.50)</pro
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/saxmodel.pdf"/>
+ <imagedata fileref="Ref/Fig/Sda1/saxmodel.pdf"/>
</imageobject>
</mediaobject>
</figure>
@@ -204,7 +204,7 @@ INSERT INTO Product VALUES('<emphasis role="bold">9921</emphasis>', 121.50)</pro
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/saxapparch.pdf"/>
+ <imagedata fileref="Ref/Fig/Sda1/saxapparch.pdf"/>
</imageobject>
<caption>
@@ -526,7 +526,7 @@ Closing Document
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/saxcharacter.pdf"/>
+ <imagedata fileref="Ref/Fig/Sda1/saxcharacter.pdf"/>
</imageobject>
</mediaobject>
diff --git a/Doc/Sda1/xmlintro.xml b/Doc/Sda1/xmlintro.xml
index b8c0b1f84..4a8e9d6f3 100644
--- a/Doc/Sda1/xmlintro.xml
+++ b/Doc/Sda1/xmlintro.xml
@@ -36,7 +36,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xhtml.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/xhtml.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -49,7 +49,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xhtmlexample.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/xhtmlexample.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -65,7 +65,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/sqrtrender.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/sqrtrender.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -121,7 +121,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/sqrtree.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/sqrtree.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -132,7 +132,7 @@
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/attributes.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/attributes.fig" scale="65"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -157,7 +157,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xmlbase.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/xmlbase.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -324,7 +324,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/propernest.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/propernest.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -337,7 +337,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/impropernest.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/impropernest.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -413,7 +413,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput>
<informalfigure xml:id="memotreeFigureFalse">
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/memotree.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/memotree.fig"/>
</imageobject>
</mediaobject>
</informalfigure>
diff --git a/Doc/Sda1/xmlschema.xml b/Doc/Sda1/xmlschema.xml
index e4f385e40..adb81863b 100644
--- a/Doc/Sda1/xmlschema.xml
+++ b/Doc/Sda1/xmlschema.xml
@@ -293,7 +293,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/contentmixed.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/contentmixed.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -476,7 +476,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/wellformedandvalid.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/wellformedandvalid.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -725,7 +725,7 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/invoicedata.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/invoicedata.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -737,7 +737,7 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/invoicedataimplement.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/invoicedataimplement.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -1102,7 +1102,7 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xmlattribandjava.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/xmlattribandjava.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/Doc/Sda1/xslt.xml b/Doc/Sda1/xslt.xml
index e0c7a520d..f382a9c92 100644
--- a/Doc/Sda1/xslt.xml
+++ b/Doc/Sda1/xslt.xml
@@ -177,7 +177,7 @@ Martin Goik</computeroutput></programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xslconvert.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/xslconvert.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -338,7 +338,7 @@ Martin Goik</computeroutput></programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xpath.fig" scale="65"/>
+ <imagedata fileref="Ref/Fig/Sda1/xpath.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -437,7 +437,7 @@ Martin Goik</computeroutput></programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/memoxpath.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/memoxpath.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -519,7 +519,7 @@ Martin Goik</computeroutput></programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/memorelativexpath.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/memorelativexpath.fig"/>
</imageobject>
<caption>
@@ -1657,7 +1657,7 @@ you need some </emphasis><em>time</em><emphasis role="bold">.</empha
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xsl_id.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/xsl_id.fig"/>
</imageobject>
<caption>
@@ -1987,7 +1987,7 @@ Jack Eve Jude <----Tolstoi----> <co
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/memofour.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/memofour.fig"/>
</imageobject>
</mediaobject>
</figure>
@@ -2060,7 +2060,7 @@ Jack Eve Jude <----Tolstoi----> <co
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/preceding.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/preceding.fig"/>
</imageobject>
<caption>
@@ -2242,7 +2242,7 @@ Jack Eve Jude <----Tolstoi----> <co
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/booknavigate.fig"/>
+ <imagedata fileref="Ref/Fig/Sda1/booknavigate.fig"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/P/pom.xml b/P/pom.xml
index cdf906452..2898e624a 100644
--- a/P/pom.xml
+++ b/P/pom.xml
@@ -77,8 +77,10 @@
<module>Sd1/Wordlist/Solution</module>
<module>Sd1/Wordlist/Solution2</module>
+
<!-- Structured data and applications 1 -->
+
<module>Sda1/saxerrorhandler</module>
<module>Sda1/catalog2sql</module>
<module>Sda1/catalog2rdbms</module>
@@ -86,6 +88,20 @@
<module>Sda1/rdbms2catalog</module>
<module>Sda1/xmlstatistics</module>
+
+ <!-- Structured data and applications 2
+
+ <module>Sda2/account</module>
+ <module>Sda2/Register</module>
+ <module>Sda2/Jpa/University</module>
+ <module>Sda2/Jpa/HibernateCacheDemo</module>
+ <module>Sda2/Jpa/Cd</module>
+ <module>Sda2/Jpa/Inherit/Tpch</module>
+ <module>Sda2/JaxRs/Intro</module>
+ <module>Sda2/forum_1</module>
+ <module>Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap</module>
+ <module>Sda2/UnixSqlLdap/Jndi/Unix2Rdbms</module>
+ -->
</modules>
<build>
--
GitLab