diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
index fabe3db41..417e63af4 100755
--- a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
@@ -6,9 +6,9 @@
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
                ccmVersion="6.1" 
-               name="aplaws-zes" 
+               name="aplaws" 
                prettyName="APLAWS plus" 
-               version="1-1-2" 
+               version="1-1-5" 
                release="-complete"
                webxml="web.xml-aplaws" 
                webapp="ROOT" 
@@ -24,11 +24,11 @@
         <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
-        <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"/>
@@ -40,13 +40,11 @@
         <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-member"/>
         <ccm:application name="ccm-cms-types-minutes"/>
         <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-person"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
         <ccm:application name="ccm-cms-types-simpleaddress"/>
@@ -55,21 +53,15 @@
 
         <ccm:application name="ccm-core"/>
 
-<!-- temporarly disabled, prevents creation of the build script
         <ccm:application name="ccm-docmngr"/>
         <ccm:application name="ccm-docrepo"/>
--->
         <ccm:application name="ccm-faq"/>
-
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-forum"/>     
         <ccm:application name="ccm-forum-categorised"/>     
 
-        <ccm:application name="ccm-gen-aplaws"/>
-
-<!--
+        <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"/>
@@ -80,26 +72,17 @@
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>
         <ccm:application name="ccm-ldn-terms"/>
-
-        <ccm:application name="ccm-ldn-types-contact"/>
-<!--
-        <ccm:application name="ccm-ldn-types-esdservice"/>
--->
-
         <ccm:application name="ccm-ldn-util"/>
+
         <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
-
-        <ccm:application name="ccm-sci-publications"/>
-        <ccm:application name="ccm-sci-types-organization"/>
-
+        <ccm:application name="ccm-portlet"/>
+        <ccm:application name="ccm-portlet-helloworld"/>
         <ccm:application name="ccm-simplesurvey"/>
         <ccm:application name="ccm-themedirector"/>
         <ccm:application name="ccm-user-preferences"/>
         <ccm:application name="ccm-weblog"/>
-<!--	
         <ccm:application name="ccm-webpage"/>
--->
 
 <!-- tools will be downloaded from trunk, but does not
      contain java code to be compiled!
