From b15f74caf980ec4d06ea3395409ec2e67be6f1c5 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 9 Nov 2011 15:03:14 +0000
Subject: [PATCH] ccm-sci-bundle funktioniert jetzt mit den bundles devel und
 demo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Installationsbundles, die unterhalb von local angelegt werden, funktionieren
im Moment noch nicht.

Es können jetzt installationsspezifische templates sowie Teile von themes in
~/[bundle]/templates rsp. ~/[bundle]/themes abgelegt werden, die in Zuge von
load-bundle in das entsprechende Verzeichnis von webapps/ROOT kopiert werden.

Installationsspezifische Kategorien werden unter ~/[bundle]/res/categories
angelegt. Die Dateinamen müssen entweder beibehalten werden oder unter
com.arsdigita.bundle.category_files=.... eingetragen werden.

Unter dem Verzeichnis ~/[bundle]/res/navigation kann die Datei
sci-templates.txt angepasst werden um festzulegen, welche Template Dateien
für Navigation geladen werden sollen. Die Datei kann entweder überschrieben
werden oder es kann eine neue Datei angelegt werden, deren Namen in
com.arsdigita.london.navigation.templates_file= ...
übergeben werden muss.



git-svn-id: https://svn.libreccm.org/ccm/trunk@1229 8810af33-2d31-482b-a856-94f89814c4df
---
 .../bundles/demo/res/bundle/categories/dummy  |    1 +
 .../res/bundle/categories/placeholder.info    |    3 +
 .../categories}/sci-nav-domain-1.00.xml       |    0
 .../categories}/sci-nav-hierarchy-1.00.xml    |    0
 .../bundle/categories}/xample-nav-domain.xml  |    0
 .../categories}/xample-nav-hierarchy.xml      |    0
 .../xample-nav-mapping-lgcl-anav.xml          |    0
 .../xample-nav-mapping-lgcl-anav.xsl          |    0
 .../res/bundle}/navigation/sci-templates.txt  |    0
 .../bundles/demo/res/placeholder.info         |    3 +
 .../bundles/demo/templates/placeholder.info   |   12 +
 ccm-sci-bundle/bundles/demo/themes/README     |   13 +
 .../bundles/demo/themes/master/dummy          |    1 +
 .../bundles/demo/themes/placeholder.info      |   12 +
 .../bundles/devel/cfg/integration.properties  |    2 +-
 .../categories/sci-nav-domain-1.00.xml}       |   27 +-
 .../categories/sci-nav-hierarchy-1.00.xml}    |  177 ++-
 .../bundle/categories/xample-nav-domain.xml   |  151 +++
 .../categories/xample-nav-hierarchy.xml       | 1034 +++++++++++++++++
 .../xample-nav-mapping-lgcl-anav.xml          |  160 +++
 .../xample-nav-mapping-lgcl-anav.xsl          |   44 +
 .../res/bundle/navigation/sci-templates.txt   |    9 +
 .../src/com/arsdigita/bundle/Loader.java      |    6 +-
 tools-ng/common/xsl/build-template.xsl        |   16 +-
 tools-ng/ecdc/scriptlib/build-ccm.xml         |    2 +
 25 files changed, 1559 insertions(+), 114 deletions(-)
 create mode 100644 ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy
 create mode 100644 ccm-sci-bundle/bundles/demo/res/bundle/categories/placeholder.info
 rename ccm-sci-bundle/{src/WEB-INF/sci => bundles/demo/res/bundle/categories}/sci-nav-domain-1.00.xml (100%)
 rename ccm-sci-bundle/{src/WEB-INF/sci => bundles/demo/res/bundle/categories}/sci-nav-hierarchy-1.00.xml (100%)
 rename ccm-sci-bundle/{src/WEB-INF/sci => bundles/demo/res/bundle/categories}/xample-nav-domain.xml (100%)
 rename ccm-sci-bundle/{src/WEB-INF/sci => bundles/demo/res/bundle/categories}/xample-nav-hierarchy.xml (100%)
 rename ccm-sci-bundle/{src/WEB-INF/sci => bundles/demo/res/bundle/categories}/xample-nav-mapping-lgcl-anav.xml (100%)
 rename ccm-sci-bundle/{src/WEB-INF/sci => bundles/demo/res/bundle/categories}/xample-nav-mapping-lgcl-anav.xsl (100%)
 rename ccm-sci-bundle/{src/WEB-INF => bundles/demo/res/bundle}/navigation/sci-templates.txt (100%)
 create mode 100644 ccm-sci-bundle/bundles/demo/res/placeholder.info
 create mode 100644 ccm-sci-bundle/bundles/demo/templates/placeholder.info
 create mode 100644 ccm-sci-bundle/bundles/demo/themes/README
 create mode 100644 ccm-sci-bundle/bundles/demo/themes/master/dummy
 create mode 100644 ccm-sci-bundle/bundles/demo/themes/placeholder.info
 rename ccm-sci-bundle/{src/WEB-INF/sci/zes-nav-domain-1.00.xml~ => bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml} (61%)
 rename ccm-sci-bundle/{src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml~ => bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml} (82%)
 create mode 100644 ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml
 create mode 100644 ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml
 create mode 100644 ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
 create mode 100644 ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
 create mode 100755 ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt

diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy b/ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy
new file mode 100644
index 000000000..f9c053b8b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/res/bundle/categories/dummy
@@ -0,0 +1 @@
+Dummy file for developing & testing purpose
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/categories/placeholder.info b/ccm-sci-bundle/bundles/demo/res/bundle/categories/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/res/bundle/categories/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory  <cat> may optionally contain one or more local site specific 
+import xml files for Terms domain categories. 
+
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/sci-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-domain-1.00.xml
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/sci/sci-nav-domain-1.00.xml
rename to ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-domain-1.00.xml
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/sci-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-hierarchy-1.00.xml
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/sci/sci-nav-hierarchy-1.00.xml
rename to ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-hierarchy-1.00.xml
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/xample-nav-domain.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/sci/xample-nav-domain.xml
rename to ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/xample-nav-hierarchy.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/sci/xample-nav-hierarchy.xml
rename to ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/xample-nav-mapping-lgcl-anav.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/sci/xample-nav-mapping-lgcl-anav.xml
rename to ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/xample-nav-mapping-lgcl-anav.xsl b/ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/sci/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-sci-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-sci-bundle/src/WEB-INF/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt
similarity index 100%
rename from ccm-sci-bundle/src/WEB-INF/navigation/sci-templates.txt
rename to ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt
diff --git a/ccm-sci-bundle/bundles/demo/res/placeholder.info b/ccm-sci-bundle/bundles/demo/res/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/res/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory  <cat> may optionally contain one or more local site specific 
+import xml files for Terms domain categories. 
+
diff --git a/ccm-sci-bundle/bundles/demo/templates/placeholder.info b/ccm-sci-bundle/bundles/demo/templates/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/templates/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/demo/themes/README b/ccm-sci-bundle/bundles/demo/themes/README
new file mode 100644
index 000000000..13248d9bb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/themes/README
@@ -0,0 +1,13 @@
+Bundle subdir themes
+
+Purpose:
+This subdir may optionally contain theme files which either replace part of the
+theme or add files to the theme provided as default for ScientificCMS and this
+way adopt the theme for site specific design. 
+
+All files and subdirectories all copied asis to the applications ~/themes 
+directory in its document (context) root.
+
+It is the responsibility of developer / system integrator to ensure all files
+are copied to the right location and the theme works with the modification. No
+functionality or consistency check is perfordmed!
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/demo/themes/master/dummy b/ccm-sci-bundle/bundles/demo/themes/master/dummy
new file mode 100644
index 000000000..beec54a4d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/themes/master/dummy
@@ -0,0 +1 @@
+Just a dummy file for test purpose during development.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/demo/themes/placeholder.info b/ccm-sci-bundle/bundles/demo/themes/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/themes/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 367634a7e..d1ecee462 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -98,7 +98,7 @@ com.arsdigita.london.navigation.category_menu_show_grand_children=false
 com.arsdigita.london.navigation.default_cat_root_path=/navigation/
 # com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
 com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp
-com.arsdigita.london.navigation.templates_file=WEB-INF/navigation/sci-templates.txt
+com.arsdigita.london.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
 # ccm-ldn-search application
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-domain-1.00.xml~ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml
similarity index 61%
rename from ccm-sci-bundle/src/WEB-INF/sci/zes-nav-domain-1.00.xml~
rename to ccm-sci-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml
index 7ab60bee2..31486e212 100644
--- a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-domain-1.00.xml~
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Document   : domain-nav-zes-1.00.xml
+    Document   : domain-nav-sci-1.00.xml
     Created on : 8. Aug. 2007, 10:00
     Author     : pb
     Description:
@@ -10,16 +10,17 @@
 
 <terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
               about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
-              key="ZES-NAV" 
-              title="ZeS Navigation List" 
+              key="STD-NAV" 
+              title="Sci Navigation List" 
               version="1.00" released="2007-08-10">
 
   <terms:term id="1000" name="Institut" inAtoZ="false"/>
     <terms:term id="1200" name="Abteilungen" inAtoZ="false"/>
-      <terms:term id="1220" name="Abteilung Theorie und Verfassung des Wohlfahrsstaates" inAtoZ="false"/>
-      <terms:term id="1220" name="Abteilung Institutionen und Geschichte des Wohlfahrsstaates" inAtoZ="false"/>
-      <terms:term id="1220" name="Wirtschaftswissenschaftliche Abteilung" inAtoZ="false"/>
-      <terms:term id="1220" name="Geschlechterpolitik im Wohlfahrtsstaat" inAtoZ="false"/>
+      <terms:term id="1220" name="Abteilung 1" inAtoZ="false"/>
+      <terms:term id="1240" name="Abteilung 2" inAtoZ="false"/>
+      <terms:term id="1260" name="Abteilung 3" inAtoZ="false"/>
+      <terms:term id="1280" name="Abteilung 4" inAtoZ="false"/>
+      <terms:term id="1300" name="Abteilung 5" inAtoZ="false"/>
     <terms:term id="1400" name="Mitglieder" inAtoZ="false"/>
     <terms:term id="1600" name="Bibliothek" inAtoZ="false"/>
     <terms:term id="1800" name="Ankündigungen" inAtoZ="false"/>
@@ -30,15 +31,15 @@
       <terms:term id="3420" name="Publikationen" inAtoZ="false"/>
       <terms:term id="3440" name="Arbeitspapiere" inAtoZ="false"/>
       <terms:term id="3460" name="Schriftenreihe" inAtoZ="false"/>
