diff --git a/ccm-gen-aplaws/bundles/staatsschiff/AUTHORS b/ccm-gen-aplaws/bundles/staatsschiff/AUTHORS
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/ChangeLog b/ccm-gen-aplaws/bundles/staatsschiff/ChangeLog
new file mode 100755
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/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-gen-aplaws/bundles/staatsschiff/NEWS b/ccm-gen-aplaws/bundles/staatsschiff/NEWS
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/README b/ccm-gen-aplaws/bundles/staatsschiff/README
new file mode 100755
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/bundle.in b/ccm-gen-aplaws/bundles/staatsschiff/bundle.in
new file mode 100755
index 000000000..ad1200c37
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-devel
+BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
+VERSION=1.0.5devel
+RELEASE=1
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg
new file mode 100755
index 000000000..d605bc4cf
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg
@@ -0,0 +1,46 @@
+# Main apps
+ccm-core
+ccm-cms
+
+# Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-imagestep
+ccm-cms-assets-notes
+ccm-cms-assets-relatedlink
+## -- ccm-ldn-dublin  ist das eigentlich ein asset?
+
+# Content types
+#ccm-cms-types-address
+ccm-cms-types-article
+ccm-cms-types-bookmark
+#ccm-cms-types-contact
+ccm-cms-types-faqitem
+ccm-cms-types-filestorageitem
+ccm-cms-types-formitem
+ccm-cms-types-formsectionitem
+ccm-cms-types-glossaryitem
+ccm-cms-types-image
+#ccm-cms-types-member
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+
+# Applications
+#ccm-docmgr
+#ccm-forum
+#ccm-user-preferences
+
+# LDN extensions
+# ##  ccm-ldn-image-step
+ccm-ldn-navigation
+ccm-ldn-portal
+ccm-ldn-rss
+ccm-ldn-search
+ccm-ldn-shortcuts
+ccm-ldn-subsite
+ccm-ldn-terms
+ccm-ldn-theme
+ccm-ldn-util
+
+# integration layer app
+ccm-gen-aplaws
+
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
new file mode 100755
index 000000000..388e90f5d
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
@@ -0,0 +1,123 @@
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+; dhtml editor to use (system wide)
+; waf.bebop.dhtml_editor=FCKeditor
+waf.bebop.dhtml_editor=Xinha
+waf.bebop.dhtml_editor_src=/assets/xinha/XinhaLoader.js
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=en,de
+
+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
+
+; 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
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=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
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+;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=TableOperations,CSS
+com.arsdigita.cms.dhtml_editor_plugins=
+
+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.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.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
+# ## com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+
+# ## 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 currently not in use
+# ## com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+; 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
+
+com.arsdigita.london.search.show_sponsored_links=true
+
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+com.arsdigita.london.theme.default_theme_context=
+com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
+com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml
+
+# com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+; =============================================================================================
+; devel specific configurations
+waf.mail.default_from=webmaster@staatsschiff.staat.uni-bremen.de
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/staatsschiff?user\=staatsschiff&password\=ccm4cartoons
+waf.runtime.jdbc_pool_size=40
+waf.web.server=localhost\:8080
+
+waf.admin.email=webmaster@staatsschiff.staat.uni-bremen.de
+waf.admin.name.given=CCM 
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345 
+waf.admin.password.answer=6
+
+# com.arsdigita.aplaws.lite_load=true
+# waf.debug=true
+# waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/web.xml b/ccm-gen-aplaws/bundles/staatsschiff/cfg/web.xml
new file mode 100755
index 000000000..8221cf6f2
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/staatsschiff/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/AUTHORS b/ccm-gen-aplaws/bundles/zsr/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/zsr/ChangeLog b/ccm-gen-aplaws/bundles/zsr/ChangeLog
new file mode 100644
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/zsr/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-gen-aplaws/bundles/zsr/NEWS b/ccm-gen-aplaws/bundles/zsr/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/zsr/README b/ccm-gen-aplaws/bundles/zsr/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-gen-aplaws/bundles/zsr/bundle.in b/ccm-gen-aplaws/bundles/zsr/bundle.in
new file mode 100644
index 000000000..ad1200c37
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/zsr/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-devel
+BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
+VERSION=1.0.5devel
+RELEASE=1
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg b/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg
new file mode 100644
index 000000000..e3f891f6c
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg
@@ -0,0 +1,46 @@
+# Main apps
+ccm-core
+ccm-cms
+
+# Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-imagestep
+ccm-cms-assets-notes
+ccm-cms-assets-relatedlink
+## -- ccm-ldn-dublin  ist das eigentlich ein asset?
+
+# Content types
+#ccm-cms-types-address
+ccm-cms-types-article
+#ccm-cms-types-bookmark
+#ccm-cms-types-contact
+#ccm-cms-types-faqitem
+ccm-cms-types-filestorageitem
+ccm-cms-types-formitem
+ccm-cms-types-formsectionitem
+#ccm-cms-types-glossaryitem
+#ccm-cms-types-image
+#ccm-cms-types-member
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+
+# Applications
+#ccm-docmgr
+#ccm-forum
+#ccm-user-preferences
+
+# LDN extensions
+# ##  ccm-ldn-image-step
+ccm-ldn-navigation
+ccm-ldn-portal
+#ccm-ldn-rss
+ccm-ldn-search
+ccm-ldn-shortcuts
+ccm-ldn-subsite
+ccm-ldn-terms
+ccm-ldn-theme
+ccm-ldn-util
+
+# integration layer app
+ccm-gen-aplaws
+
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
new file mode 100644
index 000000000..0bc0b5b96
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
@@ -0,0 +1,123 @@
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+; dhtml editor to use (system wide)
+; waf.bebop.dhtml_editor=FCKeditor
+waf.bebop.dhtml_editor=Xinha
+waf.bebop.dhtml_editor_src=/assets/xinha/XinhaLoader.js
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=en,de
+
+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
+
+; 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
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=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
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+;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=TableOperations,CSS
+com.arsdigita.cms.dhtml_editor_plugins=
+
+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.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.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
+# ## com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+
+# ## 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 currently not in use
+# ## com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+; 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
+
+com.arsdigita.london.search.show_sponsored_links=true
+
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+com.arsdigita.london.theme.default_theme_context=
+com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
+com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml
+
+# com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+; =============================================================================================
+; devel specific configurations
+waf.mail.default_from=webmaster@z-sozialreform.de
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zsr?user\=zsr&password\=zsr48web
+waf.runtime.jdbc_pool_size=40
+waf.web.server=localhost\:8080
+
+waf.admin.email=webmaster@z-sozialreform.de
+waf.admin.name.given=ZSR
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345 
+waf.admin.password.answer=6
+
+# com.arsdigita.aplaws.lite_load=true
+# waf.debug=true
+# waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/web.xml b/ccm-gen-aplaws/bundles/zsr/cfg/web.xml
new file mode 100644
index 000000000..8221cf6f2
--- /dev/null
+++ b/ccm-gen-aplaws/bundles/zsr/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/src/WEB-INF/aplaws/gen-nav-domain-1.00.xml b/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-domain-1.00.xml
index 807f2a10d..5da95d307 100755
--- a/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-domain-1.00.xml
+++ b/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-domain-1.00.xml
@@ -10,21 +10,21 @@
 
 <terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
               about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
