From 5b5564c5701c565f48c3dd6021d74cf383500627 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 21 Feb 2012 01:10:10 +0000
Subject: [PATCH] =?UTF-8?q?Nachtr=C3=A4ge,=20insbesondere=20web.xml=20f.?=
 =?UTF-8?q?=20ldn-aplaws.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1519 8810af33-2d31-482b-a856-94f89814c4df
---
 .../cms/contentassets/RelatedLink.java        | 12 +++
 .../src/com/arsdigita/cms/ServiceServlet.java |  4 +-
 .../src/com/arsdigita/mail/MailConfig.java    | 38 ++++++--
 .../src/com/arsdigita/web/Application.java    | 27 ++++--
 ccm-ldn-aplaws/bundles/custom/cfg/web.xml     | 71 +++++++++++---
 ccm-ldn-aplaws/bundles/demo/cfg/web.xml       | 89 +++++++++++------
 ccm-ldn-aplaws/bundles/devel/cfg/web.xml      | 69 +++++++++++---
 ccm-ldn-aplaws/bundles/extended/cfg/web.xml   | 95 +++++++++++++------
 ccm-ldn-aplaws/bundles/standard/cfg/web.xml   | 94 +++++++++++++-----
 ccm-sci-bundle/bundles/devel/cfg/web-sci.xml  | 12 ++-
 10 files changed, 378 insertions(+), 133 deletions(-)

diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
index 0f5f2b138..d9eb0fa30 100755
--- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
+++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
@@ -175,6 +175,18 @@ public class RelatedLink extends Link {
 
     }
 
