From d6f6da494778ccc9f39c1b3ab68fcba5b224c339 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 19 Nov 2011 22:41:23 +0000
Subject: [PATCH] Weitere Entwicklung con ccm-bundle.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1272 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle/application.xml                    |   2 +-
 .../bundles/devel/cfg/integration.properties  |   8 +-
 ccm-bundle/bundles/devel/cfg/project.xml      |  29 +--
 .../bundle/categories/gen-nav-domain-1.00.xml |  30 +++
 .../categories/gen-nav-hierarchy-1.00.xml     |  73 ++++++
 .../bundle/categories/sci-nav-domain-1.00.xml |  48 ----
 .../categories/sci-nav-hierarchy-1.00.xml     | 229 ------------------
 .../res/bundle/navigation/gen-templates.txt   |   8 +
 .../res/bundle/navigation/sci-templates.txt   |   9 -
 .../bundles/devel/templates/placeholder.info  |  12 -
 ...aths.txt => librecms-stylesheet-paths.txt} |   0
 .../src/com/arsdigita/bundle/Loader.java      |   4 +-
 .../navigation/{Sci-README => README}         |   6 +-
 .../navigation/SciPublicationList.jsp         |  61 -----
 .../navigation/{sci-atoz.jsp => gen-atoz.jsp} |   2 +-
 .../{sci-default.jsp => gen-default.jsp}      |   0
 .../{sci-events.jsp => gen-events.jsp}        |   0
 ...tal-welcome.jsp => gen-portal-welcome.jsp} |   0
 .../{sci-portal.jsp => gen-portal.jsp}        |   6 +-
 .../{sci-recent.jsp => gen-recent.jsp}        |   0
 .../{sci-welcome.jsp => gen-welcome.jsp}      |   6 +-
 .../navigation/templates/SpecializingList.jsp |  46 ----
 .../navigation/templates/gen-atoz.jsp         |  51 ----
 .../navigation/templates/gen-default.jsp      |  58 -----
 .../navigation/templates/gen-portal.jsp       |  38 ---
 .../navigation/templates/gen-recent.jsp       |  56 -----
 .../navigation/templates/gen-welcome.jsp      | 121 ---------
 .../ccm-navigation/navigation/nav-default.jsp |   1 -
 environment/local.ccm.properties              |  57 ++++-
 environment/project.xml.aap                   | 107 --------
 30 files changed, 189 insertions(+), 879 deletions(-)
 create mode 100755 ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml
 create mode 100755 ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml
 delete mode 100644 ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml
 delete mode 100644 ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml
 create mode 100755 ccm-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt
 delete mode 100755 ccm-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
 delete mode 100644 ccm-bundle/bundles/devel/templates/placeholder.info
 rename ccm-bundle/src/WEB-INF/resources/{scientificCMS-stylesheet-paths.txt => librecms-stylesheet-paths.txt} (100%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{Sci-README => README} (73%)
 delete mode 100644 ccm-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-atoz.jsp => gen-atoz.jsp} (98%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-default.jsp => gen-default.jsp} (100%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-events.jsp => gen-events.jsp} (100%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-portal-welcome.jsp => gen-portal-welcome.jsp} (100%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-portal.jsp => gen-portal.jsp} (92%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-recent.jsp => gen-recent.jsp} (100%)
 rename ccm-bundle/web/templates/ccm-navigation/navigation/{sci-welcome.jsp => gen-welcome.jsp} (98%)
 delete mode 100644 ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp
 delete mode 100755 ccm-gen-aplaws/web/packages/navigation/templates/gen-atoz.jsp
 delete mode 100755 ccm-gen-aplaws/web/packages/navigation/templates/gen-default.jsp
 delete mode 100644 ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp
 delete mode 100755 ccm-gen-aplaws/web/packages/navigation/templates/gen-recent.jsp
 delete mode 100644 ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp
 delete mode 100644 environment/project.xml.aap