-              key="GEN-NAV" 
-              title="Generic Navigation List Example" 
+              key="DEF-NAV"
+              title="Default Navigation"
               version="1.00" released="2005-10-01">
 
-  <terms:term id="1000" name="Category 1" inAtoZ="false"/>
-    <terms:term id="1200" name="Category 1.1" inAtoZ="false"/>
-    <terms:term id="1400" name="Category 1.2" inAtoZ="false"/>
+  <terms:term id="10000" name="Category 1" inAtoZ="false"/>
+    <terms:term id="12000" name="Category 1.1" inAtoZ="false"/>
+    <terms:term id="14000" name="Category 1.2" inAtoZ="false"/>
   
-  <terms:term id="3000" name="Category 2" inAtoZ="false"/>
-    <terms:term id="3200" name="Category 2.1" inAtoZ="false"/>
-    <terms:term id="3400" name="Category 2.2" inAtoZ="false"/>
+  <terms:term id="30000" name="Category 2" inAtoZ="false"/>
+    <terms:term id="32000" name="Category 2.1" inAtoZ="false"/>
+    <terms:term id="34000" name="Category 2.2" inAtoZ="false"/>
   
-  <terms:term id="5000" name="Category 3" inAtoZ="false"/>
-    <terms:term id="5200" name="Category 3.1" inAtoZ="false"/>
-    <terms:term id="5400" name="Category 3.2" inAtoZ="false"/>
+  <terms:term id="50000" name="Category 3" inAtoZ="false"/>
+    <terms:term id="52000" name="Category 3.1" inAtoZ="false"/>
+    <terms:term id="54000" name="Category 3.2" inAtoZ="false"/>
 
 </terms:domain>
 
