diff --git a/ccm-bookmarks/application.xml b/ccm-bookmarks/application.xml
index 7bd70df6a..1de5b9b2d 100755
--- a/ccm-bookmarks/application.xml
+++ b/ccm-bookmarks/application.xml
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-bookmarks"
   prettyName="Bookmarks"
-  version="6.6.0"
+  version="6.6.1"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
diff --git a/ccm-bookmarks/sql/ccm-bookmarks/upgrade/default/6.6.0-6.6.1/upd_inits.sql b/ccm-bookmarks/sql/ccm-bookmarks/upgrade/default/6.6.0-6.6.1/upd_inits.sql
new file mode 100644
index 000000000..92ad4dd11
--- /dev/null
+++ b/ccm-bookmarks/sql/ccm-bookmarks/upgrade/default/6.6.0-6.6.1/upd_inits.sql
@@ -0,0 +1,43 @@
+--
+-- Copyright (C) 2011 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: upd_inits.sql  $
+
+-- adjust various system tables to the new location of Initializer
+alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
+
+update inits
+   set class_name=replace(class_name,'bookmarks.installer.Initializer', 
+                                     'bookmarks.Initializer')
+ where class_name like '%bookmarks.installer.Initializer%' ;
+
+update init_requirements
+   set init='com.arsdigita.bookmarks.Initializer'
+ where init='com.arsdigita.bookmarks.installer.Initializer' ;
+
+
+ALTER TABLE ONLY init_requirements
+  ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+ALTER TABLE init_requirements
+  ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
diff --git a/ccm-bookmarks/sql/ccm-bookmarks/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-bookmarks/sql/ccm-bookmarks/upgrade/oracle-se-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..5a48d96fc
--- /dev/null
+++ b/ccm-bookmarks/sql/ccm-bookmarks/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -0,0 +1,23 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2011/09/10 23:15:09 $
+
+
+PROMPT Bookmarks Application 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
+
+@@ default/6.6.0-6.6.1/upd_inits.sql
diff --git a/ccm-bookmarks/sql/ccm-bookmarks/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-bookmarks/sql/ccm-bookmarks/upgrade/postgres-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..287cd06db
--- /dev/null
+++ b/ccm-bookmarks/sql/ccm-bookmarks/upgrade/postgres-6.6.0-6.6.1.sql
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2011/09/10 23:15:09 $
+
+\echo Bookmarks Application 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i default/6.6.0-6.6.1/upd_inits.sql
+
+commit;
diff --git a/ccm-bookmarks/src/ccm-bookmarks.upgrade b/ccm-bookmarks/src/ccm-bookmarks.upgrade
index f8070cf50..677c90d58 100755
--- a/ccm-bookmarks/src/ccm-bookmarks.upgrade
+++ b/ccm-bookmarks/src/ccm-bookmarks.upgrade
@@ -1,2 +1,5 @@
 <upgrade>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-bookmarks/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
 </upgrade>
diff --git a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql
index d36fc13e0..22af53147 100644
--- a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql
+++ b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql
@@ -1,4 +1,4 @@
-\echo ImageStep 6.5.0 -> 6.5.1 Upgrade Script (PostgreSQL)
+\echo ImageStep 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
 
 begin;
 
diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleConfig.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleConfig.java
index c80d69159..0f792aca3 100755
--- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleConfig.java
+++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleConfig.java
@@ -40,12 +40,18 @@ public class MultiPartArticleConfig extends AbstractConfig {
 
     
     public MultiPartArticleConfig() {
-		m_searchResultFormat =  new EnumerationParameter("com.arsdigita.cms.types.mparticle.search.result_format", Parameter.REQUIRED,
+        
+		m_searchResultFormat =  new EnumerationParameter(
+                "com.arsdigita.cms.types.mparticle.search.result_format", 
+                Parameter.REQUIRED,
 	            SHORT_TITLE);
+        
 		m_searchResultFormat.put(SHORT_TITLE, SHORT_TITLE); 
 		m_searchResultFormat.put(PAGE_TOP_TITLE, PAGE_TOP_TITLE);
 		m_searchResultFormat.put(SECTION_TITLE, SECTION_TITLE);
+        
 		register(m_searchResultFormat);
+        
 	    loadInfo();
     }
 
diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
index 971198f86..21609e79c 100755
--- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
+++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
@@ -43,7 +43,8 @@ public class MultiPartArticleLoader extends AbstractContentTypeLoader {
         "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xml"
     };
 
-    private ResourceParameter m_template;
+    //Not needed anymore
+/*  private ResourceParameter m_template;   */
 
     /**
      * MultiPartArticleLoader Constructor
diff --git a/ccm-faq/src/com/arsdigita/faq/Faq.java b/ccm-faq/src/com/arsdigita/faq/Faq.java
index 88648c7dd..aee60d03e 100644
--- a/ccm-faq/src/com/arsdigita/faq/Faq.java
+++ b/ccm-faq/src/com/arsdigita/faq/Faq.java
@@ -34,12 +34,11 @@ import java.math.BigDecimal;
 /**
  * Faq class.
  *
+ * @version $Id: com/arsdigita/faq/Faq.java#5 $
  */
 
 public class Faq extends Application {
 
-    public static final String versionId = "$Id: //apps/faq/dev/src/com/arsdigita/faq/Faq.java#5 $ by $Author: dennis $, $DateTime: 2004/08/17 23:26:27 $";
-
     public static final String BASE_DATA_OBJECT_TYPE =
         "com.arsdigita.faq.Faq";
 
@@ -83,13 +82,13 @@ public class Faq extends Application {
                               new TypedText(answer, TypedText.TEXT_HTML));
     }
 
-    /**
-     * @deprecated use createQuestion(String, TypedText) instead
-     */
-    public QAPair createQuestion(String question, String answer,
-                                 String answerFormat) {
-        return createQuestion(question, new TypedText(answer, answerFormat));
-    }
+//  /**
+//   * @deprecated use createQuestion(String, TypedText) instead
+//   */
+//  public QAPair createQuestion(String question, String answer,
+//                               String answerFormat) {
+//      return createQuestion(question, new TypedText(answer, answerFormat));
+//  }
 
     public QAPair createQuestion(String question, TypedText answer) {
 
@@ -159,4 +158,9 @@ public class Faq extends Application {
 
     }
 
+    @Override
+    public String getServletPath() {
+        return "faq";
+    }
+
 }
diff --git a/ccm-faq/src/com/arsdigita/faq/Loader.java b/ccm-faq/src/com/arsdigita/faq/Loader.java
index ec8934b8d..f1fe3811a 100644
--- a/ccm-faq/src/com/arsdigita/faq/Loader.java
+++ b/ccm-faq/src/com/arsdigita/faq/Loader.java
@@ -79,20 +79,22 @@ public class Loader extends PackageLoader {
      */
     private void loadFAQApplicationType() {
 
-        /* Setup a new style legacy compatible application type.   */
-        //  ApplicationType type = ApplicationType.createApplicationType(
+    //  /* Setup a new style legacy compatible application type.   */
+    //  ApplicationType type = ApplicationType.createApplicationType(
     //                                        "faq",
     //                                        "Frequently Asked Questions",
     //                                        Faq.BASE_DATA_OBJECT_TYPE);
-        // Current code requires an apps specific dispatcher class. Has to be
-        // modified to be able to create a legacy free app type.
-   //   type.setDispatcherClass
-   //           ("com.arsdigita.faq.FaqDispatcher");
+    //  /* Current code requires an apps specific dispatcher class.         */
+    //  /* Has to be modified to be able to create a legacy free app type.  */
+    //  type.setDispatcherClass ("com.arsdigita.faq.FaqDispatcher");
 
         /* Setup as new stype legacy free aplcation */
+        // NOTE: The title "FAQ" is used to retrieve the application's
+        // name to determine the location of xsl files (by url-izing it). So
+        // DON'T modify it without synchronizing web directory tree accordingly!
         ApplicationType type = new ApplicationType("FAQ",
                                                    Faq.BASE_DATA_OBJECT_TYPE);
-        // type independent:
+        // set.Description is independent from application type:
         type.setDescription
             ("Frequently Asked Questions empower users to share knowledge.");
 
@@ -102,21 +104,19 @@ public class Loader extends PackageLoader {
 
     // ////////////////////////////////////////////////////////////////////////
     //
-    //        S e t u p    a   F A Q   a p p l i c a t i o n
+    //        S e t u p   o f   a p p l i c a t i o n   i n s t a n c e s
     //
     // ////////////////////////////////////////////////////////////////////////
+    
+    /**
+     * Creates a default FAQ application instance at address /faq/
+     * 
+     */
     private void setupDefaultFaq() {
 
-    //  try {
-    //      SiteNode sn = SiteNode.getSiteNode("/administration", false);
-    //      if (!"administration".equals(sn.getName())) {
-                Faq faq = Faq.create(
-                        "faq", "Default FAQ", null);
-                faq.save();
-    //      }
-    //  } catch (DataObjectNotFoundException e) {
-    //      Assert.fail(e.getMessage());
-    //  }
+        Faq faq = Faq.create("faq", "Default FAQ", null);
+        faq.setDescription("The default ccm-faq instance.");
+        faq.save();
     }
 
 
diff --git a/ccm-faq/web/WEB-INF/web.faq.xml b/ccm-faq/web/WEB-INF/web.faq.xml
new file mode 100644
index 000000000..284897ff8
--- /dev/null
+++ b/ccm-faq/web/WEB-INF/web.faq.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee" 
+             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">
+
+        <!-- Servlets for the faq applications -->
+
+    <servlet>
+        <servlet-name>FAQ</servlet-name>
+        <servlet-class>com.arsdigita.faq.FaqServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>FAQ</servlet-name>
+        <url-pattern>/faq/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
\ No newline at end of file
diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/project.xml b/ccm-gen-aplaws/bundles/handbook/cfg/project.xml
index 2cf795d21..2d459f94c 100644
--- a/ccm-gen-aplaws/bundles/handbook/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/handbook/cfg/project.xml
@@ -46,18 +46,18 @@
 <!--  - - - - -  -   -->
         <ccm:application name="ccm-docmgr"/>                            
         <ccm:application name="ccm-forum"/>
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
         <ccm:application name="ccm-user-preferences"/>
 
 <!--  LDN extension  -->
 <!--  - - - - - - -  -->
         <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
         <ccm:application name="ccm-ldn-rss"/>                        
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
 
 
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
index 47ba52d61..565f1384b 100755
--- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Staatsschiff bundle integration.properties release version 1.2.2 / r92x
+# Staatsschiff bundle integration.properties release version 1.1.4 / r111x
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -91,7 +91,8 @@ com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
 # ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+# No longer used in MultipartArticle
+#com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
 
 # ## com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml b/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml
index bcf1c4ea5..98438d62d 100644
--- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml
@@ -29,64 +29,30 @@
 
 <!--   Content Types   -->
 <!--   - - - - - - -    -->
-<!--    <ccm:application name="ccm-cms-types-address"/>              -->
-<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
-<!--    <ccm:application name="ccm-cms-types-contact"/>              -->
-<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
-<!--    <ccm:application name="ccm-cms-types-event"/>                -->
         <ccm:application name="ccm-cms-types-faqitem"/>              
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
         <ccm:application name="ccm-cms-types-glossaryitem"/>         
-<!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
         <ccm:application name="ccm-cms-types-image"/>     
-<!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
-<!--    <ccm:application name="ccm-cms-types-job"/>                  -->
-<!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
-<!--    <ccm:application name="ccm-cms-types-minutes"/>              -->
-<!--    <ccm:application name="ccm-cms-types-member"/>               -->
-<!--    <ccm:application name="ccm-cms-types-motditem"/>             -->
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
-<!--    <ccm:application name="ccm-cms-types-organization"/>         -->
-<!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
-<!--    <ccm:application name="ccm-cms-types-service"/>              -->
-<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->   
-<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
 
 <!--  Applications   -->
 <!--  - - - - -  -   -->
-<!--    <ccm:application name="ccm-auth-http"/>                      -->
-<!--    <ccm:application name="ccm-bookmarks"/>                      -->
-<!--    had been temporarily excluded, produces errors in the build process   -->
-<!--    <ccm:application name="ccm-docmgr"/>                         -->
-<!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
-<!--    <ccm:application name="ccm-forum"/>                          -->
-<!--    <ccm:application name="ccm-simplesurvey"/>                   -->
-<!--    <ccm:application name="ccm-user-preferences"/>               -->
-<!--    <ccm:application name="ccm-weblog"/>                         -->
-<!--    <ccm:application name="ccm-webpage"/>                        -->
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
 
 <!--  LDN extension  -->
 <!--  - - - - - - -  -->
-<!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
-<!--    <ccm:application name="ccm-ldn-atoz"/>                       -->
-<!--    <ccm:application name="ccm-ldn-dublin"/>                     -->
-<!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
-<!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
-<!--    <ccm:application name="ccm-ldn-image-step"/>                 -->
-<!--    <ccm:application name="ccm-ldn-importer"/>                   -->
         <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
         <ccm:application name="ccm-ldn-rss"/>                        
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
 
 
@@ -103,4 +69,27 @@
 
 
   </ccm:build>
+  
+  <!-- Probable Addons  -->
+
+<!--   Content Types   -->
+<!--   - - - - - - -    -->
+<!--    <ccm:application name="ccm-cms-types-address"/>              -->
+<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
+<!--    <ccm:application name="ccm-cms-types-contact"/>              -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
+<!--    <ccm:application name="ccm-cms-types-event"/>                -->
+<!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
+<!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
+<!--    <ccm:application name="ccm-cms-types-job"/>                  -->
+<!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
+<!--    <ccm:application name="ccm-cms-types-minutes"/>              -->
+<!--    <ccm:application name="ccm-cms-types-member"/>               -->
+<!--    <ccm:application name="ccm-cms-types-motditem"/>             -->
+<!--    <ccm:application name="ccm-cms-types-organization"/>         -->
+<!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
+<!--    <ccm:application name="ccm-cms-types-service"/>              -->
+<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->   
+<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
+
 </ccm:project>
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/specialItems/README.txt b/ccm-gen-aplaws/bundles/staatsschiff/specialItems/README.txt
new file mode 100644
index 000000000..8b8f64b30
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/specialItems/README.txt
@@ -0,0 +1,2 @@
+gen-default.jsp ist für Staatsschiff speziell angepasst, so dass gen_default die Thumbnails von ct Image inder Liste mit anzeigt. Wäre vermutlich besser umzubenennen in ImageList oder ähnlich.
+
diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp b/ccm-gen-aplaws/bundles/staatsschiff/specialItems/gen-default.jsp
similarity index 82%
rename from ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp
rename to ccm-gen-aplaws/bundles/staatsschiff/specialItems/gen-default.jsp
index 70e1e089a..2e27f432e 100644
--- a/ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp
+++ b/ccm-gen-aplaws/bundles/staatsschiff/specialItems/gen-default.jsp
@@ -1,7 +1,8 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-       xmlns:define="/WEB-INF/bebop-define.tld" 
-         xmlns:show="/WEB-INF/bebop-show.tld"
-	    version="1.2">
+<jsp:root 
+  xmlns:jsp="http://java.sun.com/JSP/Page" 
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
@@ -23,12 +24,6 @@
 
     <define:component name="greetingItem"
       classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
     <define:component name="categoryPath"
       classname="com.arsdigita.london.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
@@ -49,7 +44,6 @@
       ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
       ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
       ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
       ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
       ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
       ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
@@ -62,4 +56,3 @@
   </define:page>
   <show:all/>
 </jsp:root>
-
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/specialItems/gen-welcome.jsp b/ccm-gen-aplaws/bundles/staatsschiff/specialItems/gen-welcome.jsp
new file mode 100644
index 000000000..bdf3f7745
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/specialItems/gen-welcome.jsp
@@ -0,0 +1,121 @@
+<jsp:root 
+  xmlns:jsp="http://java.sun.com/JSP/Page" 
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
+
+  <%-- JSP template for the ZeS welcome / start page using navigation --%>
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("newsDate");
+    </jsp:scriptlet>
+    <define:component name="eventList"
+      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
+
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings          // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.                    // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.                        // Komplizierter geht's wohl nicht mehr.                                                                                                             
+      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
+      java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
+                                                              now.get(java.util.GregorianCalendar.MONTH), 
+                                                              now.get(java.util.GregorianCalendar.DATE))).getTime();
+      // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
+      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
+      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
+      java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
+                                                              now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
+                                                              now.get(java.util.GregorianCalendar.MINUTE),
+                                                              now.get(java.util.GregorianCalendar.SECOND))).getTime();
+ 
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time);
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);      
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
+      
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(5);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
+    </jsp:scriptlet>
+    <define:component name="newsList"
+      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate &gt; :oldNewsDate");
+      
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
+      // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. 
+      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
+      // Komplizierter geht's wohl nicht mehr.
+      java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar();
+      oldDate.add(java.util.Calendar.MONTH, -2);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime());
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().addOrder("newsDate desc");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().setPageSize(5);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
diff --git a/ccm-gen-aplaws/bundles/wsf/AUTHORS b/ccm-gen-aplaws/bundles/wsf/AUTHORS
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/wsf/ChangeLog b/ccm-gen-aplaws/bundles/wsf/ChangeLog
new file mode 100755
index 000000000..7dc05b911
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/wsf/ChangeLog
@@ -0,0 +1,4 @@
+* Wed Jun 15 2011 Peter 
+- Initial Release
+
+
diff --git a/ccm-gen-aplaws/bundles/wsf/NEWS b/ccm-gen-aplaws/bundles/wsf/NEWS
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/wsf/README b/ccm-gen-aplaws/bundles/wsf/README
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/wsf/bundle.in b/ccm-gen-aplaws/bundles/wsf/bundle.in
new file mode 100755
index 000000000..2efedf1de
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/wsf/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-wsf
+BUNDLE_PRETTY_NAME="APLAWS+ Bundle Welfare State Futures WSF)"
+VERSION=1.1.4
+RELEASE=1
diff --git a/ccm-gen-aplaws/bundles/wsf/cfg/integration.properties b/ccm-gen-aplaws/bundles/wsf/cfg/integration.properties
new file mode 100755
index 000000000..6be4b053c
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/wsf/cfg/integration.properties
@@ -0,0 +1,151 @@
+# Welfare State Future (WSF) bundle integration.properties release version 1.1.4 / r111x
+#
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+
+waf.dispatcher.default_expiry=3600
+;
+# waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=en,de
+
+waf.mail.default_from=webmaster@www.welfare-state-futures.uni-bremen.de
+
+; security.properties:
+waf.auto_registration_on=false
+
+; Searches for localized style sheet (among others) 
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+
+core.ui.pagemap.root_page_url=portal/
+core.ui.pagemap.workspace_url=portal/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=webmaster@welfare-state-futures.uni-bremen.de
+
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
+com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
+com.arsdigita.cms.dhtml_editor_hidden_buttons=
+com.arsdigita.cms.dhtml_editor_plugins=
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=
+
+; to use deprecated HTMLarea (NOT recommended!):
+; currently configuration is hardcoded, so the fest alternative works
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
+com.arsdigita.cms.disable_item_pfs=true
+
+; com.arsdigita.cms.hide_admin_tabs=true
+; com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+; com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
+com.arsdigita.cms.use_section_categories=false
+com.arsdigita.cms.use_streamlined_creation=true
+com.arsdigita.cms.skip_asset_steps=com.arsdigita.cms.contenttypes.MultiPartArticle:com.arsdigita.cms.contentassets.ui.ImageStep,com.arsdigita.cms.contenttypes.InlineSite:com.arsdigita.cms.contentassets.ui.ImageStep,com.arsdigita.cms.InlineSite:com.arsdigita.cms.contentassets.ui.FileAttachmentsStep
+
+79	
+
+80	
+
+# ccm-cms-types-event parameters
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
+com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# ccm-ldn-navigation application
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+; com.arsdigita.london.navigation.category_menu_show_nephews=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
+
+
+
+# ccm-ldn-search application
+com.arsdigita.london.search.show_sponsored_links=true
+
+
+
+# ccm-ldn-subsite application
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# ccm-themedirector application
+themedirector.default_theme_context=
+; themedirector.default_theme_manifest=ccm-gen-aplaws.web.mf
+themedirector.default_theme_path=themes/static/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
+
+; =============================================================================================
+; runtime specific configurations
+
+waf.admin.email=webmaster@wsf.uni-bremen.de
+waf.admin.name.given=WSF 
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345 
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/wsf?user\=wsf&password\=ccm4welfare
+waf.runtime.jdbc_pool_size=40
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+# com.arsdigita.aplaws.lite_load=true
+# waf.debug=true
+# waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-gen-aplaws/bundles/wsf/cfg/project.xml b/ccm-gen-aplaws/bundles/wsf/cfg/project.xml
new file mode 100644
index 000000000..341883ec8
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/wsf/cfg/project.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- project.xml -Welfare State Futures (WSF) - containing only those modules used for it -->
+
+<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
+               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
+              ccmVersion="6.1" 
+                    name="aplaws-wsf" 
+              prettyName="APLAWS plus" 
+                 version="1-1-4" 
+                 release="1110" 
+                  webxml="web.xml-aplaws" 
+                  webapp="ROOT" 
+      xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
+
+  <ccm:build>
+
+<!--   Main apps   -->
+<!--   - - - - -   -->
+        <ccm:application name="ccm-core"/>
+        <ccm:application name="ccm-cms"/>
+
+<!--   Content Assets   -->
+<!--   - - - - - - -    -->
+        <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
+
+<!--   Content Types   -->
+<!--   - - - - - - -    -->
+        <ccm:application name="ccm-cms-types-article"/>
+        <ccm:application name="ccm-cms-types-bookmark"/>
+        <ccm:application name="ccm-cms-types-faqitem"/>              
+        <ccm:application name="ccm-cms-types-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>         
+        <ccm:application name="ccm-cms-types-image"/>     
+        <ccm:application name="ccm-cms-types-mparticle"/>
+        <ccm:application name="ccm-cms-types-newsitem"/>
+
+<!--  Applications   -->
+<!--  - - - - -  -   -->
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
+
+<!--  LDN extension  -->
+<!--  - - - - - - -  -->
+        <ccm:application name="ccm-ldn-navigation"/>
+        <ccm:application name="ccm-ldn-rss"/>                        
+        <ccm:application name="ccm-ldn-search"/>
+        <ccm:application name="ccm-ldn-shortcuts"/>
+        <ccm:application name="ccm-ldn-subsite"/>                    
+        <ccm:application name="ccm-ldn-terms"/>
+        <ccm:application name="ccm-ldn-util"/>
+
+
+<!--  gen integration layer  -->
+<!--  - - - - - - -  -->
+        <ccm:application name="ccm-sci-publications"/>
+        <ccm:application name="ccm-gen-aplaws"/>
+
+
+
+<!-- tools will be downloaded from trunk, but does not
+     contain java code to be compiled!
+        <ccm:application name="tools"/>           -->
+
+
+  </ccm:build>
+  
+  <!-- Probable Addons  -->
+
+<!--   Content Types   -->
+<!--   - - - - - - -    -->
+<!--    <ccm:application name="ccm-cms-types-address"/>              -->
+<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
+<!--    <ccm:application name="ccm-cms-types-contact"/>              -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
+<!--    <ccm:application name="ccm-cms-types-event"/>                -->
+<!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
+<!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
+<!--    <ccm:application name="ccm-cms-types-job"/>                  -->
+<!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
+<!--    <ccm:application name="ccm-cms-types-minutes"/>              -->
+<!--    <ccm:application name="ccm-cms-types-member"/>               -->
+<!--    <ccm:application name="ccm-cms-types-motditem"/>             -->
+<!--    <ccm:application name="ccm-cms-types-organization"/>         -->
+<!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
+<!--    <ccm:application name="ccm-cms-types-service"/>              -->
+<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->   
+<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
+
+</ccm:project>
diff --git a/ccm-gen-aplaws/bundles/wsf/cfg/web.xml b/ccm-gen-aplaws/bundles/wsf/cfg/web.xml
new file mode 100755
index 000000000..8221cf6f2
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/wsf/cfg/web.xml
@@ -0,0 +1,298 @@
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+
+<web-app>
+
+  <filter>
+    <filter-name>shortcuts</filter-name>
+    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+  </filter>
+
+  <filter>
+    <filter-name>subsite</filter-name>
+    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+  </filter>
+
+  <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>
+
+  <servlet>
+    <servlet-name>reg</servlet-name>
+    <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
+    <init-param>
+      <param-name>uri</param-name>
+      <param-value>/</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>legacy-dispatcher</servlet-name>
+    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
+    <load-on-startup>3</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>ccm-dispatcher</servlet-name>
+    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>fallback-servlet</param-name>
+      <param-value>legacy-dispatcher</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>legacy-adapter</servlet-name>
+    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>cache-manager</servlet-name>
+    <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>db-test</servlet-name>
+    <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>versioning-log</servlet-name>
+    <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>oid-redirect</servlet-name>
+    <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>resource-resolver</servlet-name>
+    <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
+  </servlet>
+
+  <!-- ADDITIONAL SERVLET DECLARATIONS -->
+
+  <servlet>
+    <servlet-name>content-section</servlet-name>
+    <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>content-type-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>content-item-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>template-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
+  </servlet>
+
+ <servlet>
+   <servlet-name>TextOnlyServlet</servlet-name>
+   <display-name>Text Only Servlet</display-name>
+   <servlet-class>
+    com.arsdigita.web.InternalPrefixerServlet
+   </servlet-class>
+   <init-param>
+     <param-name>prefix</param-name>
+     <param-value>/text</param-value>
+   </init-param>
+ </servlet>
+
+ <servlet>
+   <servlet-name>PrintFriendlyServlet</servlet-name>
+   <display-name>Printer Friendly Output Servlet</display-name>
+   <servlet-class>
+    com.arsdigita.web.InternalPrefixerServlet
+   </servlet-class>
+   <init-param>
+     <param-name>prefix</param-name>
+     <param-value>/print</param-value>
+   </init-param>
+ </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
+   </servlet-class>
+   <init-param>
+     <param-name>prefix</param-name>
+     <param-value>/theme</param-value>
+   </init-param>
+ </servlet>
+
+<!-- XXX hack -->
+
+  <servlet>
+    <servlet-name>portal-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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>navigation-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-navigation</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>reg</servlet-name>
+    <url-pattern>/__ccm__/null/reg/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>portal-files</servlet-name>
+    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>navigation-files</servlet-name>
+    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- /ADDITIONAL SERVLET DECLARATIONS -->
+
+  <servlet-mapping>
+    <servlet-name>ccm-dispatcher</servlet-name>
+    <url-pattern>/ccm/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>legacy-adapter</servlet-name>
+    <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cache-manager</servlet-name>
+    <url-pattern>/expireCache/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>db-test</servlet-name>
+    <url-pattern>/dbtest</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>versioning-log</servlet-name>
+    <url-pattern>/versioning/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>oid-redirect</servlet-name>
+    <url-pattern>/redirect/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>resource-resolver</servlet-name>
+    <url-pattern>/resource/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- ADDITIONAL SERVLET MAPPINGS -->
+
+  <servlet-mapping>
+    <servlet-name>content-section</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>content-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>content-item-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>template-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/template/*</url-pattern>
+  </servlet-mapping>
+
+ <servlet-mapping>
+     <servlet-name>TextOnlyServlet</servlet-name>
+     <url-pattern>/text/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+     <servlet-name>PrintFriendlyServlet</servlet-name>
+     <url-pattern>/print/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+     <servlet-name>ThemePreviewServlet</servlet-name>
+     <url-pattern>/theme/*</url-pattern>
+ </servlet-mapping>
+
+
+  <!-- /ADDITIONAL SERVLET MAPPINGS -->
+
+  <error-page>
+    <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
+    <location>/error/access-denied.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
+    <location>/error/object-not-found.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
+    <location>/error/permission-denied.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
+    <location>/error/db-not-available.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
+    <location>/error/db-not-available.jsp</location>
+  </error-page>
+
+
+  <error-page>
+    <exception-type>java.lang.Exception</exception-type>
+    <location>/error/general.jsp</location>
+  </error-page>
+
+</web-app>
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
index 67e5b75c2..23bac993d 100644
--- a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
@@ -1,4 +1,4 @@
-# ZSR bundle integration.properties release version 1.2.2 / r92x
+# ZSR bundle integration.properties release version 1.1.4 (r1110)
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -49,9 +49,9 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.d
 
 ; Configure dhtml editor for use in cms content-center
 ; Xinha is default and should work out of the box
-; as a temporary measure a different configuration file which includes a link selection box for CCM items
-; and CCM images should be specified:
-com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; CCM config default file:
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
 
 com.arsdigita.cms.disable_item_pfs=true
 
@@ -84,7 +84,8 @@ com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
 # ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+# No longer used in MultipartArticle
+# com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
 
 
 ; Forum application
@@ -123,7 +124,6 @@ themedirector.default_theme_context=
 themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
-# com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
 ; =============================================================================================
 ; runtime specific configurations
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/project.xml b/ccm-gen-aplaws/bundles/zsr/cfg/project.xml
index 978b0bac3..01af3f5a3 100644
--- a/ccm-gen-aplaws/bundles/zsr/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/project.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!--    project.xml -Oxford Handbook - containing only those modules used for it    -->
+<!--    project.xml - ZSR - containing only those modules used for it    -->
+<!--    last changed:  Sept. 09, 2011 for release 1.1.4 (r1110)          -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -66,6 +67,8 @@
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>                             
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
 <!--    <ccm:application name="ccm-user-preferences"/>               -->
 <!--    <ccm:application name="ccm-weblog"/>                         -->
 <!--    <ccm:application name="ccm-webpage"/>                        -->
@@ -79,13 +82,11 @@
 <!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                   -->
         <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
         <ccm:application name="ccm-ldn-rss"/>                           
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
 
 
diff --git a/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties b/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties
index ff947f044..22124ae09 100644
--- a/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties
@@ -92,7 +92,8 @@ com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
 # ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+# No longer used in MultipartArticle
+#com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
 
 com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 
diff --git a/ccm-iaw-aplaws/web/packages/navigation/templates/mparticle-index.jsp b/ccm-iaw-aplaws/web/packages/navigation/templates/mparticle-index.jsp
deleted file mode 100644
index 70e1e089a..000000000
--- a/ccm-iaw-aplaws/web/packages/navigation/templates/mparticle-index.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-       xmlns:define="/WEB-INF/bebop-define.tld" 
-         xmlns:show="/WEB-INF/bebop-show.tld"
-	    version="1.2">
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
-
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/mparticle-index.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/mparticle-index.jsp
deleted file mode 100644
index 70e1e089a..000000000
--- a/ccm-zes-aplaws/web/packages/navigation/templates/mparticle-index.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-       xmlns:define="/WEB-INF/bebop-define.tld" 
-         xmlns:show="/WEB-INF/bebop-show.tld"
-	    version="1.2">
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
-