diff --git a/ccm-bundle/application.xml b/ccm-bundle/application.xml
index e89e342f1..6bc53ddb9 100644
--- a/ccm-bundle/application.xml
+++ b/ccm-bundle/application.xml
@@ -8,9 +8,9 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-bundle/bundles/devel/cfg/integration.properties
index 7ad143bb0..4f611efbf 100644
--- a/ccm-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-bundle/bundles/devel/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Scientific CMS devel bundle integration.properties
+# Libre CMS based on OpenCCM devel bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -15,14 +15,14 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader does not work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 
 ; security.properties: 
 waf.auto_registration_on=false
 
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
-waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
+waf.templating.stylesheet_paths=/WEB-INF/resources/librecms-stylesheet-paths.txt
 
 core.ui.pagemap.root_page_url=navigation/
 core.ui.pagemap.workspace_url=navigation/
@@ -110,7 +110,7 @@ com.arsdigita.london.search.show_sponsored_links=true
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
+# ccm-themedirector application
 themedirector.default_theme_context=
 # themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml
index 75df5a621..cbb03ed52 100644
--- a/ccm-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-bundle/bundles/devel/cfg/project.xml
@@ -13,7 +13,12 @@
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
-  <ccm:build>
+<ccm:databases>
+	<ccm:database name="postgres"/>
+</ccm:databases>
+
+
+<ccm:build>
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS set of CORE packages                                  -->
@@ -61,9 +66,7 @@
         <ccm:application name="ccm-cms-assets-notes"/>
 
 <!--   Content Types   -->
-        <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
-        <ccm:application name="ccm-cms-types-contact"/>
         <ccm:application name="ccm-cms-types-event"/>
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
@@ -79,24 +82,17 @@
         <ccm:application name="ccm-ldn-rss"/>                        
 -->
 
-<!--   SCI extension  -->
-<!--
-        <ccm:application name="ccm-sci-personalprojects"/>
--->
-        <ccm:application name="ccm-sci-personalpublications"/>
-        <ccm:application name="ccm-sci-publications"/>
-
-        <ccm:application name="ccm-sci-types-member"/>
-
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS   potential ADD-ONS packages                          -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-<!--   Content Types   -->
+<!--  CMS Content Types  -->
 <!--    
+        <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-agenda"/>
+        <ccm:application name="ccm-cms-types-contact"/>
         <ccm:application name="ccm-cms-types-faqitem"/>
         <ccm:application name="ccm-cms-types-glossaryitem"/>
         <ccm:application name="ccm-cms-types-htmlform"/>
@@ -111,21 +107,20 @@
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 -->
 
-<!--   Applications   -->
+<!--  Applications   -->
+<!--  - - - - -  -   -->
 <!--
         <ccm:application name="ccm-auth-http"/>
         <ccm:application name="ccm-bookmarks"/>
         <ccm:application name="ccm-docmgr"/>
 -->
-        <ccm:application name="ccm-docrepo"/>
-        <ccm:application name="ccm-forum"/>  
-        <ccm:application name="ccm-forum-categorised"/>
 <!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
 -->
 
 <!--   LDN extension  -->
