diff --git a/ccm-ldn-aplaws/application.xml b/ccm-ldn-aplaws/application.xml
index 5f24c4600..2094b9a89 100755
--- a/ccm-ldn-aplaws/application.xml
+++ b/ccm-ldn-aplaws/application.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-aplaws"
   prettyName="APLAWS"
@@ -8,12 +9,13 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-rss" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
 
   <ccm:directories>
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
index 797a6bd3f..9616cf856 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Complete bundle integration.properties
+# Custom bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -30,8 +30,8 @@ waf.auto_registration_on=false
 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.root_page_url=portal/
+core.ui.pagemap.workspace_url=portal/
 core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
 ; workflow configuration
@@ -122,7 +122,7 @@ com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.Roo
 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
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
@@ -142,7 +142,7 @@ 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.given=Aplaws 
 waf.admin.name.family=Administrator
 waf.admin.password=123456
 waf.admin.password.question=12345
@@ -156,5 +156,6 @@ 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-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
index b580423f5..7f3f0eb2a 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -10,7 +10,7 @@
                name="aplaws" 
                prettyName="APLAWS plus Custom Spin" 
                version="1-1-5" 
-               release="-custom"
+               release="custom"
                webxml="web.xml-aplaws" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -40,6 +40,7 @@
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>
+        <ccm:application name="ccm-ldn-rss"/>
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
@@ -90,7 +91,6 @@
 <!--    <ccm:application name="ccm-ldn-exporter"/>                    -->
 <!--    <ccm:application name="ccm-ldn-freeform"/>                    -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                    -->
-<!--    <ccm:application name="ccm-ldn-rss"/>                         -->
 
 <!--    <ccm:application name="ccm-portalserver"/>                    -->
 <!--    <ccm:application name="ccm-portlet"/>                         -->
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
index 1058886ba..39afe8c46 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
@@ -1,45 +1,161 @@
+# Demo 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
-waf.kernel.data_permission_check_enabled=false
-waf.dispatcher.default_expiry=3600
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
-waf.pagemap.workspace=portal/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+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=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
-com.arsdigita.cms.hide_templates_tab=true
-com.arsdigita.cms.hide_admin_tabs=true
-com.arsdigita.cms.hide_timezone=true
-com.arsdigita.cms.hide_launch_date=true
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
-com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
-com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=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/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
 
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
-com.arsdigita.london.search.show_sponsored_links=true
+
+# ccm-themedirector application
+themedirector.default_theme_path=themes/static/aplaws
 
 com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
-waf.admin.email=admin@example.com
-waf.admin.name.given=Administrator
-waf.admin.name.family=Account
+; =============================================================================================
+; runtime specific configurations
+
+waf.admin.email=webmaster@example.com
+waf.admin.name.given=Aplaws 
+waf.admin.name.family=Administrator
 waf.admin.password=123456
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-com.arsdigita.aplaws.lite_load=true
+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
+#com.arsdigita.aplaws.lite_load=true
+#waf.debug=true
+#waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index fc21b2b13..5635eddf3 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -10,7 +10,7 @@
                     name="aplaws" 
               prettyName="APLAWS plus Demo Spin"
                  version="1-1-5" 
-                 release="-demo" 
+                 release="demo" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
index a736e61cf..7a45e3f43 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Devel bundle intgegration.properties
+# Devel bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -19,7 +19,7 @@ waf.kernel.primary_user_identifier=email
 waf.kernel.supported_languages=de,en
 
 ; security.properties:
-;waf.auto_registration_on=false
+waf.auto_registration_on=false
 
 # MOVED to ui.Config
 #waf.pagemap.root=portal/
@@ -30,8 +30,8 @@ waf.kernel.supported_languages=de,en
 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.root_page_url=portal/
+core.ui.pagemap.workspace_url=portal/
 core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
 ; workflow configuration
@@ -102,7 +102,12 @@ 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
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+
+# auth-http application
+auth.http.admin_email=webmaster@aplaws.org
+auth.http.admin_identifier=webmaster
 
 
 # Forum application
@@ -111,7 +116,7 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
-;  atoz currently not in use
+;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 # ccm-ldn-navigation application
@@ -122,7 +127,7 @@ com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.Roo
 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
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
@@ -142,7 +147,7 @@ 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.given=Aplaws 
 waf.admin.name.family=Administrator
 waf.admin.password=123456
 waf.admin.password.question=12345
@@ -156,5 +161,6 @@ waf.web.server=localhost\:8080
 
 # =============================================================================================
 # devel specific configurations
-waf.debug=true
-waf.bebop.fancy_xsl_errors=true
+#com.arsdigita.aplaws.lite_load=true
+#waf.debug=true
+#waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 2cafd7d4b..63f0bc81c 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -11,7 +11,7 @@
                     name="aplaws" 
               prettyName="APLAWS plus (devel)"
                  version="1-1-5" 
-                 release="-devel" 
+                 release="devel" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -50,6 +50,7 @@
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
         <ccm:application name="ccm-cms-types-minutes"/>
+        <!-- Currently no known function                     -->
         <ccm:application name="ccm-cms-types-motditem"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
@@ -57,12 +58,14 @@
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
         <ccm:application name="ccm-cms-types-simpleaddress"/>
+        <!-- Currently siteproxy is a prerequisite for ccm-ldn-atoz        -->
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
         <ccm:application name="ccm-core"/>
 
-        <ccm:application name="ccm-docmgr"/>
+  <!--  Currently broken. c.ad.cms....DocLinkInitializer doesn't load
+        <ccm:application name="ccm-docmgr"/>                               -->
         <ccm:application name="ccm-docrepo"/>
         <ccm:application name="ccm-faq"/>
         <ccm:application name="ccm-formbuilder-pdf"/>
