From 81b017fb4204b85b1ce18f5e34069a7ecd02f8c4 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 1 Aug 2018 17:16:21 +0000
Subject: [PATCH] Minor fixes of navigation jsp's files, adjustind project.xml
 files.

git-svn-id: https://svn.libreccm.org/ccm/trunk@5622 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-lcs-bundle/bundles/base/cfg/libre-web.xml | 18 ++++-
 .../res/bundle/navigation/lcs-templates.txt   |  2 +-
 ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml | 17 +++-
 .../res/bundle/navigation/lcs-templates.txt   |  2 +-
 .../bundles/devel/cfg/libre-web.xml           | 17 +++-
 ccm-lcs-bundle/bundles/devel/cfg/project.xml  |  4 +-
 .../res/bundle/navigation/lcs-templates.txt   |  2 +-
 .../bundles/slimline/cfg/libre-web.xml        | 30 ++++++-
 .../bundles/slimline/cfg/project.xml          |  4 +-
 .../res/bundle/navigation/lcs-templates.txt   |  2 +-
 .../bundles/standard/cfg/libre-web.xml        | 19 ++++-
 .../bundles/standard/cfg/project.xml          |  2 +-
 .../res/bundle/navigation/lcs-templates.txt   |  2 +-
 .../resources/librecms-stylesheet-paths.txt   | 50 +-----------
 .../multi_entry-example-stylesheet-paths.txt  | 78 +++++++++++++++++++
 .../ccm-navigation/navigation/aaREADME        | 24 ++++--
 16 files changed, 191 insertions(+), 82 deletions(-)
 create mode 100644 ccm-lcs-bundle/src/WEB-INF/resources/multi_entry-example-stylesheet-paths.txt

diff --git a/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
index 56d9efbda..fc8dd03ca 100644
--- a/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app         xmlns="http://java.sun.com/xml/ns/javaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+               version="3.0">
+    
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.0
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <display-name>LibreCMS BASE Site</display-name> 
   <description>Community and Content Management</description>
 
+  <!-- path and filename of the log4j2 user accessible config file
+       By default is is the same as the class path accessible file 
+       in class ccm-core-x.y.z.jar.                                          -->
+  <context-param>
+    <param-name>log4jConfiguration</param-name>
+    <param-value>WEB-INF/conf/log4j2.xml</param-value>
+  </context-param>
+
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/base/res/bundle/navigation/lcs-templates.txt b/ccm-lcs-bundle/bundles/base/res/bundle/navigation/lcs-templates.txt
index 065a0c338..f13a3c813 100755
--- a/ccm-lcs-bundle/bundles/base/res/bundle/navigation/lcs-templates.txt
+++ b/ccm-lcs-bundle/bundles/base/res/bundle/navigation/lcs-templates.txt
@@ -5,4 +5,4 @@ LibreCMS Events Page,Events Page ordering events in decending order,/templates/c
 LibreCMS Portal Page,Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
 LibreCMS Portal Welcome Page,Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
 LibreCMS Navigation Welcome Page,Site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
-LibreCMS Specializing Items List,Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
+LibreCMS Specializing Items List,Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
diff --git a/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
index dca9b2adf..f4db06446 100644
--- a/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app         xmlns="http://java.sun.com/xml/ns/javaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+               version="3.0">
+    
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.0
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <display-name>LibreCMS DEMO Site</display-name> 
   <description>Community and Content Management</description>
 
+  <!-- path and filename of the log4j2 user accessible config file
+       By default is is the same as the class path accessible file 
+       in class ccm-core-x.y.z.jar.                                          -->
+  <context-param>
+    <param-name>log4jConfiguration</param-name>
+    <param-value>WEB-INF/conf/log4j2.xml</param-value>
+  </context-param>
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/demo/res/bundle/navigation/lcs-templates.txt b/ccm-lcs-bundle/bundles/demo/res/bundle/navigation/lcs-templates.txt
index 065a0c338..f13a3c813 100755
--- a/ccm-lcs-bundle/bundles/demo/res/bundle/navigation/lcs-templates.txt
+++ b/ccm-lcs-bundle/bundles/demo/res/bundle/navigation/lcs-templates.txt
@@ -5,4 +5,4 @@ LibreCMS Events Page,Events Page ordering events in decending order,/templates/c
 LibreCMS Portal Page,Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
 LibreCMS Portal Welcome Page,Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
 LibreCMS Navigation Welcome Page,Site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
