diff --git a/ccm-core/web/WEB-INF/web.d/web.default.ccm-core.xml b/ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml
similarity index 72%
rename from ccm-core/web/WEB-INF/web.d/web.default.ccm-core.xml
rename to ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml
index 9b5359773..f0d54bcb3 100644
--- a/ccm-core/web/WEB-INF/web.d/web.default.ccm-core.xml
+++ b/ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml
@@ -25,6 +25,56 @@
     </context-param>
 
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
+  <filter>
+    <filter-name>shortcuts</filter-name>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
+  </filter>
+
+  <filter>
+    <filter-name>subsite</filter-name>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
+  </filter>
+
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
+  <filter-mapping>
+    <filter-name>subsite</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>shortcuts</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+
+
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       Context Listener required and used to initialize the runtime environment
       before any other task is performed or any servlet initialized.
@@ -47,13 +97,8 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
-    <servlet>
-        <servlet-name>ccm-dispatcher</servlet-name>
-        <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
 -->
+
     <servlet>
         <servlet-name>ccm-dispatcher</servlet-name>
         <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
@@ -74,6 +119,22 @@
         <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
     </servlet>
 
+  <servlet>
+    <servlet-name>login</servlet-name>
+    <servlet-class>com.arsdigita.ui.login.LoginServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
+
     <servlet>
         <servlet-name>webdevsupport</servlet-name>
         <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
@@ -90,12 +151,10 @@
     </servlet>
 
 
-    <!--
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       BASE SERVLET MAPPINGS SECTION basically
       requirred by ccm-core
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    -->
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
     <servlet-mapping>
         <servlet-name>ccm-dispatcher</servlet-name>
@@ -117,6 +176,22 @@
         <url-pattern>/versioning/*</url-pattern>
     </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>login</servlet-name>
+    <url-pattern>/login/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
+
     <servlet-mapping>
         <servlet-name>webdevsupport</servlet-name>
         <url-pattern>/webdevsupport/*</url-pattern>
@@ -133,11 +208,9 @@
     </servlet-mapping>
 
 
-    <!--
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
       ERROR PAGES
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    -->
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
     <error-page>
         <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
@@ -174,11 +247,9 @@
         <location>/error/general.jsp</location>
     </error-page>
 
-    <!--
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
       TAG LIBS
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    -->
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
     <jsp-config>
         <taglib>
diff --git a/ccm-core/web/WEB-INF/web.xml b/ccm-core/web/WEB-INF/web.xml
index 7d2113aa0..f0d54bcb3 100644
--- a/ccm-core/web/WEB-INF/web.xml
+++ b/ccm-core/web/WEB-INF/web.xml
@@ -25,6 +25,56 @@
     </context-param>
 
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
+  <filter>
+    <filter-name>shortcuts</filter-name>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
+  </filter>
+
+  <filter>
+    <filter-name>subsite</filter-name>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
+  </filter>
+
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
+  <filter-mapping>
+    <filter-name>subsite</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>shortcuts</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+
+
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       Context Listener required and used to initialize the runtime environment
       before any other task is performed or any servlet initialized.
@@ -47,8 +97,8 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
 -->
+
     <servlet>
         <servlet-name>ccm-dispatcher</servlet-name>
         <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
@@ -69,6 +119,22 @@
         <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
     </servlet>
 
+  <servlet>
+    <servlet-name>login</servlet-name>
+    <servlet-class>com.arsdigita.ui.login.LoginServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
+
     <servlet>
         <servlet-name>webdevsupport</servlet-name>
         <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
@@ -85,12 +151,10 @@
     </servlet>
 
 
-    <!--
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       BASE SERVLET MAPPINGS SECTION basically
       requirred by ccm-core
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    -->
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
     <servlet-mapping>
         <servlet-name>ccm-dispatcher</servlet-name>
@@ -112,6 +176,22 @@
         <url-pattern>/versioning/*</url-pattern>
     </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>login</servlet-name>
+    <url-pattern>/login/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
+
     <servlet-mapping>
         <servlet-name>webdevsupport</servlet-name>
         <url-pattern>/webdevsupport/*</url-pattern>
@@ -128,11 +208,9 @@
     </servlet-mapping>
 
 
-    <!--
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
       ERROR PAGES
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    -->
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
     <error-page>
         <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
@@ -169,11 +247,9 @@
         <location>/error/general.jsp</location>
     </error-page>
 
-    <!--
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
       TAG LIBS
-      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    -->
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
     <jsp-config>
         <taglib>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index c5948fee4..0ba757eb4 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -10,7 +10,7 @@
               prettyName="Scientific CMS" 
                  version="2.3.0" 
                  release="devel-SNAPSHOT-r2620" 
-                  webxml="scweb.xml" 
+                  webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">