+<!--  - - - - - - -  -->
 <!--
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml
new file mode 100755
index 000000000..48c3ac5d6
--- /dev/null
+++ b/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Document   : gen-nav-domain-1.00.xml
+    Created on : 2. Juni 2007, 10:00
+    Author     : pb
+    Description:
+        Definition of the example terms (categories) in the generic Navigation Menue.
+        In gen-nav-hierarchy the structure of the tree will be defined.
+-->
+
+<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="STD-NAV"
+              title="Default Navigation"
+              version="1.00" released="2005-10-01">
+
+  <terms:term id="10000" name="Category 1" inAtoZ="false"/>
+    <terms:term id="12000" name="Category 1.1" inAtoZ="false"/>
+    <terms:term id="14000" name="Category 1.2" inAtoZ="false"/>
+  
+  <terms:term id="30000" name="Category 2" inAtoZ="false"/>
+    <terms:term id="32000" name="Category 2.1" inAtoZ="false"/>
+    <terms:term id="34000" name="Category 2.2" inAtoZ="false"/>
+  
+  <terms:term id="50000" name="Category 3" inAtoZ="false"/>
+    <terms:term id="52000" name="Category 3.1" inAtoZ="false"/>
+    <terms:term id="54000" name="Category 3.2" inAtoZ="false"/>
+
+</terms:domain>
+
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml
new file mode 100755
index 000000000..4f739a2fb
--- /dev/null
+++ b/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Document   : gen-nav-hierarchy-1.00.xml
+    Created on : 2. Juni 2007, 10:30
+    Author     : pb
+    Description:
+        Purpose of the document follows.
+-->
+
+<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"/>
+  <!-- set root terms  -->
+  <terms:term id="10000"/>
+  <terms:term id="30000"/>
+  <terms:term id="50000"/>
+  
+  <terms:orderedPair>
+    <!-- narrower terms, first level  -->  
+    <terms:source>
+      <terms:term id="10000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="12000"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="10000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="14000"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="30000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="32000"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="30000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="34000"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="50000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="52000"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="50000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="54000"/>
+    </terms:destination>
+  </terms:orderedPair>
+  
+  </terms:hierarchy>
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml b/ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml
deleted file mode 100644
index 31486e212..000000000
--- a/ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Document   : domain-nav-sci-1.00.xml
-    Created on : 8. Aug. 2007, 10:00
-    Author     : pb
-    Description:
-        Definition of the terms (categories) in the SHP Navigation Menue.
-        In hierarchy-nav-shp the structure of the tree will be defined.
--->
-
-<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="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 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"/>
-  
-  <terms:term id="3000" name="Forschung" inAtoZ="false"/>
-    <terms:term id="3200" name="Projekte" inAtoZ="false"/>
-    <terms:term id="3400" name="Veröffentlichungen" inAtoZ="false"/>
-      <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="Sci Report" inAtoZ="false"/>
-      <terms:term id="3500" name="Jahresberichte" 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="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"/>
-
-</terms:domain>
-
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml b/ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml
deleted file mode 100644
index cfce50400..000000000
--- a/ccm-bundle/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Document   : hierarchy-nav-sci-1.00.xml
-    Created on : 8. Aug. 2007, 10:30
-    Author     : pb
-    Description:
-        Purpose of the document follows.
--->
-
-<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"/>
-  <!-- set root terms  -->
-  <terms:term id="1000"/>
-  <terms:term id="3000"/>
-  <terms:term id="5000"/>
-  
-  <terms:orderedPair>
-    <!-- narrower terms, first level  -->  
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1200"/>
-    </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"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1400"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1600"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1800"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9002"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9200"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3200"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3400"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <!--  narrower terms, second level  -->
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <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>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3500"/>
-    </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="3600"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3800"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="4000"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
-    </terms:destination>
-  </terms:orderedPair>
-  
-  </terms:hierarchy>
diff --git a/ccm-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt b/ccm-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt
new file mode 100755
index 000000000..f744de834
--- /dev/null
+++ b/ccm-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt
@@ -0,0 +1,8 @@
+LibreCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/gen-default.jsp
+LibreCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/gen-recent.jsp
+LibreCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/gen-atoz.jsp
+LibreCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/gen-events.jsp
+LibreCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/gen-portal.jsp
+LibreCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/gen-portal-welcome.jsp
+LibreCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/gen-welcome.jsp
+LibreCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
diff --git a/ccm-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt b/ccm-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
deleted file mode 100755
index 80d8612e5..000000000
--- a/ccm-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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-bundle/bundles/devel/templates/placeholder.info b/ccm-bundle/bundles/devel/templates/placeholder.info
deleted file mode 100644
index c78cf06e6..000000000
--- a/ccm-bundle/bundles/devel/templates/placeholder.info
+++ /dev/null
@@ -1,12 +0,0 @@
-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.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt b/ccm-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
similarity index 100%
rename from ccm-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
rename to ccm-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
diff --git a/ccm-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-bundle/src/com/arsdigita/bundle/Loader.java
index 2314eca07..1a74e9b52 100644
--- a/ccm-bundle/src/com/arsdigita/bundle/Loader.java
+++ b/ccm-bundle/src/com/arsdigita/bundle/Loader.java
@@ -86,8 +86,8 @@ public class Loader extends PackageLoader {
     private Parameter m_categoryFiles = new StringArrayParameter(
                 "com.arsdigita.bundle.category_files",
                 Parameter.REQUIRED,new String[]{
-                    "bundle/categories/sci-nav-domain-1.00.xml",
-                    "bundle/categories/sci-nav-hierarchy-1.00.xml" }
+                    "bundle/categories/gen-nav-domain-1.00.xml",
+                    "bundle/categories/gen-nav-hierarchy-1.00.xml" }
                 );
 
     /**
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/Sci-README b/ccm-bundle/web/templates/ccm-navigation/navigation/README
similarity index 73%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/Sci-README
rename to ccm-bundle/web/templates/ccm-navigation/navigation/README
index 034e7065c..bef7103e7 100644
--- a/ccm-bundle/web/templates/ccm-navigation/navigation/Sci-README
+++ b/ccm-bundle/web/templates/ccm-navigation/navigation/README
@@ -1,9 +1,11 @@
 Information for administrators and developers:
 
 This directory contains Navigation item pages specifically crafted for 
-Scientific CMS. The are activated by a customized template.txt file list.
+Libre CMS. They are activated by a customized template.txt file list.
+
+The files are named gen-*.jsp.
 
 These file may be overwritten or ammended by site specific templates stored
 in den bundles subdirectory. In case of additional templates a customised
 template.txt must be provided and activated in the integrations.properties
-configuration file.  
\ No newline at end of file
+configuration file.  
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp
deleted file mode 100644
index 05888eb75..000000000
--- a/ccm-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<jsp:root
-    xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:define="/WEB-INF/bebop-define.tld"
-    xmlns:show="/WEB-INF/bebop-show.tld"
-    version="1.2">
- 
-    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-    <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
-    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
-    <jsp:directive.page import="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
-
-    <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-    </jsp:scriptlet>
-
-    <define:page name="defaultItemPage" application="navigation"
-                 title="Navigation" cache="false">
-        <define:component name="greetingItem"
-                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
-        <define:component name="categoryPath"
-                          classname="com.arsdigita.navigation.ui.category.Path"/>
-        <define:component name="categoryMenu"
-                          classname="com.arsdigita.navigation.ui.category.Menu"/>
-        <define:component name="itemList"
-                          classname="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
-
-      <jsp:scriptlet>
-      CustomizableObjectList objList = (CustomizableObjectList) itemList;
-      objList.setDefinition(new CMSDataCollectionDefinition());
-      objList.setRenderer(new CMSDataCollectionRenderer());
-      objList.setCustomName("SciPublicationsList");
-      objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication");
-      objList.getDefinition().setDescendCategories(false);      
-      objList.addTextFilter("title", "title");
-      objList.addTextFilter("authors.surname", "author");
-      objList.addSelectFilter("yearOfPublication", "yearOfPublication", true, true, true, true);
-      objList.addSortField("title", "title asc");     
-      objList.addSortField("yearAsc", "yearOfPublication asc");
-      objList.addSortField("yearDesc", "yearOfPublication desc");
-      objList.addSortField("authors", "authors.surname asc, authors.givenname asc");
-      objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort")));
-
-      objList.getRenderer().setPageSize(20);
-      objList.getRenderer().setSpecializeObjects(true);
-
-      </jsp:scriptlet>
-
-      <define:component name="assignedTerms"	
-                        classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
-		 
-    </define:page> 
-    <show:all/>
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp
similarity index 98%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp
index f830f7cbb..907e9f7a5 100644
--- a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp
+++ b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp
@@ -38,7 +38,7 @@
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title");
       
-      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20);
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
       ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition");
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-default.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-default.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-events.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-events.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
similarity index 92%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
index bd78893d6..4269924c3 100644
--- a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp
+++ b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
@@ -1,8 +1,8 @@
 <jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
+     xmlns:jsp="http://java.sun.com/JSP/Page"
   xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
+    xmlns:show="/WEB-INF/bebop-show.tld"
+       version="1.2">
 
   <!-- JSP template to use a portal page as index page in navigation  -->
 
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-recent.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-recent.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp
similarity index 98%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp
rename to ccm-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp
index a0d85d6f8..3c5f58539 100644
--- a/ccm-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp
+++ b/ccm-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp
@@ -1,8 +1,8 @@
 <jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
+     xmlns:jsp="http://java.sun.com/JSP/Page"
   xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
+    xmlns:show="/WEB-INF/bebop-show.tld"
+       version="1.2">
 
   <!-- JSP template for the ZeS welcome / start page using navigation -->
 
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp
deleted file mode 100644
index 58d0d11ed..000000000
--- a/ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<jsp:root
-    xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:define="/WEB-INF/bebop-define.tld"
-    xmlns:show="/WEB-INF/bebop-show.tld"
-    version="1.2">
-
-    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-    <jsp:directive.page import="org.apache.log4j.Logger"/>
-
-    <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-    </jsp:scriptlet>
-
-    <define:page name="defaultItemPage" application="navigation"
-                 title="Navigation" cache="false">
-        <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-        <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
-        <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-        <define:component name="itemList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
-        </jsp:scriptlet>
-
-        <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-    </define:page>
-    <show:all/>	
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-atoz.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-atoz.jsp
deleted file mode 100755
index 12d3afe10..000000000
--- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-atoz.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
-  xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="atozItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title");
-      
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "lead");
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-default.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-default.jsp
deleted file mode 100755
index 2e27f432e..000000000
--- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-default.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
-  xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp
deleted file mode 100644
index d93dcef04..000000000
--- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<jsp:root 
-     xmlns:jsp="http://java.sun.com/JSP/Page"
-  xmlns:define="/WEB-INF/bebop-define.tld"
-    xmlns:show="/WEB-INF/bebop-show.tld"
-       version="1.2">
-
-  <!-- JSP template to use a portal page as index page in navigation  -->
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="portalsPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="portalWorkspace"
-      classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-recent.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-recent.jsp
deleted file mode 100755
index bd346f530..000000000
--- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-recent.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
-  xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="recentItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("id");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp
deleted file mode 100644
index 485784b21..000000000
--- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp
+++ /dev/null
@@ -1,121 +0,0 @@
-<jsp:root 
-     xmlns:jsp="http://java.sun.com/JSP/Page"
-  xmlns:define="/WEB-INF/bebop-define.tld"
-    xmlns:show="/WEB-INF/bebop-show.tld"
-       version="1.2">
-
-  <!-- JSP template for the ZeS welcome / start page using navigation -->
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("startDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("newsDate");
-    </jsp:scriptlet>
-    <define:component name="eventList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
-
-      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings          // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.                    // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.                        // Komplizierter geht's wohl nicht mehr.                                                                                                             
-      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
-      java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
-                                                              now.get(java.util.GregorianCalendar.MONTH), 
-                                                              now.get(java.util.GregorianCalendar.DATE))).getTime();
-      // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
-      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
-      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
-      java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
-                                                              now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
-                                                              now.get(java.util.GregorianCalendar.MINUTE),
-                                                              now.get(java.util.GregorianCalendar.SECOND))).getTime();
- 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time);
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);      
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
-      
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(5);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
-    </jsp:scriptlet>
-    <define:component name="newsList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem");
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate &gt; :oldNewsDate");
-      
-      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
-      // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. 
-      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
-      // Komplizierter geht's wohl nicht mehr.
-      java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar();
-      oldDate.add(java.util.Calendar.MONTH, -2);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime());
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setDescendCategories(true);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().addOrder("newsDate desc");
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().setPageSize(5);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
index 4323e1382..35d5b3b03 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
@@ -21,7 +21,6 @@
   <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
   <jsp:directive.page import="com.arsdigita.navigation.DataCollectionDefinition"/>
   <jsp:directive.page import="com.arsdigita.navigation.DataCollectionRenderer"/>
-  
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
diff --git a/environment/local.ccm.properties b/environment/local.ccm.properties
index 9ea6fe238..0de55d2f7 100644
--- a/environment/local.ccm.properties
+++ b/environment/local.ccm.properties
@@ -5,21 +5,31 @@
 ## -------------------------------------------------
 ## Usually you will define your own specific bundle!
 ## -------------------------------------------------
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/complete
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/extended
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/standard
+#
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/standard
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/igb
+#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/nsh
 #
 #ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/devel
-ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/develpb
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/develpb
 #ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/handbook
 #ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/staatsschiff
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/nsh
+#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/wsf
 #ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/zsr
 #
-#ccm.bundle.folder=${ccm.project.dir}/ccm-aap-aplaws/bundles/devel
 #ccm.bundle.folder=${ccm.project.dir}/ccm-iaw-aplaws/bundles/devel
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ifs-aplaws/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-zes-aplaws/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-zes-aplaws/bundles/standard
+
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/demo
+ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/aap
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/iaw-std
 
 
 #ccm.bundle.folder=${ccm.project.dir}/ccm-shp-aplaws/bundles/devel
@@ -33,7 +43,36 @@ ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/develpb
 
 
 # ---------------------------------------------------------------------
-# Update post rel. 1.1.2 (trunk - temporär) mit Erweiterungen sci
+# Update von rel. 1.1.4 auf 1.1.x (trunk) 
+# Müssen NACH dem (regulären) Update 1.1.3 -> 1.1.4 durchgeführt werden
+# ---------------------------------------------------------------------
+
+# Alle Versionen / Bundles: 
+# (hb r1257/: ccm-ldn-navigation umbenannt nach ccm-navigation.)
+#ccm.upgrade.package=ccm-navigation
+#ccm.upgrade.from.version=6.6.2
+#ccm.upgrade.to.version=6.6.3
+
+# Alle Versionen / Bundles: 
+# (hb r1248/: ccm-[iaw|zes|...]-aplaws umgestellt auf ccm-sci-bundle.)
+#ccm.upgrade.package=ccm-sci-bundle
+#ccm.upgrade.from.version=0.0.0
+#ccm.upgrade.to.version=6.6.0
+
+
+# ---------------------------------------------------------------------
+# Update von rel. 1.1.3 auf 1.1.4 
+# Müssen NACH dem (regulären) Update 1.1.2 -> 1.1.3 durchgeführt werden
+# ---------------------------------------------------------------------
+# Alle Versionen / Bundles: 
+# (hb r1102/r1081: generic persons Tabelle erweitert.)
+#ccm.upgrade.package=ccm-cms
+#ccm.upgrade.from.version=6.6.2
+#ccm.upgrade.to.version=6.6.3
+
+
+# ---------------------------------------------------------------------
+# Update von rel. 1.1.2 auf 1.1.3
 # Müssen NACH den Updates 1.1.1 -> 1.1.2 durchgeführt werden
 # ---------------------------------------------------------------------
 # Alle Versionen / Bundles: 
@@ -49,7 +88,7 @@ ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/develpb
 #ccm.upgrade.to.version=6.6.2
 
 # ---------------------------------------------------------------------
-# Update von rel. 1.1.1 auf 1.1.2 mit Erweiterungen sci
+# Update von rel. 1.1.1 auf 1.1.2 
 # Müssen NACH den Updates 1.1.0 -> 1.1.1 durchgeführt werden
 # ---------------------------------------------------------------------
 # Alle Versionen / Bundles: 
@@ -158,7 +197,7 @@ ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/develpb
 # -----------------------------------------------------
 # Update von (intern) rel. 1.0.5 auf 1.1.0 
 # ----------------------------------------------------
-# Nur ZeS:
+# Nur ZeS (vermutlich noch auf 1.0.4):
 # ccm.upgrade.package=ccm-core
 # ccm.upgrade.from.version=6.5.2
 # ccm.upgrade.to.version=6.5.3
diff --git a/environment/project.xml.aap b/environment/project.xml.aap
deleted file mode 100644
index 36c1b02b4..000000000
--- a/environment/project.xml.aap
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--    project.xml -ZeS- containing only those modules used for ZeS    -->
-
-<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
-               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
-              ccmVersion="6.1" 
-                    name="aplaws-aap" 
-              prettyName="APLAWS plus" 
-                 version="1-0-9" 
-                 release="beta-2" 
-                  webxml="web.xml-aplaws" 
-                  webapp="ROOT" 
-      xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
-
-  <ccm:build>
-
-<!--   Main apps   -->
-<!--   - - - - -   -->
-        <ccm:application name="ccm-core"/>
-        <ccm:application name="ccm-cms"/>
-
-<!--   Content Assets   -->
-<!--   - - - - - - -    -->
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
-
-<!--   Content Types   -->
-<!--   - - - - - - -    -->
-        <ccm:application name="ccm-cms-types-address"/>
-<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
-        <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-bookmark"/>
-        <ccm:application name="ccm-cms-types-contact"/>
-<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
-        <ccm:application name="ccm-cms-types-event"/>
-<!--         faqitem could be removed for ZeS, too                   -->
-<!--         2008-06-07 faqitem removed, not used in prod.system     -->
-<!--    <ccm:application name="ccm-cms-types-faqitem"/>              -->
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
-<!--         glossaryitem could be removed for ZeS, too              -->
-<!--         2008-06-07 glossaryitem removed, not used in prod.sys.  -->
-<!--    <ccm:application name="ccm-cms-types-glossaryitem"/>         -->
-<!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
-<!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
-<!--    <ccm:application name="ccm-cms-types-job"/>                  -->
-<!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
-<!--    <ccm:application name="ccm-cms-types-minutes"/>              -->
-<!--    <ccm:application name="ccm-cms-types-motditem"/>             -->
-        <ccm:application name="ccm-cms-types-mparticle"/>
-        <ccm:application name="ccm-cms-types-newsitem"/>
-<!--    <ccm:application name="ccm-cms-types-organization"/>         -->
-<!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
-<!--    <ccm:application name="ccm-cms-types-service"/>              -->
-        <ccm:application name="ccm-cms-types-siteproxy"/>               
-<!--         xmlfeed may not be needed by ZeS, too                   -->
-<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
-
-<!--  Applications   -->
-<!--  - - - - -  -   -->
-<!--    <ccm:application name="ccm-auth-http"/>                      -->
-<!--    <ccm:application name="ccm-bookmarks"/>                      -->
-<!--    temporarily excluded, produces errors in the build process
-        <ccm:application name="ccm-docmngr"/>                        -->
-<!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
-        <ccm:application name="ccm-forum"/>
-<!--    <ccm:application name="ccm-simplesurvey"/>                   -->
-        <ccm:application name="ccm-user-preferences"/>
-<!--    <ccm:application name="ccm-weblog"/>                         -->
-<!--    <ccm:application name="ccm-webpage"/>                        -->
-
-<!--  LDN extension  -->
-<!--  - - - - - - -  -->
-<!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
-<!--    <ccm:application name="ccm-ldn-atoz"/>                       -->
-<!--    <ccm:application name="ccm-ldn-dublin"/>                     -->
-<!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
-<!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
-        <ccm:application name="ccm-ldn-image-step"/>
-<!--    <ccm:application name="ccm-ldn-importer"/>                   -->
-        <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
-        <ccm:application name="ccm-ldn-rss"/>                        
-        <ccm:application name="ccm-ldn-search"/>                        
-        <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
-        <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
-        <ccm:application name="ccm-ldn-util"/>
-
-
-<!--  AAP extension  -->
-<!--  - - - - - - -  -->
-        <ccm:application name="ccm-aap-aplaws"/>
-
-
-
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
-
-
-  </ccm:build>
-</ccm:project>