-      <terms:term id="3480" name="ZeS Report" inAtoZ="false"/>
+      <terms:term id="3480" name="Sci Report" inAtoZ="false"/>
       <terms:term id="3500" name="Jahresberichte" inAtoZ="false"/>
-    <terms:term id="3800" name="Gesundheitspolitisches Kolloquium" inAtoZ="false"/>
-    <terms:term id="4000" name="Jour Fix" inAtoZ="false"/>
-    <terms:term id="4200" name="Tagungen" inAtoZ="false"/>
+    <terms:term id="3600" name="Kolloquium" inAtoZ="false"/>
+    <terms:term id="3800" name="Jour Fix" inAtoZ="false"/>
+    <terms:term id="4000" name="Tagungen" inAtoZ="false"/>
   
   <terms:term id="5000" name="Lehre und Studium" inAtoZ="false"/>
-    <terms:term id="5100" name="Masterstudiengang Sozialpolitik" inAtoZ="false"/>
-    <terms:term id="5350" name="Weitere Lehre" inAtoZ="false"/>
+    <terms:term id="5200" name="Masterstudiengang Sci" inAtoZ="false"/>
+    <terms:term id="5400" name="Weitere Lehre" inAtoZ="false"/>
     
   <terms:term id="9002" name="Archiv" inAtoZ="false"/>
   <terms:term id="9200" name="Informative Links" inAtoZ="false"/>
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml~ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml
similarity index 82%
rename from ccm-sci-bundle/src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml~
rename to ccm-sci-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml
index 85e926879..cfce50400 100644
--- a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml~
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Document   : hierarchy-nav-zes-1.00.xml
+    Document   : hierarchy-nav-sci-1.00.xml
     Created on : 8. Aug. 2007, 10:30
     Author     : pb
     Description:
@@ -24,6 +24,53 @@
     </terms:destination>
   </terms:orderedPair>
 
+  <!--  narrower terms, second level  -->
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1220"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1240"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1260"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1280"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1300"/>
+    </terms:destination>
+  </terms:orderedPair>
+<!--  narrower terms, second level END  -->
+  
   <terms:orderedPair>
     <terms:source>
       <terms:term id="1000"/>
@@ -56,7 +103,7 @@
       <terms:term id="1000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="2100"/>
+      <terms:term id="9002"/>
     </terms:destination>
   </terms:orderedPair>
 
@@ -65,7 +112,7 @@
       <terms:term id="1000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9001"/>
+      <terms:term id="9200"/>
     </terms:destination>
   </terms:orderedPair>
 
@@ -93,7 +140,34 @@
       <terms:term id="3400"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3450"/>
+      <terms:term id="3420"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3440"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3460"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3480"/>
     </terms:destination>
   </terms:orderedPair>
 
@@ -125,61 +199,12 @@
     </terms:destination>
   </terms:orderedPair>
 
-  
-  <!--  narrower terms, second level  -->
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3800"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3840"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3800"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3880"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3800"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3920"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <!--  narrower terms, second level END  -->
-  
-  
   <terms:orderedPair>
     <terms:source>
       <terms:term id="3000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="4100"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="4300"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9200"/>
+      <terms:term id="4000"/>
     </terms:destination>
   </terms:orderedPair>
 
@@ -189,7 +214,7 @@
       <terms:term id="5000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5100"/>
+      <terms:term id="5200"/>
     </terms:destination>
   </terms:orderedPair>
   <terms:orderedPair>
@@ -197,47 +222,7 @@
       <terms:term id="5000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5350"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5600"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5900"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="6100"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="6800"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9002"/>
