diff --git a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
index 85325b1e961..aa98e6cd622 100644
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
@@ -29,12 +29,13 @@
Records Management
Records Management
Configuration information for the Records Management application.
-
-
-
-
+
+
+
+
+
diff --git a/repository/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml b/repository/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml
index 1bbe80c8926..bce4dfc2196 100644
--- a/repository/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml
@@ -5,16 +5,14 @@
view:childName="app:messages">
+
+
${spaces.messages.description}
space-icon-default
${spaces.messages.title}
${spaces.messages.name}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/customModelsSpace.acp b/repository/src/main/resources/alfresco/bootstrap/customModelsSpace.acp
index f57119b8b39..dffcd603187 100644
Binary files a/repository/src/main/resources/alfresco/bootstrap/customModelsSpace.acp and b/repository/src/main/resources/alfresco/bootstrap/customModelsSpace.acp differ
diff --git a/repository/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml
index 86bc9aeec05..e5095e54cde 100644
--- a/repository/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml
@@ -5,16 +5,14 @@
view:childName="app:webclient_extension">
+
+
${spaces.web.client.extension.description}
space-icon-default
${spaces.web.client.extension.title}
${spaces.web.client.extension.name}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp b/repository/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp
index af60348470c..3da7252e35d 100644
Binary files a/repository/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp and b/repository/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp differ
diff --git a/repository/src/main/resources/alfresco/bootstrap/imapSpaces.acp b/repository/src/main/resources/alfresco/bootstrap/imapSpaces.acp
index 5be874baa43..bdade608a6e 100644
Binary files a/repository/src/main/resources/alfresco/bootstrap/imapSpaces.acp and b/repository/src/main/resources/alfresco/bootstrap/imapSpaces.acp differ
diff --git a/repository/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml
index f558138f3bf..3f634c47e6d 100644
--- a/repository/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml
@@ -4,6 +4,10 @@
xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns="">
+
+
+
+
workspace
SpacesStore
@@ -11,10 +15,6 @@
${spaces.rendition.rendering_actions.name}
${spaces.rendition.rendering_actions.name}
${spaces.rendition.rendering_actions.description}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml
index ec2503afed5..bfc88a7f650 100644
--- a/repository/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml
@@ -4,6 +4,10 @@
xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns="">
+
+
+
+
workspace
SpacesStore
@@ -11,10 +15,6 @@
${spaces.replication.replication_actions.name}
${spaces.replication.replication_actions.name}
${spaces.replication.replication_actions.description}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml b/repository/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml
index b205fdbf7ad..01d679d151f 100644
--- a/repository/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml
@@ -4,16 +4,16 @@
xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns="">
+
+
+
+
workspace
SpacesStore
${spaces.actions.scheduled_actions.name}
${spaces.actions.scheduled_actions.name}
${spaces.actions.scheduled_actions.description}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml b/repository/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml
index f043f98eb15..73f34d02382 100644
--- a/repository/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml
@@ -4,6 +4,10 @@
xmlns:srft="http://www.alfresco.org/model/solrfacet/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns="">
+
+
+
+
false
workspace
@@ -12,10 +16,6 @@
${spaces.solr_facets.root.name}
${spaces.solr_facets.root.name}
${spaces.solr_facets.root.description}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/spaces.xml b/repository/src/main/resources/alfresco/bootstrap/spaces.xml
index cd7d979f3e2..5c92accc3d2 100644
--- a/repository/src/main/resources/alfresco/bootstrap/spaces.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/spaces.xml
@@ -1,75 +1,75 @@
+ xmlns:cm="http://www.alfresco.org/model/content/1.0"
+ xmlns:app="http://www.alfresco.org/model/application/1.0"
+ xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0"
+ xmlns:sys="http://www.alfresco.org/model/system/1.0">
-
-
-
-
- GROUP_EVERYONE
- Consumer
-
-
-
- ${spaces.company_home.name}
- space-icon-default
- ${spaces.company_home.name}
- ${spaces.company_home.description}
-
-
-
-
- GROUP_EVERYONE
- Consumer
-
-
-
- ${spaces.dictionary.name}
- space-icon-default
- ${spaces.dictionary.name}
- ${spaces.dictionary.description}
-
-
-
-
-
-
-
- ${spaces.templates.name}
- space-icon-default
- ${spaces.templates.name}
- ${spaces.templates.description}
-
-
-
-
-
-
-
- ${spaces.templates.content.name}
- space-icon-default
- ${spaces.templates.content.name}
- ${spaces.templates.content.description}
-
-
-
-
-
-
-
- ${spaces.templates.email.name}
- space-icon-default
- ${spaces.templates.email.name}
- ${spaces.templates.email.description}
-
-
-
-
+
+
+
+
+ GROUP_EVERYONE
+ Consumer
+
+
+
+ ${spaces.company_home.name}
+ space-icon-default
+ ${spaces.company_home.name}
+ ${spaces.company_home.description}
+
+
+
+
+ GROUP_EVERYONE
+ Consumer
+
+
+
+ ${spaces.dictionary.name}
+ space-icon-default
+ ${spaces.dictionary.name}
+ ${spaces.dictionary.description}
+
+
+
+
+
+
+
+ ${spaces.templates.name}
+ space-icon-default
+ ${spaces.templates.name}
+ ${spaces.templates.description}
+
+
+
+
+
+
+
+ ${spaces.templates.content.name}
+ space-icon-default
+ ${spaces.templates.content.name}
+ ${spaces.templates.content.description}
+
+
+
+
+
+
+
+ ${spaces.templates.email.name}
+ space-icon-default
+ ${spaces.templates.email.name}
+ ${spaces.templates.email.description}
+
+
+
+
@@ -82,172 +82,152 @@
-
-
-
-
- ${alfresco_user_store.guestusername}
- Consumer
-
-
-
- ${spaces.templates.rss.name}
- space-icon-default
- ${spaces.templates.rss.name}
- ${spaces.templates.rss.description}
-
-
-
-
-
-
-
-
- GROUP_EVERYONE
- Contributor
-
-
-
- ${spaces.savedsearches.name}
- space-icon-default
- ${spaces.savedsearches.name}
- ${spaces.savedsearches.description}
-
-
-
-
-
-
-
- ${spaces.scripts.name}
- space-icon-default
- ${spaces.scripts.name}
- ${spaces.scripts.description}
-
-
-
-
-
-
-
- ${spaces.nodeTemplatesSpace.name}
- space-icon-default
- ${spaces.nodeTemplatesSpace.name}
- ${spaces.nodeTemplatesSpace.description}
-
-
-
-
-
-
-
-
- GROUP_EVERYONE
- Contributor
-
-
-
- ${spaces.smartfoldertemplates.name}
- space-icon-default
- ${spaces.smartfoldertemplates.name}
- ${spaces.smartfoldertemplates.description}
-
-
-
-
-
-
-
-
- GROUP_EVERYONE
- Contributor
-
-
-
- ${spaces.smartdownloads.name}
- space-icon-default
- ${spaces.smartdownloads.name}
- ${spaces.smartdownloads.description}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
${alfresco_user_store.guestusername}
Consumer
-
-
+
+
+
+ ${spaces.templates.rss.name}
+ space-icon-default
+ ${spaces.templates.rss.name}
+ ${spaces.templates.rss.description}
+
+
+
+
+
+
+
+
GROUP_EVERYONE
- Consumer
-
-
-
- ${spaces.guest_home.name}
- space-icon-default
- ${spaces.guest_home.name}
- ${spaces.guest_home.description}
-
-
-
-
-
-
-
- ${spaces.user_homes.name}
- space-icon-default
- ${spaces.user_homes.name}
- ${spaces.user_homes.description}
-
-
-
-
-
-
-
-
+ Contributor
+
+
+
+ ${spaces.savedsearches.name}
+ space-icon-default
+ ${spaces.savedsearches.name}
+ ${spaces.savedsearches.description}
+
+
+
+
+
+
+
+ ${spaces.scripts.name}
+ space-icon-default
+ ${spaces.scripts.name}
+ ${saces.scripts.description}
+
+
+
+
+
+
+
+ ${spaces.nodeTemplatesSpace.name}
+ space-icon-default
+ ${spaces.nodeTemplatesSpace.name}
+ ${spaces.nodeTemplatesSpace.description}
+
+
+
+
+
+
+
+
+ GROUP_EVERYONE
+ Contributor
+
+
+
+ ${spaces.smartfoldertemplates.name}
+ space-icon-default
+ ${spaces.smartfoldertemplates.name}
+ ${spaces.smartfoldertemplates.description}
+
+
+
+
+
+
+
+
GROUP_EVERYONE
Contributor
-
-
-
- ${spaces.shared.name}
- space-icon-default
- ${spaces.shared.title}
- ${spaces.shared.description}
-
-
-
-
-
-
-
- ${spaces.imap_attachments.name}
- space-icon-default
- ${spaces.imap_attachments.name}
- ${spaces.imap_attachments.description}
-
-
-
-
-
-
-
- ${spaces.imap_home.name}
- space-icon-default
- ${spaces.imap_home.name}
- ${spaces.imap_home.description}
-
-
-
-
-
-
-
+
+
+
+ ${spaces.smartdownloads.name}
+ space-icon-default
+ ${spaces.smartdownloads.name}
+ ${spaces.smartdownloads.description}
+
+
+
+
+
+
+
+
+
+
+ ${alfresco_user_store.guestusername}
+ Consumer
+
+
+ GROUP_EVERYONE
+ Consumer
+
+
+
+ ${spaces.guest_home.name}
+ space-icon-default
+ ${spaces.guest_home.name}
+ ${spaces.guest_home.description}
+
+
+
+ ${spaces.user_homes.name}
+ space-icon-default
+ ${spaces.user_homes.name}
+ ${spaces.user_homes.description}
+
+
+
+
+ GROUP_EVERYONE
+ Contributor
+
+
+
+ ${spaces.shared.name}
+ space-icon-default
+ ${spaces.shared.title}
+ ${spaces.shared.description}
+
+
+
+ ${spaces.imap_attachments.name}
+ space-icon-default
+ ${spaces.imap_attachments.name}
+ ${spaces.imap_attachments.description}
+
+
+
+ ${spaces.imap_home.name}
+ space-icon-default
+ ${spaces.imap_home.name}
+ ${spaces.imap_home.description}
+
+
+
diff --git a/repository/src/main/resources/alfresco/bootstrap/transferSpaces.xml b/repository/src/main/resources/alfresco/bootstrap/transferSpaces.xml
index 91bb32d5a75..20f7a5b7352 100644
--- a/repository/src/main/resources/alfresco/bootstrap/transferSpaces.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/transferSpaces.xml
@@ -9,16 +9,14 @@
+
+
${spaces.transfers.description}
space-icon-default
${spaces.transfers.title}
${spaces.transfers.name}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/webScripts.xml b/repository/src/main/resources/alfresco/bootstrap/webScripts.xml
index 8caf21745fb..201598caac5 100644
--- a/repository/src/main/resources/alfresco/bootstrap/webScripts.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/webScripts.xml
@@ -3,16 +3,14 @@
+
+
${webscripts.url_addressable_web_services}
space-icon-default
${webscripts.url_addressable_web_services}
${webscripts.web_scripts}
-
-
-
-
diff --git a/repository/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml b/repository/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml
index 99428ef2ee2..1586d3f24ee 100644
--- a/repository/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml
+++ b/repository/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml
@@ -3,16 +3,14 @@
+
+
${webscriptsextentions.customized_web_scripts}
space-icon-default
${webscriptsextentions.url_addressable_web_service_extensions}
${webscriptsextentions.web_scripts_extensions}
-
-
-
-