From fbeba3a53a6af42066dce3e497d8af6405830094 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 2 Aug 2018 03:38:40 +0000
Subject: [PATCH] Completed modified session handling for all lcs bundles.

git-svn-id: https://svn.libreccm.org/ccm/trunk@5627 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-lcs-bundle/bundles/base/cfg/libre-web.xml    | 13 ++++++++++++-
 ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml    | 13 ++++++++++++-
 ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml   | 16 +++++++++++++---
 .../bundles/standard/cfg/libre-web.xml           | 12 +++++++++++-
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
index fc8dd03ca..71b9d5f1d 100644
--- a/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
@@ -5,9 +5,15 @@
                version="3.0">
     
     <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.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 BASE Site</display-name> 
   <description>Community and Content Management</description>
 
@@ -19,6 +25,11 @@
     <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/demo/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
index f4db06446..1e95a741c 100644
--- a/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
@@ -5,9 +5,15 @@
                version="3.0">
     
     <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.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 DEMO Site</display-name> 
   <description>Community and Content Management</description>
 
@@ -19,6 +25,11 @@
     <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               
   <filter>
diff --git a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
index e548acf34..3aebb9b17 100644
--- a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
@@ -5,10 +5,16 @@
                version="3.0">
     
     <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.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 OpenCCM Site</display-name> 
+
+  <display-name>LibreCMS Devel Site</display-name> 
   <description>Community and Content Management</description>
 
   <!-- path and filename of the log4j2 user accessible config file
@@ -19,6 +25,11 @@
     <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               
   <filter>
@@ -167,7 +178,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET DECLARATIONS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
index 7197b89bf..93b72bafc 100644
--- a/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
@@ -5,7 +5,12 @@
                version="3.0">
     
     <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.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.
+        
+      librecms requires at minimum Servlet Spec 3.0 / Tomcat 7.0
         - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <display-name>LibreCMS Standard Site</display-name> 
@@ -19,6 +24,11 @@
     <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               
   <filter>