diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
index 5f6f0fc6f..099de0aa9 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
@@ -34,6 +34,7 @@ ccm-cms-types-formsectionitem
ccm-cms-types-member
# -- ccm-cms-types-minutes
# -- ccm-cms-types-motditem
+
ccm-cms-types-mparticle
ccm-cms-types-newsitem
# -- ccm-cms-types-organization
@@ -79,7 +80,7 @@ ccm-ldn-util
# sci extensions
# --------------
-ccm-sci-publications
+#ccm-sci-publications
# integration layer
ccm-zes-aplaws
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg
new file mode 100644
index 000000000..041e49a26
--- /dev/null
+++ b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg
@@ -0,0 +1,86 @@
+# Main apps
+ccm-core
+ccm-cms
+
+# Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-imagestep
+ccm-cms-assets-notes
+ccm-cms-assets-relatedlink
+
+# Content types
+ccm-cms-types-address
+# -- ccm-cms-types-agenda
+ccm-cms-types-article
+ccm-cms-types-bookmark
+ccm-cms-types-contact
+# -- ccm-cms-types-esdservice
+ccm-cms-types-event
+# -- faqitem koennte bei zes auch entfallen
+# 2008-06-07 auskommentiert, ist in Produktionssystem
+# nicht enthalten und nicht anwählbar.
+# -- ccm-cms-types-faqitem
+ccm-cms-types-filestorageitem
+ccm-cms-types-formitem
+ccm-cms-types-formsectionitem
+# -- glossaryitem koennte bei zes auch entfallen
+# 2008-06-07 auskommentiert, ist in Produktionssystem
+# nicht enthalten und nicht anwählbar.
+# -- ccm-cms-types-glossaryitem
+# -- ccm-cms-types-htmlform
+# -- ccm-cms-types-inlinesite
+# -- ccm-cms-types-job
+# -- ccm-cms-types-legalnotice
+# -- ccm-cms-types-member
+# -- ccm-cms-types-minutes
+# -- ccm-cms-types-motditem
+
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+# -- ccm-cms-types-organization
+# -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-researchnetwork
+# -- ccm-cms-types-service
+ccm-cms-types-siteproxy
+# -- xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
+ccm-cms-types-xmlfeed
+
+ccm-sci-types-organization
+
+# Applications
+# ------------
+# -- ccm-auth-http
+# -- ccm-bookmarks
+# -- ccm-docmngr
+# -- ccm-formbuilder-pdf
+ccm-forum
+ccm-simplesurvey
+ccm-user-preferences
+# -- ccm-weblog
+# -- ccm-webpage
+
+# ldn extensions
+# --------------
+# -- ccm-ldn-aplaws
+# -- ccm-ldn-atoz
+# -- ccm-ldn-dublin
+ccm-ldn-exporter
+# -- ccm-ldn-freeform
+ccm-ldn-importer
+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
+
+# sci extensions
+# --------------
+# -- ccm-sci-publications
+
+
+# integration layer
+ccm-zes-aplaws
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties
new file mode 100644
index 000000000..e1de8747f
--- /dev/null
+++ b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties
@@ -0,0 +1,112 @@
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+; dhtml editor to use (system wide)
+;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
+
+; security.properties:
+waf.auto_registration_on=false
+waf.pagemap.root=navigation/
+waf.pagemap.workspace=navigation/
+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
+
+; 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_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.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.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/zes-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-ldn-theme.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
+
+
+; =============================================================================================
+; devel specific configurations
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes?user\=zes&password\=zes
+waf.runtime.jdbc_pool_size=80
+
+waf.web.server=localhost\:8080
+
+waf.admin.email=webmaster@zes.uni-bremen.de
+waf.admin.name.given=ZeS
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+;waf.debug=true
+;waf.bebop.fancy_xsl_errors=true
+
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/web.xml b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
new file mode 100644
index 000000000..2e0b80c57
--- /dev/null
+++ b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
@@ -0,0 +1,558 @@
+
+
+
+
+ CCM ZeS
+ Content and Collaboration Management
+
+
+
+ log4j-conf-file
+ WEB-INF/conf/log4j.properties
+
+
+
+
+
+
+
+ shortcuts
+ com.arsdigita.london.shortcuts.ShortcutFilter
+
+
+
+ subsite
+ com.arsdigita.london.subsite.SubsiteFilter
+
+
+
+
+
+ subsite
+ /*
+
+
+
+ shortcuts
+ /*
+
+
+
+
+ com.arsdigita.web.CCMApplicationContextListener
+
+
+
+
+
+ reg
+ com.arsdigita.web.ContextRegistrationServlet
+
+ uri
+ /
+
+ 1
+
+
+
+ legacy-dispatcher
+ com.arsdigita.sitenode.SiteNodeDispatcher
+ 3
+
+
+
+ ccm-dispatcher
+ com.arsdigita.web.DispatcherServlet
+
+ fallback-servlet
+ legacy-dispatcher
+
+ 2
+
+
+
+ legacy-adapter
+ com.arsdigita.web.LegacyAdapterServlet
+
+
+
+ cache-manager
+ com.arsdigita.caching.CacheServlet
+
+
+
+ db-test
+ com.arsdigita.web.monitoring.DBTestServlet
+
+
+
+ versioning-log
+ com.arsdigita.versioning.VersioningServlet
+
+
+
+ oid-redirect
+ com.arsdigita.web.OIDRedirectServlet
+
+
+
+ resource-resolver
+ com.arsdigita.web.ResourceServlet
+
+
+
+
+
+ content-section
+ com.arsdigita.cms.ContentSectionServlet
+
+
+
+ content-type-xsl
+ com.arsdigita.cms.dispatcher.ContentTypeXSLServlet
+
+
+
+ content-item-xsl
+ com.arsdigita.cms.dispatcher.ContentItemXSLServlet
+
+
+
+ template-xsl
+ com.arsdigita.cms.dispatcher.TemplateXSLServlet
+
+
+
+ TextOnlyServlet
+ Text Only Servlet
+
+ com.arsdigita.web.InternalPrefixerServlet
+
+
+ prefix
+ /text
+
+
+
+
+ PrintFriendlyServlet
+ Printer Friendly Output Servlet
+
+ com.arsdigita.web.InternalPrefixerServlet
+
+
+ prefix
+ /print
+
+
+
+
+
+
+
+
+
+ forum-main
+ com.arsdigita.forum.ForumServlet
+
+
+
+
+ portal-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-portal
+
+
+
+
+ navigation-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-navigation
+
+
+ file-resolver
+ com.arsdigita.london.navigation.NavigationFileResolver
+
+
+
+
+ portlet-type-xsl
+ com.arsdigita.dispatcher.PortletTypeXSLServlet
+
+
+
+
+ rss-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-rss
+
+
+ file-resolver
+ com.arsdigita.london.rss.RSSFileResolver
+
+
+
+
+
+
+ worker
+ com.arsdigita.london.search.SearchWorkerServlet
+ 4
+
+
+
+ search-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-search
+
+
+
+
+ AxisServlet
+ Apache-Axis Servlet
+
+ org.apache.axis.transport.http.AxisServlet
+
+
+
+
+
+
+ shortcuts-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-shortcuts
+
+
+
+
+
+ subsite-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-subsite
+
+
+
+
+
+
+ terms-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-terms
+
+
+
+
+
+
+ theme-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-theme
+
+
+
+
+ ThemeDownload
+ com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet
+
+
+
+ ThemePreviewServlet
+ Servlet to allow admins to preview look/feel
+
+ com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+
+
+ prefix
+ /theme
+
+
+
+
+
+
+
+
+
+
+ forum-main
+ /forum-main/main/*
+
+
+
+
+ portlet-type-xsl
+ /__ccm__/servlet/portlet-type/*
+
+
+
+ portal-files
+ /ccm-ldn-portal/files/*
+
+
+
+ navigation-files
+ /ccm-ldn-navigation/files/*
+
+
+
+
+ rss-files
+ /ccm-ldn-rss/files/*
+
+
+
+
+ search-files
+ /ccm-ldn-search/files/*
+
+
+
+ AxisServlet
+ /services/*
+
+
+
+
+
+ shortcuts-files
+ /ccm-ldn-shortcuts/files/*
+
+
+
+
+ subsite-files
+ /ccm-ldn-subsite/files/*
+
+
+
+
+
+ terms-files
+ /ccm-ldn-terms/files/*
+
+
+
+
+
+ theme-files
+ /theme-files/*
+
+
+
+ ThemeDownload
+ /theme-files/download/*
+
+
+
+ ThemePreviewServlet
+ /theme/*
+
+
+
+
+
+
+
+ reg
+ /__ccm__/null/reg/*
+
+
+
+ ccm-dispatcher
+ /ccm/*
+
+
+
+ legacy-adapter
+ /__ccm__/servlet/legacy-adapter/*
+
+
+
+ cache-manager
+ /expireCache/*
+
+
+
+ db-test
+ /dbtest
+
+
+
+ versioning-log
+ /versioning/*
+
+
+
+ oid-redirect
+ /redirect/*
+
+
+
+ resource-resolver
+ /resource/*
+
+
+
+
+
+ content-section
+ /__ccm__/servlet/content-section/*
+
+
+
+ content-item-xsl
+ /__ccm__/servlet/content-item/*
+
+
+
+ content-type-xsl
+ /__ccm__/servlet/content-type/*
+
+
+
+ template-xsl
+ /__ccm__/servlet/template/*
+
+
+
+ TextOnlyServlet
+ /text/*
+
+
+
+ PrintFriendlyServlet
+ /print/*
+
+
+
+
+
+ com.arsdigita.dispatcher.AccessDeniedException
+ /error/access-denied.jsp
+
+
+
+ com.arsdigita.dispatcher.ObjectNotFoundException
+ /error/object-not-found.jsp
+
+
+
+ com.arsdigita.kernel.permissions.PermissionException
+ /error/permission-denied.jsp
+
+
+
+ com.arsdigita.persistence.DbNotAvailableException
+ /error/db-not-available.jsp
+
+
+
+ com.arsdigita.db.DbNotAvailableException
+ /error/db-not-available.jsp
+
+
+
+ java.lang.Exception
+ /error/general.jsp
+
+
+
+ java.lang.Error
+ /error/general.jsp
+
+
+
+
+
+ /WEB-INF/bebop-show.tld
+ /WEB-INF/bebop-show.tld
+
+
+
+ /WEB-INF/bebop-define.tld
+ /WEB-INF/bebop-define.tld
+
+
+
diff --git a/environment/project.xml.zes b/environment/project.xml.zes
index 286ae08f9..6c50cb021 100644
--- a/environment/project.xml.zes
+++ b/environment/project.xml.zes
@@ -50,7 +50,7 @@
-
+
@@ -86,9 +86,9 @@
-
+
-
+
@@ -102,7 +102,7 @@
-
+