diff --git a/ccm-shp-aplaws/bundles/devel/cfg/integration.properties b/ccm-shp-aplaws/bundles/devel/cfg/integration.properties
index f22fdd8b5..24c95f15b 100755
--- a/ccm-shp-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-shp-aplaws/bundles/devel/cfg/integration.properties
@@ -1,11 +1,22 @@
; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
-waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+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.kernel.primary_user_identifier=email
+; wenn man screen_name aktiviert, klappt loader des Forums nicht.
+; waf.kernel.primary_user_identifier=screen_name
+waf.auto_registration_on=false
waf.dispatcher.default_expiry=3600
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.pagemap.root=navigation/
waf.pagemap.workspace=navigation/
waf.pagemap.login_redirect=content/content-center-redirect.jsp
@@ -14,36 +25,66 @@ 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=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
+; 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.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=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.contenttypes.mparticle.template=resource:WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+; shp nutzt kein siteproxy
+; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
; atoz currently not in use
; com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/shp
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
+com.arsdigita.london.navigation.category_menu_show_grand_children_min=2
+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=4
+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/shp-default.jsp
+
com.arsdigita.london.search.show_sponsored_links=true
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccmtrunk?user\=ccm&password\=ccm
-waf.web.server=localhost\:9002
+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-theme.web.mf
+com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp xml
+
+
+
+; =============================================================================================
+; devel specific configurations
+waf.mail.default_from=webmaster@schaedel-hirnpatienten.de
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/shp?user\=shp&password\=shp48web
+waf.runtime.jdbc_pool_size=80
+waf.web.server=localhost\:9000
waf.admin.email=webmaster@schaedel-hirnpatienten.de
waf.admin.name.given=SHP
@@ -52,6 +93,6 @@ waf.admin.password=nge2015
waf.admin.password.question=12345
waf.admin.password.answer=6
-waf.debug=true
-waf.bebop.fancy_xsl_errors=true
+; waf.debug=true
+; waf.bebop.fancy_xsl_errors=true
diff --git a/ccm-shp-aplaws/bundles/devel/cfg/web.xml b/ccm-shp-aplaws/bundles/devel/cfg/web.xml
index 26713559c..17f2c00ca 100755
--- a/ccm-shp-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-shp-aplaws/bundles/devel/cfg/web.xml
@@ -16,10 +16,13 @@
-->
+
shortcuts
@@ -31,17 +34,17 @@
com.arsdigita.london.subsite.SubsiteFilter
-
profiler
/*
+-->
subsite
@@ -179,8 +182,8 @@
MODULES SERVLET DECLARATIONS SECTION
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-
portal-files
com.arsdigita.web.ApplicationFileServlet
@@ -331,8 +332,8 @@
MODULES SERVLET MAPPINGS SECTION
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
diff --git a/ccm-shp-aplaws/bundles/standard/cfg/applications.cfg b/ccm-shp-aplaws/bundles/standard/cfg/applications.cfg
deleted file mode 100755
index 93d9a7f7e..000000000
--- a/ccm-shp-aplaws/bundles/standard/cfg/applications.cfg
+++ /dev/null
@@ -1,73 +0,0 @@
-# Main apps
-ccm-core
-ccm-cms
-
-# Content assets
-ccm-cms-assets-fileattachment
-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
-ccm-cms-types-faqitem
-ccm-cms-types-filestorageitem
-ccm-cms-types-formitem
-ccm-cms-types-formsectionitem
-ccm-cms-types-glossaryitem
-# -- ccm-cms-types-htmlform
-# -- ccm-cms-types-inlinesite
-# -- ccm-cms-types-job
-# -- ccm-cms-types-legalnotice
-# -- 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-service
-# -- ccm-cms-types-siteproxy
-
-
-# Applications
-# ------------
-# -- ccm-auth-http
-# -- ccm-bookmarks
-# -- ccm-docmngr ## temp., produces errors in build
-# -- 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-image-step
-# -- 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
-# ccm-ldn-xmlfeed
-
-# shp extensions
-ccm-shp-aplaws
-
-
-
diff --git a/ccm-shp-aplaws/bundles/standard/cfg/integration.properties b/ccm-shp-aplaws/bundles/standard/cfg/integration.properties
deleted file mode 100755
index e710dd75d..000000000
--- a/ccm-shp-aplaws/bundles/standard/cfg/integration.properties
+++ /dev/null
@@ -1,95 +0,0 @@
-; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
-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.kernel.primary_user_identifier=email
-; wenn man screen_name aktiviert, klappt loader des Forums nicht.
-; waf.kernel.primary_user_identifier=screen_name
-waf.auto_registration_on=false
-waf.dispatcher.default_expiry=3600
-
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-; dhtml editor
-waf.bebop.dhtml_editor=FCKeditor
-
-waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
-
-waf.pagemap.root=navigation/
-waf.pagemap.workspace=navigation/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
-
-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
-
-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.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.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
-com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.mparticle.template=resource:WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-
-com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
-com.arsdigita.cms.contenttypes.event.use_html_date_description=false
-com.arsdigita.cms.contenttypes.event.hide_event_type=true
-com.arsdigita.cms.contenttypes.event.hide_cost=true
-com.arsdigita.cms.contenttypes.event.hide_date_description=false
-com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
-
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-
-; atoz currently not in use
-; com.arsdigita.london.atoz.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-theme.web.mf
-com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp xml
-
-com.arsdigita.london.search.show_sponsored_links=true
-
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_min=2
-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=4
-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/shp-default.jsp
-
-
-; =============================================================================================
-
-waf.mail.default_from=webmaster@schaedel-hirnpatienten.de
-
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/shp?user\=shp&password\=shp48web
-waf.runtime.jdbc_pool_size=80
-waf.web.server=localhost\:9000
-
-waf.admin.email=webmaster@schaedel-hirnpatienten.de
-waf.admin.name.given=SHP
-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-shp-aplaws/bundles/standard/cfg/web.xml b/ccm-shp-aplaws/bundles/standard/cfg/web.xml
deleted file mode 100755
index 97b3894bd..000000000
--- a/ccm-shp-aplaws/bundles/standard/cfg/web.xml
+++ /dev/null
@@ -1,557 +0,0 @@
-
-
-
-
- CCM
- Content and Collaboration Management
-
-
-
-
-
-
- shortcuts
- com.arsdigita.london.shortcuts.ShortcutFilter
-
-
-
- subsite
- com.arsdigita.london.subsite.SubsiteFilter
-
-
-
-
-
- subsite
- /ccm/*
-
-
-
-
- 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/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
index 3d7164374..c5df4d3de 100755
--- a/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
+++ b/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
@@ -12,25 +12,25 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::
# added by Quasimodo
# Theme with single entry point (e.g Mandalay)
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/start.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/start.xsl
# Theme, with optional locale & prefix
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
# Theme, with optional locale
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
# APLAWS default, with locale and prefix
# XXX change ROOT -> ccm-ldn-aplaws
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
# APLAWS default, with locale
# XXX change ROOT -> ccm-ldn-aplaws
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
-http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
+http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
# Global default, from application's own web app
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/admin-index.css b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/admin-index.css
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/admin-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/admin-index.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.css.NotUsedForNow b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.css.NotUsedForNow
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.xsl.NotUsedForNow b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.xsl.NotUsedForNow
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.css.NotUsedForNow b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.css.NotUsedForNow
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow
old mode 100755
new mode 100644
similarity index 89%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow
index e2f6a8ace..bc76dcdc2
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow
@@ -12,27 +12,27 @@
version="1.0">
-
-
-
+
+
+
-
-
-
+
+
+
-
+/>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl
old mode 100755
new mode 100644
similarity index 97%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl
index fbb43497f..693fd7c38
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl
@@ -12,39 +12,39 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/consultations-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/consultations-index.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/content-center-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/content-center-index.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/content-section-admin.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/content-section-admin.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/content-section-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/content-section-index.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/css/main.css b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/css/main.css
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/css/wysiwyg.css b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/css/wysiwyg.css
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
similarity index 89%
rename from ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
rename to ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
index 026e60e21..c53df6013 100644
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
@@ -1,7 +1,7 @@
@@ -35,12 +35,12 @@
-
+