@@ -85,8 +88,11 @@
 
         <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portlet"/>
-        <ccm:application name="ccm-portlet-helloworld"/>
+  <!--  Currently broken. 
+        Missing file: ccm-portlet/postgres-create.sql
+        <ccm:application name="ccm-portlet"/>                 -->
+  <!--  Currently ant configure error , depends on ccm-portlet
+        <ccm:application name="ccm-portlet-helloworld"/>      -->
         <ccm:application name="ccm-simplesurvey"/>
         <ccm:application name="ccm-themedirector"/>
         <ccm:application name="ccm-user-preferences"/>
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
index 797a6bd3f..5731241b8 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Complete bundle integration.properties
+# Extended bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -30,8 +30,8 @@ waf.auto_registration_on=false
 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.root_page_url=portal/
+core.ui.pagemap.workspace_url=portal/
 core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
 ; workflow configuration
@@ -122,7 +122,7 @@ com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.Roo
 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
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
@@ -142,13 +142,13 @@ 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.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_url=jdbc\:postgresql\://localhost/ccm-ldnext?user\=ccm&password\=ccm
 waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
@@ -156,5 +156,6 @@ 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-ldn-aplaws/bundles/extended/cfg/project.xml b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
index 2ebb03e4f..42613e78d 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
@@ -8,7 +8,7 @@
                name="aplaws" 
                prettyName="APLAWS plus" 
                version="1-1-5" 
-               release="-extended"
+               release="extended"
                webxml="web.xml-aplaws" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
index a736e61cf..05c4f929e 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
@@ -1,4 +1,4 @@
-# Devel bundle intgegration.properties
+# Standard bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
@@ -19,7 +19,7 @@ waf.kernel.primary_user_identifier=email
 waf.kernel.supported_languages=de,en
 
 ; security.properties:
-;waf.auto_registration_on=false
+waf.auto_registration_on=false
 
 # MOVED to ui.Config
 #waf.pagemap.root=portal/
@@ -30,8 +30,8 @@ waf.kernel.supported_languages=de,en
 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.root_page_url=portal/
+core.ui.pagemap.workspace_url=portal/
 core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
 ; workflow configuration
@@ -102,7 +102,7 @@ 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
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 
 
 # Forum application
@@ -111,7 +111,7 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
-;  atoz currently not in use
+;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 # ccm-ldn-navigation application
@@ -122,7 +122,7 @@ com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.Roo
 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
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
@@ -142,13 +142,13 @@ 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.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_url=jdbc\:postgresql\://localhost/ccm-ldnstd?user\=ccm&password\=ccm
 waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
@@ -156,5 +156,6 @@ waf.web.server=localhost\:8080
 
 # =============================================================================================
 # devel specific configurations
-waf.debug=true
-waf.bebop.fancy_xsl_errors=true
+#com.arsdigita.aplaws.lite_load=true
+#waf.debug=true
+#waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java b/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java
index ea4032a88..68e5e9472 100755
--- a/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java
+++ b/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java
@@ -7,7 +7,7 @@ import java.util.*;
  * Splitter
  *
  * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
- * @version $Id: Splitter.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: Splitter.java 2122 2011-01-13 17:31:49Z pboy $
  **/
 
 public class Splitter {
diff --git a/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load b/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load
index 8fd14b0c0..970fe2d07 100755
--- a/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load
+++ b/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load
@@ -5,10 +5,11 @@
     <initializer class="com.arsdigita.core.Initializer"/>
     <table name="cms_items"/>
     <initializer class="com.arsdigita.cms.Initializer"/>
-    <initializer class="com.arsdigita.london.terms.Initializer"/>
-    <initializer class="com.arsdigita.london.subsite.Initializer"/>
-    <initializer class="com.arsdigita.london.portal.Initializer"/>
+    <initializer class="com.arsdigita.portalworkspace.Initializer"/>
+    <initializer class="com.arsdigita.london.navigation.Initializer"/>
     <initializer class="com.arsdigita.london.search.Initializer"/>
+    <initializer class="com.arsdigita.london.subsite.Initializer"/>
+    <initializer class="com.arsdigita.london.terms.Initializer"/>
   </requires>
   <provides>
   <!--
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java
index 44aec409a..4781919ff 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java
@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
  * Central entry point for the london APLAWS integration and configuration
  * module.
  * Provides just a handle into config file.
- * @version "$Id: Aplaws.java 1297 2006-08-25 18:17:50Z apevec $
+ * @version "$Id: Aplaws.java 2184 2011-06-20 01:00:01Z pboy $
  */
 public class Aplaws {
 
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
index 75150c94b..fd1cd2bcd 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
@@ -28,7 +28,7 @@ import org.apache.log4j.Logger;
  * AplawsConfig
  *
  * @version $Revision: 1.2 $ $Date: 2005/01/07 19:01:40 $
- * @version $Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $
+ * @version $Id: AplawsConfig.java 2184 2011-06-20 01:00:01Z pboy $
  */
 public class AplawsConfig extends AbstractConfig {
 
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java
index bf73f695f..067b73eb6 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java
@@ -31,7 +31,7 @@ import com.arsdigita.templating.PatternStylesheetResolver;
 /**
  * The APLAWS initializer.
  *
- * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
+ * @version $Id: Initializer.java 2212 2011-06-22 08:39:04Z pboy $
  */
 public class Initializer extends CompoundInitializer {
 
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
index d0aea23d1..b1c5e53eb 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -61,7 +61,7 @@ import org.apache.log4j.Logger;
  * configuration files and adds jsp templates to navigation.
  *
  * @author Justin Ross &lt;jross@redhat.com&gt;
- * @version $Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $
+ * @version $Id: Loader.java 2223 2011-08-01 07:33:57Z pboy $
  */
 public class Loader extends PackageLoader {