-LibreCMS Specializing Items List,Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
+LibreCMS Specializing Items List,Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
diff --git a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
index 423206cad..e548acf34 100644
--- a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app         xmlns="http://java.sun.com/xml/ns/javaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+               version="3.0">
+    
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.0
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <display-name>LibreCMS OpenCCM Site</display-name> 
   <description>Community and Content Management</description>
 
+  <!-- path and filename of the log4j2 user accessible config file
+       By default is is the same as the class path accessible file 
+       in class ccm-core-x.y.z.jar.                                          -->
+  <context-param>
+    <param-name>log4jConfiguration</param-name>
+    <param-value>WEB-INF/conf/log4j2.xml</param-value>
+  </context-param>
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/devel/cfg/project.xml b/ccm-lcs-bundle/bundles/devel/cfg/project.xml
index ed2ef2832..dafdce408 100644
--- a/ccm-lcs-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-lcs-bundle/bundles/devel/cfg/project.xml
@@ -6,10 +6,10 @@
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
-                    name="librecms-ccm" 
+                    name="librecms-dev" 
               prettyName="LibreCMS OpenCCM" 
                  version="2.3.99" 
-                 release="devel-SNAPSHOT-r4851" 
+                 release="devel-SNAPSHOT-r5397" 
                   webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-lcs-bundle/bundles/devel/res/bundle/navigation/lcs-templates.txt b/ccm-lcs-bundle/bundles/devel/res/bundle/navigation/lcs-templates.txt
index 065a0c338..f13a3c813 100755
--- a/ccm-lcs-bundle/bundles/devel/res/bundle/navigation/lcs-templates.txt
+++ b/ccm-lcs-bundle/bundles/devel/res/bundle/navigation/lcs-templates.txt
@@ -5,4 +5,4 @@ LibreCMS Events Page,Events Page ordering events in decending order,/templates/c
 LibreCMS Portal Page,Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
 LibreCMS Portal Welcome Page,Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
 LibreCMS Navigation Welcome Page,Site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
-LibreCMS Specializing Items List,Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
+LibreCMS Specializing Items List,Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
diff --git a/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml
index a89489151..7321fa00f 100644
--- a/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml
@@ -1,12 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app         xmlns="http://java.sun.com/xml/ns/javaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+               version="3.0">
+    
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        basic web.xml for ccm-core and basic functions. If
+        additional modules provide specific web.xml snippets they must be
+        integrated before CCM is ready to work. Alternatively a
+        complete web.xml file from an installation bundle may be used.
+        
+        ccm-core requires at minimum Servlet Spec 3.0 / Tomcat 7.0
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <display-name>LibreCMS Standard Site</display-name> 
+
+  <display-name>LibreCMS Slimline Site</display-name> 
   <description>Community and Content Management</description>
 
+  <!-- path and filename of the log4j2 user accessible config file
+       By default is is the same as the class path accessible file 
+       in class ccm-core-x.y.z.jar.                                          -->
+  <context-param>
+    <param-name>log4jConfiguration</param-name>
+    <param-value>WEB-INF/conf/log4j2.xml</param-value>
+  </context-param>
+
+  <!-- Prevent Session ID in URL (for security reasons!)                     -->
+  <session-config>
+    <tracking-mode>COOKIE</tracking-mode>
+  </session-config>
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/slimline/cfg/project.xml b/ccm-lcs-bundle/bundles/slimline/cfg/project.xml
index 4829504ea..12391f703 100644
--- a/ccm-lcs-bundle/bundles/slimline/cfg/project.xml
+++ b/ccm-lcs-bundle/bundles/slimline/cfg/project.xml
@@ -7,7 +7,7 @@
      Other modules are commented out but compiled into an add-on bundle to 
      be used by a site administrator to create a customized installation
      using ccm-hostinit command.