+    /**
+     * Convenient (compatiblility) method to retrieve related links for a 
+     * given content item without a specific name for the link list).
+     *
+     * @param item The item to return links for
+     * @param name Name of the link list
+     * @return 
+     */
+    public static DataCollection getRelatedLinks(ContentItem item) {
+        return getRelatedLinks(item,"NONE");
+    }
+
     /**
      * Retrieves related links for a given content item
      *
diff --git a/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java b/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java
index 6385cc856..16e5f84b0 100644
--- a/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java
+++ b/ccm-cms/src/com/arsdigita/cms/ServiceServlet.java
@@ -52,7 +52,7 @@ import org.xml.sax.helpers.DefaultHandler;
  * into a cache of services on a request by request basis (lazy loading).
  * 
  * @author Peter Boy <pboy@barkhof.uni-bremen.de>
- * @version $Id: WorkspaceServlet.java 2161 2011-02-02 00:16:13Z pboy $
+ * @version $Id: ServiceServlet.java 2161 2011-02-02 00:16:13Z pboy $
  */
 public class ServiceServlet extends BaseApplicationServlet {
 
@@ -113,7 +113,7 @@ public class ServiceServlet extends BaseApplicationServlet {
         
     /**
      * Implements the (abstract) doService method of BaseApplicationServlet to
-     * create the Worspace page.
+     * create the perform the services.
      * 
      * @see com.arsdigita.web.BaseApplicationServlet#doService
      *      (HttpServletRequest, HttpServletResponse, Application)
diff --git a/ccm-core/src/com/arsdigita/mail/MailConfig.java b/ccm-core/src/com/arsdigita/mail/MailConfig.java
index 4670f23b9..53856c936 100755
--- a/ccm-core/src/com/arsdigita/mail/MailConfig.java
+++ b/ccm-core/src/com/arsdigita/mail/MailConfig.java
@@ -58,6 +58,10 @@ public final class MailConfig extends AbstractConfig {
     ("waf.mail.send_html_mail", Parameter.OPTIONAL, Boolean.FALSE);
 
     
+    /**
+     * Constructor registers the parameter ands loads values from config file.
+     * 
+     */
     public MailConfig() {
         register(m_javamail);
         register(m_debug);
@@ -88,6 +92,10 @@ public final class MailConfig extends AbstractConfig {
         return m_props;
     }
 
+    /**
+     * 
+     * @return 
+     */
     public String getDefaultFrom() {
         String from  = (String) get(m_defaultFrom);
         if (null == from) 
@@ -96,15 +104,35 @@ public final class MailConfig extends AbstractConfig {
         return from;
     }
 
+    /**
+     * 
+     * @return 
+     */
     public boolean isDebug() {
         return get(m_debug).equals(Boolean.TRUE);
     }
 
+    /**
+     * determine whether messages with mime type text/html
+     * should be sent as html emails (with plain text alternative) or
+     * just sent as translated plain text
+     * @return
+     */
+    public boolean sendHTMLMessageAsHTMLEmail () {
+    	return ((Boolean)get(m_sendHTML)).booleanValue();
+    }
+
+
+
+    /**
+     * 
+     */
     private static class PropertyFileParameter extends URLParameter {
         PropertyFileParameter(String name, int multiplicity, Object defaalt) {
             super(name, multiplicity, defaalt);
         }
 
+        @Override
         protected void doValidate(Object value, ErrorList errors) {
             super.doValidate(value, errors);
 
@@ -126,14 +154,4 @@ public final class MailConfig extends AbstractConfig {
         }
     }
 
-    /**
-     * determine whether messages with mime type text/html
-     * should be sent as html emails (with plain text alternative) or
-     * just sent as translated plain text
-     * @return
-     */
-    public boolean sendHTMLMessageAsHTMLEmail () {
-    	return ((Boolean)get(m_sendHTML)).booleanValue();
-    }
-
 }
diff --git a/ccm-core/src/com/arsdigita/web/Application.java b/ccm-core/src/com/arsdigita/web/Application.java
index 1a24cf88f..f17c378e5 100755
--- a/ccm-core/src/com/arsdigita/web/Application.java
+++ b/ccm-core/src/com/arsdigita/web/Application.java
@@ -385,7 +385,13 @@ public class Application extends Resource {
         return (Application) result;
     }
 
-    // Can return null.
+    /**
+     * 
+     * Can return null.
+     * @param siteNode
+     * @return
+     * @deprecated 
+     */
     public static Application retrieveApplicationForSiteNode
         (SiteNode siteNode) {
         DataQuery query = SessionManager.getSession().retrieveQuery
@@ -737,18 +743,20 @@ public class Application extends Resource {
     /**
      * Returns a canonical application URL.  This is a utility method
      * that constructs a URL fragment (just the path relative to the
-     * protocol and server) by trimming the with both leading and
-     * trailing slashes.
+     * protocol and server) by trimming white spaces and the ensuring both
+     * leading and trailing slashes.
      *
      */
     public static String getCanonicalURL(String url) {
-        // Remove whitespace
-        url = url.trim();
+        
+        String canonicalURL;
+        url = url.trim();  // Remove whitespace
 
         // Verify leading and trailing characters
-        String canonicalURL = url.startsWith(SLASH) ? url : (SLASH + url);
+        canonicalURL = url.startsWith(SLASH) ? url : (SLASH + url);
+        canonicalURL = url.endsWith(SLASH) ? canonicalURL : (canonicalURL + SLASH);
 
-        return url.endsWith(SLASH) ? canonicalURL : (canonicalURL + SLASH);
+        return canonicalURL ;
     }
 
     public String getContextPath() {
@@ -782,6 +790,11 @@ public class Application extends Resource {
      *   <url-pattern>/ccm-applicationName/files/*</url-pattern>
      * </servlet-mapping>
      *
+     * NOTE: According to Servlet API the path always starts with a leading '/'
+     * and includes either the servlet name or a path to the servlet, but does 
+     * not include any extra path information or a query string. Returns an
+     * empry string ("") is the servlet used was matched using the "/*" pattern.
+     * 
      * @return path name to the applications servlet/JSP
      */
     public String getServletPath() {
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
index 4bbeef61a..614bd934b 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
@@ -123,6 +123,26 @@
     <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>webdevsupport</servlet-name>
+    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <servlet-class>com.arsdigita.ui.sitemap.SiteMapServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>oid-redirect</servlet-name>
     <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
@@ -158,6 +178,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -205,11 +226,11 @@
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</param-value>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -231,20 +252,20 @@
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
  
-  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
   <servlet>
-    <servlet-name>rss-files</servlet-name>
+    <servlet-name>rssfeed-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-rss</param-value>
+      <param-value>/templates/ccm-rssfeed</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+  <!-- module ccm-rssfeed  -  servlet declaration END   -->
 
   <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
   <servlet>
@@ -355,8 +376,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -364,11 +385,12 @@
     <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
   <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+    <servlet-name>rssfeed-files</servlet-name>
+    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
   </servlet-mapping>
+  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
 
   <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -437,7 +459,7 @@
 
   <servlet-mapping>
     <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
+    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -455,6 +477,26 @@
     <url-pattern>/versioning/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>webdevsupport</servlet-name>
+    <url-pattern>/webdevsupport/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <url-pattern>/admin-sitemap/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>oid-redirect</servlet-name>
     <url-pattern>/redirect/*</url-pattern>
@@ -477,7 +519,7 @@
 
   <servlet-mapping>
     <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-item/*</url-pattern>
+    <url-pattern>/templates/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -500,7 +542,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index ea98f8a28..771eeab52 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -27,10 +27,7 @@
 
   <filter-mapping>
     <filter-name>subsite</filter-name>
-    <url-pattern>/ccm/*</url-pattern>
-<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
--->
   </filter-mapping>
 
   <filter-mapping>
@@ -98,6 +95,26 @@
     <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>webdevsupport</servlet-name>
+    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <servlet-class>com.arsdigita.ui.sitemap.SiteMapServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>oid-redirect</servlet-name>
     <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
@@ -180,14 +197,12 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</param-value>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -209,20 +224,20 @@
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
  
-  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
   <servlet>
-    <servlet-name>rss-files</servlet-name>
+    <servlet-name>rssfeed-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-rss</param-value>
+      <param-value>/templates/ccm-rssfeed</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+  <!-- module ccm-rssfeed  -  servlet declaration END   -->
 
   <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
   <servlet>
@@ -281,33 +296,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>theme-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>ThemePreviewServlet</servlet-name>
      <display-name>Servlet to allow admins to preview look/feel</display-name>
     <servlet-class>
-     com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -333,8 +348,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -342,11 +357,12 @@
     <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
   <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+    <servlet-name>rssfeed-files</servlet-name>
+    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
   </servlet-mapping>
+  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
 
   <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -380,7 +396,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -395,7 +411,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -415,7 +431,7 @@
 
   <servlet-mapping>
     <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
+    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -433,6 +449,26 @@
     <url-pattern>/versioning/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>webdevsupport</servlet-name>
+    <url-pattern>/webdevsupport/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <url-pattern>/admin-sitemap/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>oid-redirect</servlet-name>
     <url-pattern>/redirect/*</url-pattern>
@@ -455,7 +491,7 @@
 
   <servlet-mapping>
     <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-item/*</url-pattern>
+    <url-pattern>/templates/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -478,7 +514,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index 509bcaced..ebbf50373 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -123,6 +123,26 @@
     <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>webdevsupport</servlet-name>
+    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <servlet-class>com.arsdigita.ui.sitemap.SiteMapServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>oid-redirect</servlet-name>
     <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
@@ -205,11 +225,11 @@
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</param-value>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -231,20 +251,20 @@
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
  
-  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
   <servlet>
-    <servlet-name>rss-files</servlet-name>
+    <servlet-name>rssfeed-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-rss</param-value>
+      <param-value>/templates/ccm-rssfeed</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+  <!-- module ccm-rssfeed  -  servlet declaration END   -->
 
   <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
   <servlet>
@@ -355,8 +375,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -364,11 +384,12 @@
     <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
   <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+    <servlet-name>rssfeed-files</servlet-name>
+    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
   </servlet-mapping>
+  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
 
   <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -437,7 +458,7 @@
 
   <servlet-mapping>
     <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
+    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -455,6 +476,26 @@
     <url-pattern>/versioning/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>webdevsupport</servlet-name>
+    <url-pattern>/webdevsupport/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <url-pattern>/admin-sitemap/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>oid-redirect</servlet-name>
     <url-pattern>/redirect/*</url-pattern>
@@ -477,7 +518,7 @@
 
   <servlet-mapping>
     <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-item/*</url-pattern>
+    <url-pattern>/templates/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
index d8642e5c7..614bd934b 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
@@ -32,12 +32,12 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
     <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
   </filter>
 
 <!--    NOT USED HERE
@@ -123,6 +123,26 @@
     <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>webdevsupport</servlet-name>
+    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <servlet-class>com.arsdigita.ui.sitemap.SiteMapServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>oid-redirect</servlet-name>
     <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
@@ -158,6 +178,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -205,11 +226,11 @@
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</param-value>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -231,20 +252,20 @@
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
  
-  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
   <servlet>
-    <servlet-name>rss-files</servlet-name>
+    <servlet-name>rssfeed-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-rss</param-value>
+      <param-value>/templates/ccm-rssfeed</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+  <!-- module ccm-rssfeed  -  servlet declaration END   -->
 
   <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
   <servlet>
@@ -271,26 +292,26 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
-  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
   <servlet>
     <servlet-name>subsite-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-subsite</param-value>
+      <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+  <!-- module ccm-subsite  -  servlet declarations END  -->
 
   <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
   <servlet>
@@ -355,8 +376,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -364,11 +385,12 @@
     <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
   <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+    <servlet-name>rssfeed-files</servlet-name>
+    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
   </servlet-mapping>
+  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
 
   <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -382,18 +404,18 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+  <!-- module ccm-subsite  -  servlet mappings END  -->
 
   <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -437,7 +459,7 @@
 
   <servlet-mapping>
     <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
+    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -455,6 +477,26 @@
     <url-pattern>/versioning/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>webdevsupport</servlet-name>
+    <url-pattern>/webdevsupport/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <url-pattern>/admin-sitemap/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>oid-redirect</servlet-name>
     <url-pattern>/redirect/*</url-pattern>
@@ -477,7 +519,7 @@
 
   <servlet-mapping>
     <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-item/*</url-pattern>
+    <url-pattern>/templates/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -500,7 +542,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index 52bfcb18f..614bd934b 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -32,12 +32,12 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
     <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
   </filter>
 
 <!--    NOT USED HERE
@@ -123,6 +123,26 @@
     <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>webdevsupport</servlet-name>
+    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin</servlet-name>
+    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <servlet-class>com.arsdigita.ui.sitemap.SiteMapServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>oid-redirect</servlet-name>
     <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
@@ -158,6 +178,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -205,11 +226,11 @@
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</param-value>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -231,20 +252,20 @@
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
  
-  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
   <servlet>
-    <servlet-name>rss-files</servlet-name>
+    <servlet-name>rssfeed-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-rss</param-value>
+      <param-value>/templates/ccm-rssfeed</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+  <!-- module ccm-rssfeed  -  servlet declaration END   -->
 
   <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
   <servlet>
@@ -271,26 +292,26 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
-  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
   <servlet>
     <servlet-name>subsite-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-subsite</param-value>
+      <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+  <!-- module ccm-subsite  -  servlet declarations END  -->
 
   <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
   <servlet>
@@ -355,8 +376,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -364,11 +385,12 @@
     <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
   <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+    <servlet-name>rssfeed-files</servlet-name>
+    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
   </servlet-mapping>
+  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
 
   <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -382,18 +404,18 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+  <!-- module ccm-subsite  -  servlet mappings END  -->
 
   <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -437,7 +459,7 @@
 
   <servlet-mapping>
     <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
+    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -455,6 +477,26 @@
     <url-pattern>/versioning/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>webdevsupport</servlet-name>
+    <url-pattern>/webdevsupport/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin</servlet-name>
+    <url-pattern>/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-sitemap</servlet-name>
+    <url-pattern>/admin-sitemap/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>webadmin-permissions</servlet-name>
+    <url-pattern>/admin-permissions/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>oid-redirect</servlet-name>
     <url-pattern>/redirect/*</url-pattern>
@@ -477,7 +519,7 @@
 
   <servlet-mapping>
     <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-item/*</url-pattern>
+    <url-pattern>/templates/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
index 8d7d2ef0d..a27f152ea 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
@@ -32,7 +32,7 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
@@ -52,6 +52,7 @@
   </filter-mapping>
 -->
 
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -177,6 +178,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -280,13 +282,13 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
@@ -386,10 +388,10 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-subsite  -  servlet mappings BEGIN  -->