diff --git a/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-hierarchy-1.00.xml b/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-hierarchy-1.00.xml
index 827db0004..4f739a2fb 100755
--- a/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-hierarchy-1.00.xml
+++ b/ccm-gen-aplaws/src/WEB-INF/aplaws/gen-nav-hierarchy-1.00.xml
@@ -10,63 +10,63 @@
 <terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
   <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
   <!-- set root terms  -->
-  <terms:term id="1000"/>
-  <terms:term id="3000"/>
-  <terms:term id="5000"/>
+  <terms:term id="10000"/>
+  <terms:term id="30000"/>
+  <terms:term id="50000"/>
   
   <terms:orderedPair>
     <!-- narrower terms, first level  -->  
     <terms:source>
-      <terms:term id="1000"/>
+      <terms:term id="10000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1200"/>
+      <terms:term id="12000"/>
     </terms:destination>
   </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="1000"/>
+      <terms:term id="10000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1400"/>
+      <terms:term id="14000"/>
     </terms:destination>
   </terms:orderedPair>
 
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3000"/>
+      <terms:term id="30000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3200"/>
+      <terms:term id="32000"/>
     </terms:destination>
   </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3000"/>
+      <terms:term id="30000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3400"/>
+      <terms:term id="34000"/>
     </terms:destination>
   </terms:orderedPair>
 
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="5000"/>
+      <terms:term id="50000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
+      <terms:term id="52000"/>
     </terms:destination>
   </terms:orderedPair>
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="5000"/>
+      <terms:term id="50000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5400"/>
+      <terms:term id="54000"/>
     </terms:destination>
   </terms:orderedPair>
   
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
index c9899d2d9..a2b608301 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -91,13 +91,13 @@ public class Loader extends PackageLoader {
         m_navigationDomain = new StringParameter(
             "com.arsdigita.aplaws.navigation_domain",
             Parameter.REQUIRED,
-            "GEN-NAV");
+            "DEF-NAV");
         // Registers to the context by adding the parameter to a map of parameters
         register(m_navigationDomain);
 
         /*
          * You may add more catagory domains by adding resources
-         * according the followin schema
+         * according the following schema
          */
        
         /* currently not used
diff --git a/environment/project.xml.staatsschiff b/environment/project.xml.staatsschiff
new file mode 100644
index 000000000..98d2f990b
--- /dev/null
+++ b/environment/project.xml.staatsschiff
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--    project.xml -Oxford Handbook - 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-staatsschiff" 
+              prettyName="APLAWS plus" 
+                 version="1-1-1" 
+                 release="753" 
+                  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-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"/>                        -->
+
+<!--  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"/>
+
+
+<!--  gen integration layer  -->
+<!--  - - - - - - -  -->
+        <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>
+</ccm:project>
diff --git a/environment/project.xml.zes b/environment/project.xml.zes
index 824c41d25..ea09b4843 100644
--- a/environment/project.xml.zes
+++ b/environment/project.xml.zes
@@ -8,7 +8,7 @@
                     name="aplaws-zes" 
               prettyName="APLAWS plus" 
                  version="1-1-1" 
-                 release="beta-3" 
+                 release="rc1-697" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/environment/project.xml.zsr b/environment/project.xml.zsr
new file mode 100644
index 000000000..3cf0307b1
--- /dev/null
+++ b/environment/project.xml.zsr
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--    project.xml -Oxford Handbook - 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-zsr" 
+              prettyName="APLAWS plus" 
+                 version="1-1-1" 
+                 release="754" 
+                  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-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"/>                        -->
+
+<!--  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-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"/>
+
+
+<!--  gen integration layer  -->
+<!--  - - - - - - -  -->
+        <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>
+</ccm:project>