diff --git a/ccm-ldn-aplaws/bundles/custom/AUTHORS b/ccm-ldn-aplaws/bundles/custom/AUTHORS
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-ldn-aplaws/bundles/custom/ChangeLog b/ccm-ldn-aplaws/bundles/custom/ChangeLog
new file mode 100755
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-ldn-aplaws/bundles/custom/ChangeLog
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <apevec@redhat.com>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <apevec@redhat.com>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <berrange@redhat.com>
+- Initial build.
+
diff --git a/ccm-ldn-aplaws/bundles/custom/NEWS b/ccm-ldn-aplaws/bundles/custom/NEWS
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-ldn-aplaws/bundles/custom/README b/ccm-ldn-aplaws/bundles/custom/README
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-ldn-aplaws/bundles/custom/bundle.in b/ccm-ldn-aplaws/bundles/custom/bundle.in
new file mode 100755
index 000000000..89c39e0c3
--- /dev/null
+++ b/ccm-ldn-aplaws/bundles/custom/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-complete
+BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
+VERSION=1.1.3devel
+RELEASE=1
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
new file mode 100755
index 000000000..797a6bd3f
--- /dev/null
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
@@ -0,0 +1,160 @@
+# Complete bundle integration.properties
+#
+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.categorization.supported_languages=de,en
+
+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=de,en
+
+; security.properties:
+waf.auto_registration_on=false
+
+# MOVED to ui.Config
+#waf.pagemap.root=portal/
+#waf.pagemap.workspace=portal/
+#waf.pagemap.login_redirect=content/content-center-redirect.jsp
+
+; 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=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; 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
+;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; 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
+
+; 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
+
+
+# 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
+
+
+# ?? Where are these used?
+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
+
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+;  atoz 
+com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+# 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_path=themes/static/aplaws
+
+com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+; =============================================================================================
+; runtime specific configurations
+
+waf.admin.email=webmaster@aplaws.org
+waf.admin.name.given=aplaws 
+waf.admin.name.family=Administrator
+waf.admin.password=123456
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+waf.runtime.jdbc_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+#waf.debug=true
+#waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
new file mode 100755
index 000000000..fd734e211
--- /dev/null
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- project.xml -custom- containing all modules as of aplaws 1.1.x        -->
+<!-- A set of core modules is active, others are commented out and should 
+     activated (uncomment) according to customers requirements.            -->
+
+<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
+               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
+               ccmVersion="6.1" 
+               name="aplaws" 
+               prettyName="APLAWS plus Custom Spin" 
+               version="1-1-5" 
+               release="-custom"
+               webxml="web.xml-aplaws" 
+               webapp="ROOT" 
+   xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
+
+  <ccm:build>
+      
+        <!-- Core Modules, mandatory part of any Aplaws installation.     -->
+        <!-- Do NOT edit this section!                                    -->
+        <ccm:application name="ccm-core"/>
+        <ccm:application name="ccm-cms"/>
+        
+        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
+
+        <ccm:application name="ccm-cms-types-article"/>
+        <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-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-simpleaddress"/>
+        <ccm:application name="ccm-cms-types-siteproxy"/>
+        <ccm:application name="ccm-cms-types-xmlfeed"/>
+
+        <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-importer"/>
+        <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"/>
+
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
+
+
+        <!-- Optional Modules for an Aplaws installation.                 -->
+        <!-- Uncomment according to your site's requirements.             -->
+
+        <!-- Additional Assets                                     -->
+<!--    <ccm:application name="ccm-cms-assets-fileattachment"/>    -->
+<!--    <ccm:application name="ccm-cms-assets-notes"/>             -->
+
+        <!-- Additional Content Types                                     -->
+<!--    <ccm:application name="ccm-cms-types-agenda"/>                -->
+<!--    <ccm:application name="ccm-cms-types-bookmark"/>              -->
+<!--    <ccm:application name="ccm-cms-types-faqitem"/>               -->
+<!--    <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-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"/>               -->
+
+        <!-- Additional Content Applications                              -->
+<!--    <ccm:application name="ccm-auth-http"/>                       -->
+<!--    <ccm:application name="ccm-bookmarks"/>                       -->
+<!--    <ccm:application name="ccm-docmngr"/>                         -->
+<!--    <ccm:application name="ccm-docrepo"/>                         -->
+<!--    <ccm:application name="ccm-faq"/>                             -->
+<!--    <ccm:application name="ccm-formbuilder-pdf"/>                 -->
+<!--    <ccm:application name="ccm-forum"/>                           -->
+<!--    <ccm:application name="ccm-forum-categorised"/>               -->
+<!--    <ccm:application name="ccm-portalserver"/>                    -->
+<!--    <ccm:application name="ccm-portlet"/>                         -->
+<!--    <ccm:application name="ccm-portlet-helloworld"/>              -->
+<!--    <ccm:application name="ccm-simplesurvey"/>                    -->
+<!--    <ccm:application name="ccm-user-preferences"/>                -->
+<!--    <ccm:application name="ccm-weblog"/>                          -->
+<!--    <ccm:application name="ccm-webpage"/>                         -->
+
+
+<!-- tools will be downloaded from trunk, but does not
+     contain java code to be compiled!
+        <ccm:application name="tools"/>           -->
+
+
+  </ccm:build>
+</ccm:project>
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
new file mode 100755
index 000000000..2c7c01497
--- /dev/null
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
@@ -0,0 +1,557 @@
+<!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>
+
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
+  <!-- path and filename of the log4j user accessible config file
+       WEB-INF/conf/log4j.properties is the built-in default value -->
+  <context-param>
+    <param-name>log4j-conf-file</param-name>
+    <param-value>WEB-INF/conf/log4j.properties</param-value>
+  </context-param>
+
+
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
+  <filter>
+    <filter-name>shortcuts</filter-name>
+    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+  </filter>
+
+  <filter>
+    <filter-name>subsite</filter-name>
+    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+  </filter>
+
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
+  <filter-mapping>
+    <filter-name>subsite</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>shortcuts</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     Context Listener 
+     required and used to initialize the runtime environment before any other 
+     task is performed or any servlet initialized. 
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <listener>
+    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
+  </listener>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET DECLARATIONS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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 SECTION 
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET DECLARATIONS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <servlet>
+    <servlet-name>atoz-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-atoz</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-atoz  -  servlet definitions END  -->
+
+  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
+  <servlet>
+    <servlet-name>forum-main</servlet-name>
+    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
+  </servlet>
+  <!-- module ccm-forum  -  servlet declarations END    -->  
+
+  <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>
+ 
+  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <servlet>
+    <servlet-name>rss-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>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+
+  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>worker</servlet-name>
+    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
+    <load-on-startup>4</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>search-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-search</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>AxisServlet</servlet-name>
+    <display-name>Apache-Axis Servlet</display-name>
+    <servlet-class>
+     org.apache.axis.transport.http.AxisServlet
+    </servlet-class>
+  </servlet>
+  <!-- module ccm-ldn-search  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-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>
+    </init-param>
+  </servlet>
+
+  <!-- module ccm-ldn-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>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>terms-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-terms</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
+
+  <!-- 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-themedirector</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <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.themedirector.dispatcher.InternalThemePrefixerServlet
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>atoz-files</servlet-name>
+    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-atoz  -  servlet mappings END  -->
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
+  <servlet-mapping>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/portlet-type/*</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>
+
+  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>rss-files</servlet-name>
+    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>search-files</servlet-name>
+    <url-pattern>/ccm-ldn-search/files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-search  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>shortcuts-files</servlet-name>
+    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>subsite-files</servlet-name>
+    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>terms-files</servlet-name>
+    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
+
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
+  <servlet-mapping>
+    <servlet-name>theme-files</servlet-name>
+    <url-pattern>/theme-files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemeDownload</servlet-name>
+    <url-pattern>/theme-files/download/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+    <url-pattern>/theme/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
+
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET MAPPINGS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>reg</servlet-name>
+    <url-pattern>/__ccm__/null/reg/*</url-pattern>
+  </servlet-mapping>
+
+  <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 SECTION
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>content-section</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-section/*</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>content-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-type/*</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>
+
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ERROR PAGES
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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>
+
+  <error-page>
+    <exception-type>java.lang.Error</exception-type>
+    <location>/error/general.jsp</location>
+  </error-page>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     TAG LIBS
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
+</web-app>
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index d02e5413d..ee761fb3c 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.0.5 
-     which are part of ccm-ldn-aplaws devel (and standard) bundle                               
-     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/applications.cfg -->
+<!-- project.xml - (ldn)demo - containing those modules as of aplaws 1.1.x 
+     which are part of ccm-ldn-aplaws demo bundle                             -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
                     name="aplaws" 
-              prettyName="APLAWS plus (devel)"
-                 version="1-1-0" 
-                 release="rc-3" 
+              prettyName="APLAWS plus Demo Spin"
+                 version="1-1-5" 
+                 release="demo" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -27,15 +26,13 @@
 
         <!--  Content assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
-        <ccm:application name="ccm-ldn-dublin"/>
 
         <!--  Content types   -->
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-contact"/>
-        <!-- esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact 
-             not decided yet which one to choose    
-        <ccm:application name="ccm-cms-types-esdservice"/>     --> 
+        <ccm:application name="ccm-cms-types-esdservice"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
@@ -50,8 +47,8 @@
         <!--  Applications   -->
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
+        <ccm:application name="ccm-ldn-dublin"/>
         <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"/>
@@ -61,8 +58,9 @@
 
         <!--  Extra apps   -->
         <ccm:application name="ccm-forum"/>     
-        <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-ldn-theme"/>
+        <ccm:application name="ccm-forum-categorised"/>     
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
 
 
 <!-- tools will be downloaded from trunk, but does not
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index d02e5413d..59c246c92 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.0.5 
+<!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.1.x 
      which are part of ccm-ldn-aplaws devel (and standard) bundle                               
-     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/applications.cfg -->
+     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/project.xml -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
                     name="aplaws" 
               prettyName="APLAWS plus (devel)"
-                 version="1-1-0" 
-                 release="rc-3" 
+                 version="1-1-5" 
+                 release="devel" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -27,15 +27,13 @@
 
         <!--  Content assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
-        <ccm:application name="ccm-ldn-dublin"/>
 
         <!--  Content types   -->
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-contact"/>
-        <!-- esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact 
-             not decided yet which one to choose    
-        <ccm:application name="ccm-cms-types-esdservice"/>     --> 
+        <ccm:application name="ccm-cms-types-esdservice"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
@@ -50,8 +48,9 @@
         <!--  Applications   -->
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
+        <ccm:application name="ccm-ldn-dublin"/>
+        <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"/>
@@ -61,8 +60,8 @@
 
         <!--  Extra apps   -->
         <ccm:application name="ccm-forum"/>     
-        <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-ldn-theme"/>
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
 
 
 <!-- tools will be downloaded from trunk, but does not
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
index d02e5413d..e5cb29cf5 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.0.5 
-     which are part of ccm-ldn-aplaws devel (and standard) bundle                               
-     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/applications.cfg -->
+<!-- project.xml - (ldn)standard - containing those modules as of aplaws 1.1.x 
+     which are part of ccm-ldn-aplaws  standard bundle                               
+     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/project.xml    -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
                     name="aplaws" 
-              prettyName="APLAWS plus (devel)"
-                 version="1-1-0" 
-                 release="rc-3" 
+              prettyName="APLAWS plus Standard Spin"
+                 version="1-1-5" 
+                 release="standard" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -27,15 +27,13 @@
 
         <!--  Content assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
-        <ccm:application name="ccm-ldn-dublin"/>
 
         <!--  Content types   -->
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-contact"/>
-        <!-- esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact 
-             not decided yet which one to choose    
-        <ccm:application name="ccm-cms-types-esdservice"/>     --> 
+        <ccm:application name="ccm-cms-types-esdservice"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
@@ -50,8 +48,9 @@
         <!--  Applications   -->
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
+        <ccm:application name="ccm-ldn-dublin"/>
+        <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"/>
@@ -61,8 +60,8 @@
 
         <!--  Extra apps   -->
         <ccm:application name="ccm-forum"/>     
-        <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-ldn-theme"/>
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
 
 
 <!-- tools will be downloaded from trunk, but does not