-     Last checked: 2017-06
+     Last checked: 2018-05
      ======================================================================= -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
@@ -16,7 +16,7 @@
                     name="LibreCMS-SL" 
               prettyName="LibreCMS (Slimline Bundle)" 
                  version="2.3.99" 
-                 release="trunk-r5117" 
+                 release="trunk-r5397" 
                   webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-lcs-bundle/bundles/slimline/res/bundle/navigation/lcs-templates.txt b/ccm-lcs-bundle/bundles/slimline/res/bundle/navigation/lcs-templates.txt
index 065a0c338..f13a3c813 100755
--- a/ccm-lcs-bundle/bundles/slimline/res/bundle/navigation/lcs-templates.txt
+++ b/ccm-lcs-bundle/bundles/slimline/res/bundle/navigation/lcs-templates.txt
@@ -5,4 +5,4 @@ LibreCMS Events Page,Events Page ordering events in decending order,/templates/c
 LibreCMS Portal Page,Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
 LibreCMS Portal Welcome Page,Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
 LibreCMS Navigation Welcome Page,Site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
-LibreCMS Specializing Items List,Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
+LibreCMS Specializing Items List,Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
diff --git a/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
index 0991a607e..7197b89bf 100644
--- a/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app         xmlns="http://java.sun.com/xml/ns/javaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+               version="3.0">
+    
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.0
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <display-name>LibreCMS Slimeline Site</display-name> 
+  <display-name>LibreCMS Standard Site</display-name> 
   <description>Community and Content Management</description>
 
+  <!-- path and filename of the log4j2 user accessible config file
+       By default is is the same as the class path accessible file 
+       in class ccm-core-x.y.z.jar.                                          -->
+  <context-param>
+    <param-name>log4jConfiguration</param-name>
+    <param-value>WEB-INF/conf/log4j2.xml</param-value>
+  </context-param>
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/standard/cfg/project.xml b/ccm-lcs-bundle/bundles/standard/cfg/project.xml
index c39c0f1d0..6b80c0c02 100644
--- a/ccm-lcs-bundle/bundles/standard/cfg/project.xml
+++ b/ccm-lcs-bundle/bundles/standard/cfg/project.xml
@@ -15,7 +15,7 @@
                     name="librecms-std" 
               prettyName="LibreCMS (Standard Bundle)" 
                  version="2.3.99" 
-                 release="trunk-r5117" 
+                 release="trunk-r5397" 
                   webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-lcs-bundle/bundles/standard/res/bundle/navigation/lcs-templates.txt b/ccm-lcs-bundle/bundles/standard/res/bundle/navigation/lcs-templates.txt
index 065a0c338..f13a3c813 100755
--- a/ccm-lcs-bundle/bundles/standard/res/bundle/navigation/lcs-templates.txt
+++ b/ccm-lcs-bundle/bundles/standard/res/bundle/navigation/lcs-templates.txt
@@ -5,4 +5,4 @@ LibreCMS Events Page,Events Page ordering events in decending order,/templates/c
 LibreCMS Portal Page,Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/def-portal.jsp
 LibreCMS Portal Welcome Page,Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
 LibreCMS Navigation Welcome Page,Site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
-LibreCMS Specializing Items List,Specialising List item page,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
+LibreCMS Specializing Items List,Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
\ No newline at end of file
diff --git a/ccm-lcs-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt b/ccm-lcs-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
index ab5190e6e..f44d53428 100644
--- a/ccm-lcs-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
+++ b/ccm-lcs-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
@@ -27,52 +27,6 @@ http://::host::/::webapp::/themes/foundry-base/start.xsl
 
 
 # ==============================================================================
-# The following is for multi-entry themes, deprecated in LibreCMS
+# PatternStylesheetResolver supports multi-entry themes, not used in LibreCMS
+# see multi_entry-example-stylesheet-paths.txt
 # ==============================================================================