+      <terms:term id="5200"/>
     </terms:destination>
   </terms:orderedPair>
   
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml
new file mode 100644
index 000000000..87ee0c8c2
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
+              about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
+              key="APLAWS-NAV" 
+              title="APLAWS Navigation List" 
+              version="1.03" released="2004-03-24">
+                  
+  <terms:term id="1" name="Business" inAtoZ="false"/>
+  <terms:term id="1007" name="Jobs and careers" inAtoZ="false"/>
+  <terms:term id="1021" name="Legal services" inAtoZ="false"/>
+  <terms:term id="1039" name="Leisure and culture" inAtoZ="false"/>
+  <terms:term id="1286" name="Policing and public safety" inAtoZ="false"/>
+  <terms:term id="1325" name="Social issues" inAtoZ="false"/>
+  <terms:term id="1337" name="Transport and streets" inAtoZ="false"/>
+  <terms:term id="204" name="Education and learning" inAtoZ="false"/>
+  <terms:term id="281" name="Environment" inAtoZ="false"/>
+  <terms:term id="3088" name="Council, government and democracy" inAtoZ="false"/>
+  <terms:term id="3168" name="Obsolete terms" inAtoZ="false"/>
+  <terms:term id="596" name="Health and social care" inAtoZ="false"/>
+  <terms:term id="93" name="Community and living" inAtoZ="false"/>
+  <terms:term id="946" name="Housing" inAtoZ="false"/>
+  <terms:term id="11" name="Business promotion" inAtoZ="false"/>
+  <terms:term id="15" name="Business property" inAtoZ="false"/>
+  <terms:term id="1523" name="Business procurement" inAtoZ="false"/>
+  <terms:term id="21" name="Business sectors and services" inAtoZ="false"/>
+  <terms:term id="3100" name="Workers' co-operatives" inAtoZ="false"/>
+  <terms:term id="3300" name="Business and street trading licences" inAtoZ="false"/>
+  <terms:term id="3323" name="Business support and advice" inAtoZ="false"/>
+  <terms:term id="3329" name="Imports and exports" inAtoZ="false"/>
+  <terms:term id="5" name="Business finance" inAtoZ="false"/>
+  <terms:term id="59" name="Economic development" inAtoZ="false"/>
+  <terms:term id="62" name="Employing people" inAtoZ="false"/>
+  <terms:term id="66" name="Health and safety" inAtoZ="false"/>
+  <terms:term id="70" name="Trading standards" inAtoZ="false"/>
+  <terms:term id="8" name="Business opportunities" inAtoZ="false"/>
+  <terms:term id="1008" name="Finding work" inAtoZ="false"/>
+  <terms:term id="1017" name="Retirement" inAtoZ="false"/>
+  <terms:term id="1026" name="Legal advice" inAtoZ="false"/>
+  <terms:term id="1029" name="Courts" inAtoZ="false"/>
+  <terms:term id="1037" name="Probation" inAtoZ="false"/>
+  <terms:term id="1308" name="Police" inAtoZ="false"/>
+  <terms:term id="1309" name="Prisons" inAtoZ="false"/>
+  <terms:term id="1326" name="Equal opportunities" inAtoZ="false"/>
+  <terms:term id="2083" name="Legislation" inAtoZ="false"/>
+  <terms:term id="3025" name="Civil and human rights" inAtoZ="false"/>
+  <terms:term id="3441" name="Legal professions" inAtoZ="false"/>
+  <terms:term id="3442" name="Young offending" inAtoZ="false"/>
+  <terms:term id="1041" name="Arts and entertainment" inAtoZ="false"/>
+  <terms:term id="1098" name="Children's activities" inAtoZ="false"/>
+  <terms:term id="1102" name="Libraries" inAtoZ="false"/>
+  <terms:term id="1106" name="Local history and heritage" inAtoZ="false"/>
+  <terms:term id="1113" name="Hobbies and interests" inAtoZ="false"/>
+  <terms:term id="1132" name="Parks and recreation" inAtoZ="false"/>
+  <terms:term id="1164" name="Social clubs" inAtoZ="false"/>
+  <terms:term id="1165" name="Sports" inAtoZ="false"/>
+  <terms:term id="1248" name="Tourism and travel" inAtoZ="false"/>
+  <terms:term id="1258" name="Uniformed groups" inAtoZ="false"/>
+  <terms:term id="1261" name="Young people's activities" inAtoZ="false"/>
+  <terms:term id="1482" name="Museums and galleries" inAtoZ="false"/>
+  <terms:term id="1287" name="Accidents, emergencies and safety" inAtoZ="false"/>
+  <terms:term id="1298" name="Coastguard" inAtoZ="false"/>
+  <terms:term id="1299" name="Crime and law enforcement" inAtoZ="false"/>
+  <terms:term id="1310" name="Victim support" inAtoZ="false"/>
+  <terms:term id="1311" name="Discrimination or harassment" inAtoZ="false"/>
+  <terms:term id="3454" name="Fire fighting and rescue services" inAtoZ="false"/>
+<!-- bug: this appears twice (look up a bit)
+  <terms:term id="1326" name="Equal opportunities" inAtoZ="false"/>
+-->
+  <terms:term id="1327" name="Identity cards" inAtoZ="false"/>
+  <terms:term id="1328" name="Immigration and nationality" inAtoZ="false"/>
+  <terms:term id="1329" name="Sexual orientation" inAtoZ="false"/>
+  <terms:term id="1331" name="Firearms" inAtoZ="false"/>
+  <terms:term id="1332" name="Population and migration" inAtoZ="false"/>
+  <terms:term id="1333" name="Privacy and data protection" inAtoZ="false"/>
+  <terms:term id="1335" name="Rural communities" inAtoZ="false"/>
+  <terms:term id="1336" name="Social inclusion" inAtoZ="false"/>
+  <terms:term id="697" name="Family planning" inAtoZ="false"/>
+  <terms:term id="1352" name="Public rights of way" inAtoZ="false"/>
+  <terms:term id="1353" name="Motor vehicles, roads and parking" inAtoZ="false"/>
+  <terms:term id="1388" name="Public transport" inAtoZ="false"/>
+  <terms:term id="1402" name="Road and pathway maintenance" inAtoZ="false"/>
+  <terms:term id="1424" name="Transport planning" inAtoZ="false"/>
+  <terms:term id="3457" name="Ports and harbours" inAtoZ="false"/>
+  <terms:term id="3459" name="Waterways" inAtoZ="false"/>
+  <terms:term id="3461" name="Reservoirs" inAtoZ="false"/>
+  <terms:term id="205" name="Educational institutions" inAtoZ="false"/>
+  <terms:term id="206" name="Distance learning" inAtoZ="false"/>
+  <terms:term id="212" name="Language tuition" inAtoZ="false"/>
+  <terms:term id="219" name="Adult and community education" inAtoZ="false"/>
+  <terms:term id="2237" name="Teaching" inAtoZ="false"/>
+  <terms:term id="238" name="Work based learning" inAtoZ="false"/>
+  <terms:term id="280" name="Youth service" inAtoZ="false"/>
+  <terms:term id="3008" name="Higher education" inAtoZ="false"/>
+  <terms:term id="3345" name="Home education" inAtoZ="false"/>
+  <terms:term id="3346" name="School library service" inAtoZ="false"/>
+  <terms:term id="3347" name="Schools and colleges" inAtoZ="false"/>
+  <terms:term id="3359" name="Education welfare services" inAtoZ="false"/>
+  <terms:term id="3366" name="Youth support" inAtoZ="false"/>
+  <terms:term id="3440" name="Job training and development" inAtoZ="false"/>
+  <terms:term id="284" name="Animal welfare" inAtoZ="false"/>
+  <terms:term id="3374" name="Land and premises" inAtoZ="false"/>
+  <terms:term id="3379" name="Pests and nuisance" inAtoZ="false"/>
+  <terms:term id="3391" name="Pollution" inAtoZ="false"/>
+  <terms:term id="3393" name="Street care and cleaning" inAtoZ="false"/>
+  <terms:term id="3400" name="Town centre management" inAtoZ="false"/>
+  <terms:term id="347" name="Food production and quality" inAtoZ="false"/>
+  <terms:term id="372" name="Planning" inAtoZ="false"/>
+  <terms:term id="409" name="Energy" inAtoZ="false"/>
+  <terms:term id="420" name="Rubbish, waste and recycling" inAtoZ="false"/>
+  <terms:term id="451" name="Weather" inAtoZ="false"/>
+  <terms:term id="13" name="Information management" inAtoZ="false"/>
+  <terms:term id="3116" name="Democratic processes and events" inAtoZ="false"/>
+  <terms:term id="3344" name="Data protection and freedom of information" inAtoZ="false"/>
+  <terms:term id="454" name="Central government" inAtoZ="false"/>
+  <terms:term id="459" name="Councils" inAtoZ="false"/>
+  <terms:term id="524" name="Elections" inAtoZ="false"/>
+  <terms:term id="552" name="European affairs" inAtoZ="false"/>
+  <terms:term id="566" name="International affairs" inAtoZ="false"/>
+  <terms:term id="569" name="Non-governmental organisations" inAtoZ="false"/>
+  <terms:term id="584" name="Political parties" inAtoZ="false"/>
+  <terms:term id="592" name="Public services" inAtoZ="false"/>
+  <terms:term id="593" name="Regional governments" inAtoZ="false"/>
+  <terms:term id="178" name="Village newsletters" inAtoZ="false"/>
+  <terms:term id="462" name="Council documents, facts and figures" inAtoZ="false"/>
+  <terms:term id="514" name="Petitions" inAtoZ="false"/>
+  <terms:term id="515" name="Surveys" inAtoZ="false"/>
+  <terms:term id="597" name="Health and medical care" inAtoZ="false"/>
+  <terms:term id="631" name="Disabilities" inAtoZ="false"/>
+  <terms:term id="856" name="Social policy" inAtoZ="false"/>
+  <terms:term id="860" name="Social services" inAtoZ="false"/>
+  <terms:term id="107" name="Ethnic communities" inAtoZ="false"/>
+  <terms:term id="1302" name="Community safety" inAtoZ="false"/>
+  <terms:term id="1527" name="Life events" inAtoZ="false"/>
+  <terms:term id="182" name="Twinning" inAtoZ="false"/>
+  <terms:term id="184" name="Voluntary organisations" inAtoZ="false"/>
+  <terms:term id="201" name="Volunteering" inAtoZ="false"/>
+  <terms:term id="3013" name="Neighbourhood and village" inAtoZ="false"/>
+  <terms:term id="3101" name="Interpreters' services" inAtoZ="false"/>
+  <terms:term id="3118" name="Charities and citizens' interest groups" inAtoZ="false"/>
+  <terms:term id="3330" name="Community grants" inAtoZ="false"/>
+  <terms:term id="3332" name="Faiths, beliefs and religions" inAtoZ="false"/>
+  <terms:term id="95" name="Consumer advice and protection" inAtoZ="false"/>
+  <terms:term id="1627" name="Supported and sheltered housing" inAtoZ="false"/>
+  <terms:term id="2639" name="Private housing" inAtoZ="false"/>
+  <terms:term id="3424" name="Housing associations and co-operatives" inAtoZ="false"/>
+  <terms:term id="3426" name="Housing finance" inAtoZ="false"/>
+  <terms:term id="3430" name="Housing improvement and repairs" inAtoZ="false"/>
+  <terms:term id="3438" name="Multiple occupancy homes" inAtoZ="false"/>
+  <terms:term id="952" name="Housing advice" inAtoZ="false"/>
+  <terms:term id="960" name="Council housing" inAtoZ="false"/>
+</terms:domain>
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml
new file mode 100644
index 000000000..ed6c7c16b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml
@@ -0,0 +1,1034 @@
+<?xml version="1.0"?>
+<terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
+  <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
+  <terms:term id="1"/>
+  <terms:term id="1007"/>
+  <terms:term id="1021"/>
+  <terms:term id="1039"/>
+  <terms:term id="1286"/>
+  <terms:term id="1325"/>
+  <terms:term id="1337"/>
+  <terms:term id="204"/>
+  <terms:term id="281"/>
+  <terms:term id="3088"/>
+  <terms:term id="3168"/>
+  <terms:term id="596"/>
+  <terms:term id="93"/>
+  <terms:term id="946"/>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="11"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="15"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1523"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="21"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3100"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3300"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3323"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3329"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="5"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="59"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="62"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="66"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="70"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="8"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1007"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1008"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1007"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1017"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1026"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1029"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1037"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1308"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1309"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1326"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="2083"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3025"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3441"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1021"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3442"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1041"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1098"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1102"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1106"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1113"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1132"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="false">
+      <terms:term id="1164"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1165"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1248"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1258"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1261"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1039"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1482"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1286"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1287"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1286"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1298"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1286"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1299"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1286"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1310"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1286"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1311"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1286"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3454"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1326"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1327"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1328"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1329"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1331"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1332"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1333"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1335"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1336"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1325"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="697"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1352"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1353"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1388"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1402"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1424"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3457"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3459"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1337"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3461"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="205"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="206"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="212"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="219"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="2237"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="238"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="280"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3008"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3345"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3346"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3347"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3359"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3366"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="204"/>
+    </terms:source>
+    <terms:destination isDefault="false" isPreferred="true">
+      <terms:term id="3440"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="284"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3374"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3379"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3391"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3393"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3400"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="347"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="372"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="false" isPreferred="true">
+      <terms:term id="409"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="420"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="281"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="451"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="13"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3116"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3344"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="454"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="459"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="524"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="552"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="566"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="569"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="584"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="592"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3088"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="593"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3168"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="false">
+      <terms:term id="178"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3168"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="false">
+      <terms:term id="462"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3168"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="false">
+      <terms:term id="514"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3168"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="false">
+      <terms:term id="515"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="596"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="597"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="596"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="631"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="596"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="856"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="596"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="860"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="107"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1302"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1527"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="182"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="184"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="201"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3013"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3101"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="false" isPreferred="true">
+      <terms:term id="3118"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3330"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3332"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="93"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="95"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1627"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="2639"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3424"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3426"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3430"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3438"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="952"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="946"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="960"/>
+    </terms:destination>
+  </terms:orderedPair>
+</terms:hierarchy>
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
new file mode 100644
index 000000000..b983bd2d7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<terms:mapping xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
+    <terms:source>
+        <terms:domain resource="http://www.esd.org.uk/standards/lgcl/1.03/termslist.xml"/>
+    </terms:source>
+    <terms:destination>
+        <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
+    </terms:destination>
+
+  <terms:orderedPair>
+      <terms:source><terms:term id="1"/></terms:source>
+      <terms:destination><terms:term id="1"/></terms:destination>
+  </terms:orderedPair>
+  
+  <terms:orderedPair>
+      <terms:source><terms:term id="1007"/></terms:source>
+      <terms:destination><terms:term id="1007"/></terms:destination>
+  </terms:orderedPair>
+  
+  <terms:orderedPair><terms:source><terms:term id="1021"/></terms:source><terms:destination><terms:term id="1021"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1039"/></terms:source><terms:destination><terms:term id="1039"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1286"/></terms:source><terms:destination><terms:term id="1286"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1325"/></terms:source><terms:destination><terms:term id="1325"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1337"/></terms:source><terms:destination><terms:term id="1337"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="204"/></terms:source><terms:destination><terms:term id="204"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="281"/></terms:source><terms:destination><terms:term id="281"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3088"/></terms:source><terms:destination><terms:term id="3088"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3168"/></terms:source><terms:destination><terms:term id="3168"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="596"/></terms:source><terms:destination><terms:term id="596"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="93"/></terms:source><terms:destination><terms:term id="93"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="946"/></terms:source><terms:destination><terms:term id="946"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="11"/></terms:source><terms:destination><terms:term id="11"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="15"/></terms:source><terms:destination><terms:term id="15"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1523"/></terms:source><terms:destination><terms:term id="1523"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="21"/></terms:source><terms:destination><terms:term id="21"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3100"/></terms:source><terms:destination><terms:term id="3100"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3300"/></terms:source><terms:destination><terms:term id="3300"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3323"/></terms:source><terms:destination><terms:term id="3323"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3329"/></terms:source><terms:destination><terms:term id="3329"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="5"/></terms:source><terms:destination><terms:term id="5"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="59"/></terms:source><terms:destination><terms:term id="59"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="62"/></terms:source><terms:destination><terms:term id="62"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="66"/></terms:source><terms:destination><terms:term id="66"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="70"/></terms:source><terms:destination><terms:term id="70"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="8"/></terms:source><terms:destination><terms:term id="8"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1008"/></terms:source><terms:destination><terms:term id="1008"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1017"/></terms:source><terms:destination><terms:term id="1017"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1026"/></terms:source><terms:destination><terms:term id="1026"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1029"/></terms:source><terms:destination><terms:term id="1029"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1037"/></terms:source><terms:destination><terms:term id="1037"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1308"/></terms:source><terms:destination><terms:term id="1308"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1309"/></terms:source><terms:destination><terms:term id="1309"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1326"/></terms:source><terms:destination><terms:term id="1326"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="2083"/></terms:source><terms:destination><terms:term id="2083"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3025"/></terms:source><terms:destination><terms:term id="3025"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3441"/></terms:source><terms:destination><terms:term id="3441"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3442"/></terms:source><terms:destination><terms:term id="3442"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1041"/></terms:source><terms:destination><terms:term id="1041"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1098"/></terms:source><terms:destination><terms:term id="1098"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1102"/></terms:source><terms:destination><terms:term id="1102"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1106"/></terms:source><terms:destination><terms:term id="1106"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1113"/></terms:source><terms:destination><terms:term id="1113"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1132"/></terms:source><terms:destination><terms:term id="1132"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1164"/></terms:source><terms:destination><terms:term id="1164"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1165"/></terms:source><terms:destination><terms:term id="1165"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1248"/></terms:source><terms:destination><terms:term id="1248"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1258"/></terms:source><terms:destination><terms:term id="1258"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1261"/></terms:source><terms:destination><terms:term id="1261"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1482"/></terms:source><terms:destination><terms:term id="1482"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1287"/></terms:source><terms:destination><terms:term id="1287"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1298"/></terms:source><terms:destination><terms:term id="1298"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1299"/></terms:source><terms:destination><terms:term id="1299"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1310"/></terms:source><terms:destination><terms:term id="1310"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1311"/></terms:source><terms:destination><terms:term id="1311"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3454"/></terms:source><terms:destination><terms:term id="3454"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1326"/></terms:source><terms:destination><terms:term id="1326"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1327"/></terms:source><terms:destination><terms:term id="1327"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1328"/></terms:source><terms:destination><terms:term id="1328"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1329"/></terms:source><terms:destination><terms:term id="1329"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1331"/></terms:source><terms:destination><terms:term id="1331"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1332"/></terms:source><terms:destination><terms:term id="1332"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1333"/></terms:source><terms:destination><terms:term id="1333"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1335"/></terms:source><terms:destination><terms:term id="1335"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1336"/></terms:source><terms:destination><terms:term id="1336"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="697"/></terms:source><terms:destination><terms:term id="697"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1352"/></terms:source><terms:destination><terms:term id="1352"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1353"/></terms:source><terms:destination><terms:term id="1353"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1388"/></terms:source><terms:destination><terms:term id="1388"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1402"/></terms:source><terms:destination><terms:term id="1402"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1424"/></terms:source><terms:destination><terms:term id="1424"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3457"/></terms:source><terms:destination><terms:term id="3457"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3459"/></terms:source><terms:destination><terms:term id="3459"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3461"/></terms:source><terms:destination><terms:term id="3461"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="205"/></terms:source><terms:destination><terms:term id="205"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="206"/></terms:source><terms:destination><terms:term id="206"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="212"/></terms:source><terms:destination><terms:term id="212"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="219"/></terms:source><terms:destination><terms:term id="219"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="2237"/></terms:source><terms:destination><terms:term id="2237"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="238"/></terms:source><terms:destination><terms:term id="238"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="280"/></terms:source><terms:destination><terms:term id="280"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3008"/></terms:source><terms:destination><terms:term id="3008"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3345"/></terms:source><terms:destination><terms:term id="3345"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3346"/></terms:source><terms:destination><terms:term id="3346"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3347"/></terms:source><terms:destination><terms:term id="3347"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3359"/></terms:source><terms:destination><terms:term id="3359"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3366"/></terms:source><terms:destination><terms:term id="3366"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3440"/></terms:source><terms:destination><terms:term id="3440"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="284"/></terms:source><terms:destination><terms:term id="284"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3374"/></terms:source><terms:destination><terms:term id="3374"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3379"/></terms:source><terms:destination><terms:term id="3379"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3391"/></terms:source><terms:destination><terms:term id="3391"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3393"/></terms:source><terms:destination><terms:term id="3393"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3400"/></terms:source><terms:destination><terms:term id="3400"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="347"/></terms:source><terms:destination><terms:term id="347"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="372"/></terms:source><terms:destination><terms:term id="372"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="409"/></terms:source><terms:destination><terms:term id="409"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="420"/></terms:source><terms:destination><terms:term id="420"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="451"/></terms:source><terms:destination><terms:term id="451"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="13"/></terms:source><terms:destination><terms:term id="13"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3116"/></terms:source><terms:destination><terms:term id="3116"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3344"/></terms:source><terms:destination><terms:term id="3344"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="454"/></terms:source><terms:destination><terms:term id="454"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="459"/></terms:source><terms:destination><terms:term id="459"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="524"/></terms:source><terms:destination><terms:term id="524"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="552"/></terms:source><terms:destination><terms:term id="552"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="566"/></terms:source><terms:destination><terms:term id="566"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="569"/></terms:source><terms:destination><terms:term id="569"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="584"/></terms:source><terms:destination><terms:term id="584"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="592"/></terms:source><terms:destination><terms:term id="592"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="593"/></terms:source><terms:destination><terms:term id="593"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="178"/></terms:source><terms:destination><terms:term id="178"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="462"/></terms:source><terms:destination><terms:term id="462"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="514"/></terms:source><terms:destination><terms:term id="514"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="515"/></terms:source><terms:destination><terms:term id="515"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="597"/></terms:source><terms:destination><terms:term id="597"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="631"/></terms:source><terms:destination><terms:term id="631"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="856"/></terms:source><terms:destination><terms:term id="856"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="860"/></terms:source><terms:destination><terms:term id="860"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="107"/></terms:source><terms:destination><terms:term id="107"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1302"/></terms:source><terms:destination><terms:term id="1302"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1527"/></terms:source><terms:destination><terms:term id="1527"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="182"/></terms:source><terms:destination><terms:term id="182"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="184"/></terms:source><terms:destination><terms:term id="184"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="201"/></terms:source><terms:destination><terms:term id="201"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3013"/></terms:source><terms:destination><terms:term id="3013"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3101"/></terms:source><terms:destination><terms:term id="3101"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3118"/></terms:source><terms:destination><terms:term id="3118"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3330"/></terms:source><terms:destination><terms:term id="3330"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3332"/></terms:source><terms:destination><terms:term id="3332"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="95"/></terms:source><terms:destination><terms:term id="95"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="1627"/></terms:source><terms:destination><terms:term id="1627"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="2639"/></terms:source><terms:destination><terms:term id="2639"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3424"/></terms:source><terms:destination><terms:term id="3424"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3426"/></terms:source><terms:destination><terms:term id="3426"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3430"/></terms:source><terms:destination><terms:term id="3430"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="3438"/></terms:source><terms:destination><terms:term id="3438"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="952"/></terms:source><terms:destination><terms:term id="952"/></terms:destination></terms:orderedPair>
+  <terms:orderedPair><terms:source><terms:term id="960"/></terms:source><terms:destination><terms:term id="960"/></terms:destination></terms:orderedPair>
+</terms:mapping>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
new file mode 100644
index 000000000..34b25d21e
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
+
+  <xsl:template match="terms:domain">
+
+    <terms:mapping xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
+      <terms:source>
+        <terms:domain resource="http://www.esd.org.uk/standards/lgcl/1.03/termslist.xml"/>
+      </terms:source>
+      <terms:destination>
+        <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
+      </terms:destination>
+      
+      <xsl:apply-templates />
+    
+    </terms:mapping>
+
+  </xsl:template>
+
+  <xsl:template match="terms:term">
+    
+    <terms:orderedPair>
+      <terms:source>
+        <terms:term>
+          <xsl:attribute name="id">
+            <xsl:value-of select="@id" />
+          </xsl:attribute> 
+        </terms:term>
+      </terms:source>
+      <terms:destination>
+        <terms:term>
+          <xsl:attribute name="id">
+            <xsl:value-of select="@id" />
+          </xsl:attribute> 
+        </terms:term>
+      </terms:destination>
+    </terms:orderedPair>
+
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
new file mode 100755
index 000000000..80d8612e5
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
@@ -0,0 +1,9 @@
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/sci-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/sci-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/sci-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
index 290fa5318..952d5298a 100644
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
+++ b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
@@ -88,8 +88,8 @@ public class Loader extends PackageLoader {
     private Parameter m_categoryFiles = new StringArrayParameter(
                 "com.arsdigita.bundle.category_files",
                 Parameter.REQUIRED,new String[]{
-                    "WEB-INF/sci/sci-nav-domain-1.00.xml",
-                    "WEB-INF/sci/sci-nav-hierarchy-1.00.xml" }
+                    "bundle/categories/sci-nav-domain-1.00.xml",
+                    "bundle/categories/sci-nav-hierarchy-1.00.xml" }
                 );
 
     /**
@@ -121,7 +121,7 @@ public class Loader extends PackageLoader {
      */
     public Loader() {
 
-        // Register defined parametgers to the context by adding 
+        // Register defined parameters to the context by adding 
         // the parameter to a map of parameters
         register(m_customApplicationInstances);
         register(m_categoryFiles);
diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index dda7a525c..0513d7011 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -1300,7 +1300,21 @@
       <copy todir="${{this.deploy.dir}}/WEB-INF/bin/bundle" overwrite="yes">
       -->
       <copy todir="${{this.bundle.dir}}" overwrite="yes">
-            <fileset dir="${{resolved.bundle.source.dir}}" />
+            <fileset dir="${{resolved.bundle.source.dir}}" >
+                <include name="cfg/" />
+                <include name="res/" />
+                <exclude name="**placeholder.info**" />
+                <exclude name="res/**README**" />
+            </fileset>
+      </copy>
+
+      <copy todir="${{this.deploy.dir}}" overwrite="yes">
+            <fileset dir="${{resolved.bundle.source.dir}}" >
+                <include name="templates/" />
+                <include name="themes/" />
+                <exclude name="**placeholder.info**" />
+                <exclude name="**README**" />
+            </fileset>
       </copy>
       
       <!-- Autogenerate from project.xml a file containing a space delimited
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml
index aca0a0305..3862a3066 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml
@@ -134,6 +134,8 @@
 			<path refid="ccm.tools.classpath"/>
 			<!--  <pathelement location="runtime/apache-tomcat-6.0.18/webapps/ROOT/WEB-INF/classes"/>  -->
 			<pathelement location="${app.server.webapp.dir}/ROOT/WEB-INF/classes"/>
+			<!--  <pathelement location="runtime/apache-tomcat-6.0.18/webapps/ROOT/WEB-INF/classes"/>  -->
+			<pathelement location="${this.bundle.folder}/res"/>
 			<!--  <fileset dir="runtime/apache-tomcat-6.0.18/webapps/ROOT/WEB-INF/lib" includes="**/*.jar" />  -->
 			<fileset dir="${app.server.webapp.dir}/ROOT/WEB-INF/lib" includes="**/*.jar" />
 		</path>