Transfer changes to lcs web.xml (session by cookies, location of log4j2.xml) to all other bundles.

git-svn-id: https://svn.libreccm.org/ccm/trunk@5628 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/com/arsdigita/dispatcher/DispatcherConfig.java

@@ -75,6 +75,8 @@ public final class DispatcherConfig extends AbstractConfig {
 
     /**
      *  Get the URL for static items
+     * 
+     * @Deprecated
      */
     public String getStaticURLPrefix() {
         return (String)get(m_staticURLPrefix);

ccm-ldn-aplaws/bundles/base/cfg/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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>CCM</display-name>
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  <description>Content and Collaboration Management</description>
+        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>APLAWS base </display-name>
+  <description>Content and Collaboration Management (CCM)</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               

ccm-ldn-aplaws/bundles/compatible/cfg/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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>CCM</display-name>
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  <description>Content and Collaboration Management</description>
+        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>APLAWS compatible site </display-name>
+  <description>Content and Collaboration Management (CCM)</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               

ccm-ldn-aplaws/bundles/complete/cfg/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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>CCM</display-name>
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  <description>Content and Collaboration Management</description>
+        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>APLAWS complete distribution </display-name>
+  <description>Content and Collaboration Management (CCM)</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               

ccm-ldn-aplaws/bundles/demo/cfg/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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>CCM</display-name>
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  <description>Content and Collaboration Management</description>
+        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>APLAWS demo distribution </display-name>
+  <description>Content and Collaboration Management (CCM)</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               

ccm-ldn-aplaws/bundles/devel/cfg/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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>CCM</display-name>
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  <description>Content and Collaboration Management</description>
+        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>APLAWS devel bundle </display-name>
+  <description>Content and Collaboration Management (CCM)</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               

ccm-ldn-aplaws/bundles/standard/cfg/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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>CCM</display-name>
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  <description>Content and Collaboration Management</description>
+        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>APLAWS standard bundle distribution </display-name>
+  <description>Content and Collaboration Management (CCM)</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               

ccm-sci-bundle/bundles/base/cfg/web-sci.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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>Scientific CMS</display-name> 
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        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>Scientific CMS (base bundle)</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</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               

ccm-sci-bundle/bundles/demo/cfg/web-sci.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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>Scientific CMS</display-name> 
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        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>Scientific CMS (demo bundle)</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</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               

ccm-sci-bundle/bundles/devel/cfg/sci-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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>Scientific CMS</display-name> 
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        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>Scientific CMS (devel bundle)</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</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               

ccm-sci-bundle/bundles/standard/cfg/web-sci.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"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-               version="2.4">
+               version="3.0">
     
-  <display-name>Scientific CMS</display-name> 
+    <!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        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>Scientific CMS (standard bundle)</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</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