-
-# Output type is for things such as text/javascript stored in tradition default theme
-#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
-#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
-##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
-##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
-
-# Grabs custom item xsl for CMS
-##http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
-
-# Theme, managed by themedirector, with optional locale & prefix
-#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
-##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
-
-# Theme managed by themedirector, with optional locale (without prefix)
-#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-
-# APLAWS generic default, with locale and prefix
-#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
-##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
-##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
-#http://::host::/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
-#http://::host:://ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
-
-# APLAWS generic default, with locale (without prefix)
-#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
-#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
-#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
-##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
-##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::.xsl
-#http://::host::/::webapp::/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
-#http://::host::/::webapp::/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
-
-# Global default, from application's own web app
-#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
-##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
diff --git a/ccm-lcs-bundle/src/WEB-INF/resources/multi_entry-example-stylesheet-paths.txt b/ccm-lcs-bundle/src/WEB-INF/resources/multi_entry-example-stylesheet-paths.txt
new file mode 100644
index 000000000..ab5190e6e
--- /dev/null
+++ b/ccm-lcs-bundle/src/WEB-INF/resources/multi_entry-example-stylesheet-paths.txt
@@ -0,0 +1,78 @@
+# -*- text -*-
+# This file locates stylesheets, if you are using the
+# "PatternStylesheetResolver". Please read the Javadoc for that file for
+# the full story.
+
+# Currently the "resource" part is actually "short-circuited", see 
+# Templating#transformURL(url). As long as we store and synchronize all theme
+# files in each server's local file system, we use the direct file apprach to
+# avoid unnecessary http request and traffic between client (user) and server!
+# Additionally all modules are installed into one webapp context, so the
+# webapp tag is redundant, but sort of required by some part of the code.
+
+
+# Theme with single entry point (e.g Foundry) managed by themedirector
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged distribution default
+# Optional distribution specific default. If empty, foundry-base is used.
+#http://::host::/resource/::webapp::/themes/librecms-default/start.xsl
+http://::host::/::webapp::/themes/librecms-default/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged default
+# Fall back if anything else fails.
+#http://::host::/resource/::webapp::/themes/foundry-base/start.xsl
+http://::host::/::webapp::/themes/foundry-base/start.xsl
+
+
+# ==============================================================================
+# The following is for multi-entry themes, deprecated in LibreCMS
+# ==============================================================================
+
+# Output type is for things such as text/javascript stored in tradition default theme
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
+##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
+
+# Grabs custom item xsl for CMS
+##http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
+
+# Theme, managed by themedirector, with optional locale & prefix
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+
+# Theme managed by themedirector, with optional locale (without prefix)
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+
+# APLAWS generic default, with locale and prefix
+#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
+##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
+#http://::host::/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host:://ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
+
+# APLAWS generic default, with locale (without prefix)
+#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
+##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+##http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
+
+# Global default, from application's own web app
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
+##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
diff --git a/ccm-lcs-bundle/web/templates/ccm-navigation/navigation/aaREADME b/ccm-lcs-bundle/web/templates/ccm-navigation/navigation/aaREADME
index a74d3ee58..cd18329cf 100644
--- a/ccm-lcs-bundle/web/templates/ccm-navigation/navigation/aaREADME
+++ b/ccm-lcs-bundle/web/templates/ccm-navigation/navigation/aaREADME
@@ -1,11 +1,21 @@
 Information for administrators and developers:
 
-This directory contains Navigation item pages specifically crafted for 
-Libre CMS. They are activated by a customized template.txt file list.
+This directory contains templates for Navigation item pages, used to 
+dynamically create various kind of Navigatin pages.
 
-All filenames must comply to the naming convention lcs-*.jsp.
+A lot of templates are quite generic and may be used by various different
+sites and customers. Thes templages begin with "def-"
 
-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.  
+Some templates start with "min-". They are for the same purpose as the
+correspondig "def-" templates, but provide a minimal content.
+
+Other may be distribution or customer specific. Templates specifically crafted 
+for Libre CMS start with "lcs-". They are activated by a customized 
+template.txt file list.
+
+Customer or site specific templates should follow the same naming convention
+and start with a 3 character abbreviation.
+
+Customer or site specific templates are 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.