diff --git a/config/alfresco-global.properties.sample b/config/alfresco-global.properties.sample
index d1102e165d..2f1f41f56f 100644
--- a/config/alfresco-global.properties.sample
+++ b/config/alfresco-global.properties.sample
@@ -159,8 +159,8 @@ alfresco.rmi.services.host=0.0.0.0
#Smart Folders Config Properties
smart.folders.enabled=true
-smart.folders.model=alfresco/model/virtualization-model.xml
-smart.folders.model.labels=alfresco/messages/virtualization-model
+smart.folders.model=alfresco/model/smartfolder-model.xml
+smart.folders.model.labels=alfresco/messages/smartfolder-model
#Smart reference config
@@ -181,22 +181,22 @@ smart.folders.model.labels=alfresco/messages/virtualization-model
#System virtualization method config
#System virtualization method aspect.
-#smart.folders.config.system.aspect=vm:system-virtualization
+#smart.folders.config.system.aspect=sf:systemConfigSmartFolder
#System virtualization method aspect defined template location property.
-#smart.folders.config.system.aspect.template.location.property=vm:system-template-location
+#smart.folders.config.system.aspect.template.location.property=sf:system-template-location
#Classpath to be explored for *.json entries defining system templates.
#smart.folders.config.system.templates.classpath=/org/alfresco/repo/virtual/node
#A company home relative name or qname path location of repository system templates.
#smart.folders.config.system.templates.path=${spaces.dictionary.childname}/${spaces.smartfolders.childname}
#Content sub type of repository system templates.
-#smart.folders.config.system.templates.template.type=vm:virtualFolderTemplate
+#smart.folders.config.system.templates.template.type=sf:smartFolderTemplate
#Custom virtualization method config
#Custom virtualization method aspect.
-#smart.folders.config.custom.aspect=vm:custom-virtualization
+#smart.folders.config.custom.aspect=sf:customConfigSmartFolder
#Custom virtualization method aspect template content association.
-#smart.folders.config.custom.aspect.template.association=vm:custom-template-association
+#smart.folders.config.custom.aspect.template.association=sf:custom-template-association
#Type virtualization method config
diff --git a/config/alfresco/application-context-highlevel.xml b/config/alfresco/application-context-highlevel.xml
index 3266e15c37..6658d19a0d 100644
--- a/config/alfresco/application-context-highlevel.xml
+++ b/config/alfresco/application-context-highlevel.xml
@@ -40,5 +40,5 @@
-
+
diff --git a/config/alfresco/bootstrap/example_smartfoldertemplates.acp b/config/alfresco/bootstrap/example_smartfoldertemplates.acp
index 4cd9d10524..ddf72186de 100644
Binary files a/config/alfresco/bootstrap/example_smartfoldertemplates.acp and b/config/alfresco/bootstrap/example_smartfoldertemplates.acp differ
diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
index cca8733d2d..c1faaec15f 100644
--- a/config/alfresco/bootstrap/spaces.xml
+++ b/config/alfresco/bootstrap/spaces.xml
@@ -116,10 +116,10 @@
- ${spaces.virtualfoldertemplates.name}
+ ${spaces.smartfoldertemplates.name}
space-icon-default
- ${spaces.virtualfoldertemplates.name}
- ${spaces.virtualfoldertemplates.description}
+ ${spaces.smartfoldertemplates.name}
+ ${spaces.smartfoldertemplates.description}
@@ -129,10 +129,10 @@
- ${spaces.virtualdownloads.name}
+ ${spaces.smartdownloads.name}
space-icon-default
- ${spaces.virtualdownloads.name}
- ${spaces.virtualdownloads.description}
+ ${spaces.smartdownloads.name}
+ ${spaces.smartdownloads.description}
diff --git a/config/alfresco/messages/bootstrap-spaces.properties b/config/alfresco/messages/bootstrap-spaces.properties
index 4aa4485342..ae9670131a 100644
--- a/config/alfresco/messages/bootstrap-spaces.properties
+++ b/config/alfresco/messages/bootstrap-spaces.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Folder to store shared stuff
spaces.solr_facets.root.name=Solr Facets Space
spaces.solr_facets.root.description=Root folder for the Solr Facet properties
-spaces.virtualfoldertemplates.name=Smart Folder Templates
-spaces.virtualfoldertemplates.description=Smart Folder Templates
+spaces.smartfoldertemplates.name=Smart Folder Templates
+spaces.smartfoldertemplates.description=Smart Folder Templates
-spaces.virtualdownloads.name=Smart Folder Downloads
-spaces.virtualdownloads.description=Smart Folder downloads temporary association data
+spaces.smartdownloads.name=Smart Folder Downloads
+spaces.smartdownloads.description=Smart Folder downloads temporary association data
diff --git a/config/alfresco/messages/bootstrap-spaces_de.properties b/config/alfresco/messages/bootstrap-spaces_de.properties
index fe9de0cc95..d50dcd3353 100755
--- a/config/alfresco/messages/bootstrap-spaces_de.properties
+++ b/config/alfresco/messages/bootstrap-spaces_de.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Ordner zum Speichern freigegebener Elemente
spaces.solr_facets.root.name=Solr Facets-Arbeitsbereich
spaces.solr_facets.root.description=Root-Ordner f\u00fcr die Solr Facet-Eigenschaften
-spaces.virtualfoldertemplates.name=Vorlagen f\u00fcr Smart-Ordner
-spaces.virtualfoldertemplates.description=Vorlagen f\u00fcr Smart-Ordner
+spaces.smartfoldertemplates.name=Vorlagen f\u00fcr Smart-Ordner
+spaces.smartfoldertemplates.description=Vorlagen f\u00fcr Smart-Ordner
-spaces.virtualdownloads.name=Smart-Ordner-Downloads
-spaces.virtualdownloads.description=Tempor\u00e4re Verkn\u00fcpfungsdaten f\u00fcr Smart-Ordner-Downloads
\ No newline at end of file
+spaces.smartdownloads.name=Smart-Ordner-Downloads
+spaces.smartdownloads.description=Tempor\u00e4re Verkn\u00fcpfungsdaten f\u00fcr Smart-Ordner-Downloads
\ No newline at end of file
diff --git a/config/alfresco/messages/bootstrap-spaces_es.properties b/config/alfresco/messages/bootstrap-spaces_es.properties
index 6168c04013..99129606c1 100755
--- a/config/alfresco/messages/bootstrap-spaces_es.properties
+++ b/config/alfresco/messages/bootstrap-spaces_es.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Carpeta para almacenar material compartido
spaces.solr_facets.root.name=Espacio de b\u00fasqueda por facetas de Solr
spaces.solr_facets.root.description=Carpeta ra\u00edz para las propiedades de b\u00fasqueda por facetas de Solr
-spaces.virtualfoldertemplates.name=Plantillas de carpetas inteligentes
-spaces.virtualfoldertemplates.description=Plantillas de carpetas inteligentes
+spaces.smartfoldertemplates.name=Plantillas de carpetas inteligentes
+spaces.smartfoldertemplates.description=Plantillas de carpetas inteligentes
-spaces.virtualdownloads.name=Descargas de carpetas inteligentes
-spaces.virtualdownloads.description=Datos de asociaci\u00f3n temporal de descargas de carpetas inteligentes
+spaces.smartdownloads.name=Descargas de carpetas inteligentes
+spaces.smartdownloads.description=Datos de asociaci\u00f3n temporal de descargas de carpetas inteligentes
diff --git a/config/alfresco/messages/bootstrap-spaces_fr.properties b/config/alfresco/messages/bootstrap-spaces_fr.properties
index d3433facd7..91a6588db6 100755
--- a/config/alfresco/messages/bootstrap-spaces_fr.properties
+++ b/config/alfresco/messages/bootstrap-spaces_fr.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Dossier de stockage d'\u00e9l\u00e9ments partag\u00e9s
spaces.solr_facets.root.name=Espace de la recherche \u00e0 facettes Solr
spaces.solr_facets.root.description=Dossier racine des propri\u00e9t\u00e9s de la recherche \u00e0 facettes Solr
-spaces.virtualfoldertemplates.name=Mod\u00e8les de dossiers intelligents
-spaces.virtualfoldertemplates.description=Mod\u00e8les de dossiers intelligents
+spaces.smartfoldertemplates.name=Mod\u00e8les de dossiers intelligents
+spaces.smartfoldertemplates.description=Mod\u00e8les de dossiers intelligents
-spaces.virtualdownloads.name=T\u00e9l\u00e9chargements de dossiers intelligents
-spaces.virtualdownloads.description=Donn\u00e9es d'association temporaire des t\u00e9l\u00e9chargements de dossiers intelligents
\ No newline at end of file
+spaces.smartdownloads.name=T\u00e9l\u00e9chargements de dossiers intelligents
+spaces.smartdownloads.description=Donn\u00e9es d'association temporaire des t\u00e9l\u00e9chargements de dossiers intelligents
\ No newline at end of file
diff --git a/config/alfresco/messages/bootstrap-spaces_it.properties b/config/alfresco/messages/bootstrap-spaces_it.properties
index 79d2402451..67072a8e24 100755
--- a/config/alfresco/messages/bootstrap-spaces_it.properties
+++ b/config/alfresco/messages/bootstrap-spaces_it.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Cartella per l'archiviazione dei contenuti condivisi
spaces.solr_facets.root.name=Spazio di ricerca Solr
spaces.solr_facets.root.description=Cartella radice per le propriet\u00e0 di ricerca con facet di Solr
-spaces.virtualfoldertemplates.name=Modelli di cartella intelligente
-spaces.virtualfoldertemplates.description=Modelli di cartella intelligente
+spaces.smartfoldertemplates.name=Modelli di cartella intelligente
+spaces.smartfoldertemplates.description=Modelli di cartella intelligente
-spaces.virtualdownloads.name=Download di cartelle intelligenti
-spaces.virtualdownloads.description=Dati di associazione temporanei per download di cartelle intelligenti
+spaces.smartdownloads.name=Download di cartelle intelligenti
+spaces.smartdownloads.description=Dati di associazione temporanei per download di cartelle intelligenti
diff --git a/config/alfresco/messages/bootstrap-spaces_ja.properties b/config/alfresco/messages/bootstrap-spaces_ja.properties
index adc3f1ffe1..c57cbc6983 100755
--- a/config/alfresco/messages/bootstrap-spaces_ja.properties
+++ b/config/alfresco/messages/bootstrap-spaces_ja.properties
@@ -187,8 +187,8 @@ spaces.shared.description=\u5171\u6709\u7269\u3092\u683c\u7d0d\u3059\u308b\u30d5
spaces.solr_facets.root.name=Solr \u30d5\u30a1\u30bb\u30c3\u30c8\u691c\u7d22\u7528\u30b9\u30da\u30fc\u30b9
spaces.solr_facets.root.description=Solr \u3067\u306e\u30d5\u30a1\u30bb\u30c3\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3\u691c\u7d22\u7528\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
-spaces.virtualfoldertemplates.name=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
-spaces.virtualfoldertemplates.description=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
+spaces.smartfoldertemplates.name=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
+spaces.smartfoldertemplates.description=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
-spaces.virtualdownloads.name=Smart \u30d5\u30a9\u30eb\u30c0\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
-spaces.virtualdownloads.description=Smart \u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306e\u4e00\u6642\u95a2\u9023\u4ed8\u3051\u30c7\u30fc\u30bf
\ No newline at end of file
+spaces.smartdownloads.name=Smart \u30d5\u30a9\u30eb\u30c0\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
+spaces.smartdownloads.description=Smart \u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306e\u4e00\u6642\u95a2\u9023\u4ed8\u3051\u30c7\u30fc\u30bf
\ No newline at end of file
diff --git a/config/alfresco/messages/bootstrap-spaces_nb.properties b/config/alfresco/messages/bootstrap-spaces_nb.properties
index 1d9a9613bf..346cb8c47f 100755
--- a/config/alfresco/messages/bootstrap-spaces_nb.properties
+++ b/config/alfresco/messages/bootstrap-spaces_nb.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Mappe for \u00e5 lagre delte ting
spaces.solr_facets.root.name=Solr-s\u00f8k p\u00e5 Facets
spaces.solr_facets.root.description=Rotmappe for Solr Facet-egenskaper
-spaces.virtualfoldertemplates.name=Smartmappe Mal
-spaces.virtualfoldertemplates.description=Smartmappe Mal
+spaces.smartfoldertemplates.name=Smartmappe Mal
+spaces.smartfoldertemplates.description=Smartmappe Mal
-spaces.virtualdownloads.name=Smartmappe Nedlastinger
-spaces.virtualdownloads.description=Midlertidig forbundet data ved Smartmappe-nedlastinger
\ No newline at end of file
+spaces.smartdownloads.name=Smartmappe Nedlastinger
+spaces.smartdownloads.description=Midlertidig forbundet data ved Smartmappe-nedlastinger
\ No newline at end of file
diff --git a/config/alfresco/messages/bootstrap-spaces_nl.properties b/config/alfresco/messages/bootstrap-spaces_nl.properties
index a40f0f9831..f48e2ee4f6 100755
--- a/config/alfresco/messages/bootstrap-spaces_nl.properties
+++ b/config/alfresco/messages/bootstrap-spaces_nl.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Map voor het opslaan van gedeelde gegevens
spaces.solr_facets.root.name=Ruimte Solr-zoekopdrachten facetten
spaces.solr_facets.root.description=Hoofdmap voor de eigenschappen van de Solr-zoekopdrachten in facetten
-spaces.virtualfoldertemplates.name=Slimme-mapsjablonen
-spaces.virtualfoldertemplates.description=Slimme-mapsjablonen
+spaces.smartfoldertemplates.name=Slimme-mapsjablonen
+spaces.smartfoldertemplates.description=Slimme-mapsjablonen
-spaces.virtualdownloads.name=Slimme-mapdownloads
-spaces.virtualdownloads.description=Kortdurende koppelingsgegevens slimme-mapdownloads
+spaces.smartdownloads.name=Slimme-mapdownloads
+spaces.smartdownloads.description=Kortdurende koppelingsgegevens slimme-mapdownloads
diff --git a/config/alfresco/messages/bootstrap-spaces_pt_BR.properties b/config/alfresco/messages/bootstrap-spaces_pt_BR.properties
index abb35f5b6f..d33d237ac4 100644
--- a/config/alfresco/messages/bootstrap-spaces_pt_BR.properties
+++ b/config/alfresco/messages/bootstrap-spaces_pt_BR.properties
@@ -187,8 +187,8 @@ spaces.shared.description=Pasta para armazenar material compartilhado
spaces.solr_facets.root.name=Espa\u00e7o de pesquisa em Solr
spaces.solr_facets.root.description=Pasta raiz para as propriedades de pesquisa por facetas em Solr
-spaces.virtualfoldertemplates.name=Modelos de pasta inteligente
-spaces.virtualfoldertemplates.description=Modelos de pasta inteligente
+spaces.smartfoldertemplates.name=Modelos de pasta inteligente
+spaces.smartfoldertemplates.description=Modelos de pasta inteligente
-spaces.virtualdownloads.name=Downloads para pasta inteligente
-spaces.virtualdownloads.description=Dados de associa\u00e7\u00e3o tempor\u00e1ria dos downloads para pasta inteligente
\ No newline at end of file
+spaces.smartdownloads.name=Downloads para pasta inteligente
+spaces.smartdownloads.description=Dados de associa\u00e7\u00e3o tempor\u00e1ria dos downloads para pasta inteligente
\ No newline at end of file
diff --git a/config/alfresco/messages/bootstrap-spaces_ru.properties b/config/alfresco/messages/bootstrap-spaces_ru.properties
index 34dd8ed393..1c884cfed9 100755
--- a/config/alfresco/messages/bootstrap-spaces_ru.properties
+++ b/config/alfresco/messages/bootstrap-spaces_ru.properties
@@ -187,8 +187,8 @@ spaces.shared.description=\u041f\u0430\u043f\u043a\u0430 \u0434\u043b\u044f \u04
spaces.solr_facets.root.name=\u041f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u0430\u0441\u043f\u0435\u043a\u0442\u043e\u0432 Solr
spaces.solr_facets.root.description=\u041a\u043e\u0440\u043d\u0435\u0432\u0430\u044f \u043f\u0430\u043f\u043a\u0430 \u0434\u043b\u044f \u0441\u0432\u043e\u0439\u0441\u0442\u0432 \u0430\u0441\u043f\u0435\u043a\u0442\u043e\u0432 Solr
-spaces.virtualfoldertemplates.name=\u0428\u0430\u0431\u043b\u043e\u043d\u044b \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
-spaces.virtualfoldertemplates.description=\u0428\u0430\u0431\u043b\u043e\u043d\u044b \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
+spaces.smartfoldertemplates.name=\u0428\u0430\u0431\u043b\u043e\u043d\u044b \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
+spaces.smartfoldertemplates.description=\u0428\u0430\u0431\u043b\u043e\u043d\u044b \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
-spaces.virtualdownloads.name=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
-spaces.virtualdownloads.description=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
+spaces.smartdownloads.name=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
+spaces.smartdownloads.description=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
diff --git a/config/alfresco/messages/bootstrap-spaces_zh_CN.properties b/config/alfresco/messages/bootstrap-spaces_zh_CN.properties
index 5bd4a282e5..9668ee7c1a 100755
--- a/config/alfresco/messages/bootstrap-spaces_zh_CN.properties
+++ b/config/alfresco/messages/bootstrap-spaces_zh_CN.properties
@@ -187,8 +187,8 @@ spaces.shared.description=\u5b58\u50a8\u5171\u4eab\u5185\u5bb9\u7684\u6587\u4ef6
spaces.solr_facets.root.name=Solr \u5206\u7ec4\u67e5\u8be2
spaces.solr_facets.root.description=Solr \u5206\u7ec4\u67e5\u8be2\u5c5e\u6027\u7684\u6839\u6587\u4ef6\u5939
-spaces.virtualfoldertemplates.name=\u667a\u80fd\u6587\u4ef6\u5939\u6a21\u677f
-spaces.virtualfoldertemplates.description=\u667a\u80fd\u6587\u4ef6\u5939\u6a21\u677f
+spaces.smartfoldertemplates.name=\u667a\u80fd\u6587\u4ef6\u5939\u6a21\u677f
+spaces.smartfoldertemplates.description=\u667a\u80fd\u6587\u4ef6\u5939\u6a21\u677f
-spaces.virtualdownloads.name=\u667a\u80fd\u6587\u4ef6\u5939\u4e0b\u8f7d
-spaces.virtualdownloads.description=\u667a\u80fd\u6587\u4ef6\u5939\u4e0b\u8f7d\u4e34\u65f6\u76f8\u5173\u6570\u636e
\ No newline at end of file
+spaces.smartdownloads.name=\u667a\u80fd\u6587\u4ef6\u5939\u4e0b\u8f7d
+spaces.smartdownloads.description=\u667a\u80fd\u6587\u4ef6\u5939\u4e0b\u8f7d\u4e34\u65f6\u76f8\u5173\u6570\u636e
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model.properties b/config/alfresco/messages/smartfolder-model.properties
new file mode 100644
index 0000000000..7bbc1b1012
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model.properties
@@ -0,0 +1,30 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Smart Folders Model
+
+sf_smartFolder.type.sf_smartFolderTemplate.title=Smart Folder Template
+sf_smartFolder.type.sf_smartFolderTemplate.description=Smart Folder Template
+
+sf_smartFolder.aspect.sf_smartFolder.title=Smart Folder
+sf_smartFolder.aspect.sf_smartFolder.description=A Smart Folder container node
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Smart Folder Child
+sf_smartFolder.aspect.sf_smartFolderChild.description=A node entry in a Smart Folder container node
+
+sf_smartFolder.aspect.sf_virtualization.title=Container Smart Folder
+sf_smartFolder.aspect.sf_virtualization.description=A container Smart Folder
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Custom Smart Folder
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=A custom Smart Folder
+sf_smartFolder.property.sf_custom-template-association.title=Smart Folder Template
+sf_smartFolder.property.sf_custom-template-association.description=A custom Smart Folder Template association
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=System Smart Folder
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=A system Smart Folder
+sf_smartFolder.property.sf_system-template-location.title=Smart Folder Template
+sf_smartFolder.property.sf_system-template-location.description=A system Smart Folder Template location
+
+sf_smartFolder.type.sf_download.title=Transient Smart Folder Download Aspect
+sf_smartFolder.type.sf_download.description=Transient Smart Folder download container
+
+sf_smartFolder.nullSystemTemplate.message=No system template was found
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_de.properties b/config/alfresco/messages/smartfolder-model_de.properties
new file mode 100644
index 0000000000..1924853003
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_de.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Smart-Ordnermodell
+
+sf_smartFolder.aspect.sf_smartFolder.title=Smart-Ordner
+sf_smartFolder.aspect.sf_smartFolder.description=Ein Container-Node f\u00fcr den Smart-Ordner
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Smart-Dokument
+sf_smartFolder.aspect.sf_smartFolderChild.description=Ein Node-Eintrag in einem Smart-Ordner-Container-Node
+
+sf_smartFolder.aspect.sf_virtualization.title=Container-Smart-Ordner
+sf_smartFolder.aspect.sf_virtualization.description=Ein Container-Smart-Ordner
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Parametrierter Smart-Ordner
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=Ein parametrierter Smart-Ordner
+sf_smartFolder.property.sf_custom-template-association.title=Vorlage f\u00fcr Smart-Ordner
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=System-Smart-Oordner
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=Ein System-Smart-Ordner
+sf_smartFolder.property.sf_system-template-location.title=Vorlage f\u00fcr Smart-Ordner
+
+sf_smartFolder.type.sf_download.title=Tempor\u00e4rer Smart-Ordner-Download-Aspekt
+sf_smartFolder.type.sf_download.description=Tempor\u00e4rer Smart-Ordner-Download-Container
+
+sf_smartFolder.nullSystemTemplate.message=Keine Systemvorlage gefunden
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_es.properties b/config/alfresco/messages/smartfolder-model_es.properties
new file mode 100644
index 0000000000..6de572efbe
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_es.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Modelo de carpetas inteligentes
+
+sf_smartFolder.aspect.sf_smartFolder.title=Carpeta inteligente
+sf_smartFolder.aspect.sf_smartFolder.description=Un nodo de contenedor de carpetas inteligentes
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Documento inteligente
+sf_smartFolder.aspect.sf_smartFolderChild.description=Una entrada de nodo en un nodo de contenedor de carpetas inteligentes
+
+sf_smartFolder.aspect.sf_virtualization.title=Carpeta inteligente de contenedor
+sf_smartFolder.type.sf_virtualization.description=Una carpeta inteligente de contenedor
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Carpeta inteligente personalizada
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=Una carpeta inteligente personalizada
+sf_smartFolder.property.sf_custom-template-association.title=Plantilla de carpeta inteligente
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=Carpeta inteligente del sistema
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=Una carpeta inteligente del sistema
+sf_smartFolder.property.sf_system-template-location.title=Plantilla de carpeta inteligente
+
+sf_smartFolder.type.sf_download.title=Aspecto de descarga transitorio de carpeta inteligente
+sf_smartFolder.type.sf_download.description=Aspecto de descarga transitorio de carpeta inteligente
+
+sf_smartFolder.nullSystemTemplate.message=No se ha encontrado ninguna plantilla del sistema
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_fr.properties b/config/alfresco/messages/smartfolder-model_fr.properties
new file mode 100644
index 0000000000..5999674dd0
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_fr.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Mod\u00e8le de dossiers intelligents
+
+sf_smartFolder.aspect.sf_smartFolder.title=Dossier intelligent
+sf_smartFolder.aspect.sf_smartFolder.description=Un n\u0153ud de contenant de dossier intelligent
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Document intelligent
+sf_smartFolder.aspect.sf_smartFolderChild.description=Une entr\u00e9e de n\u0153ud dans un n\u0153ud de contenant de dossier intelligent
+
+sf_smartFolder.aspect.sf_virtualization.title=Dossier intelligent de contenant
+sf_smartFolder.aspect.sf_virtualization.description=Un dossier intelligent de contenant
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Dossier intelligent personnalis\u00e9
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=Un dossier intelligent personnalis\u00e9
+sf_smartFolder.property.sf_custom-template-association.title=Mod\u00e8le de dossier intelligent
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=Dossier intelligent syst\u00e8me
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=Un dossier intelligent syst\u00e8me
+sf_smartFolder.property.sf_system-template-location.title=Mod\u00e8le de dossier intelligent
+
+sf_smartFolder.type.sf_download.title=Aspect de t\u00e9l\u00e9chargement de dossier intelligent transitoire
+sf_smartFolder.type.sf_download.description=Contenant de t\u00e9l\u00e9chargement de dossier intelligent transitoire
+
+sf_smartFolder.nullSystemTemplate.message=Aucun mod\u00e8le syst\u00e8me trouv\u00e9
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_it.properties b/config/alfresco/messages/smartfolder-model_it.properties
new file mode 100644
index 0000000000..f572fefae0
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_it.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Modello di cartelle intelligenti
+
+sf_smartFolder.aspect.sf_smartFolder.title=Cartella intelligente
+sf_smartFolder.aspect.sf_smartFolder.description=Nodo contenitore di una cartella intelligente
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Documento intelligente
+sf_smartFolder.aspect.sf_smartFolderChild.description=Voce di nodo in un nodo contenitore di una cartella intelligente
+
+sf_smartFolder.aspect.sf_virtualization.title=Cartella intelligente contenitore
+sf_smartFolder.aspect.sf_virtualization.description=Cartella intelligente contenitore
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Cartella intelligente personalizzata
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=Cartella intelligente personalizzata
+sf_smartFolder.property.sf_custom-template-association.title=Modello di cartella intelligente
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=Cartella intelligente di sistema
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=Cartella intelligente di sistema
+sf_smartFolder.property.sf_system-template-location.title=Modello di cartella intelligente
+
+sf_smartFolder.type.sf_download.title=Aspetto transitorio per download di cartelle intelligenti
+sf_smartFolder.type.sf_download.description=Contenitore transitorio per download di cartelle intelligenti
+
+sf_smartFolder.nullSystemTemplate.message=Impossibile trovare il modello di sistema
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_ja.properties b/config/alfresco/messages/smartfolder-model_ja.properties
new file mode 100644
index 0000000000..b9b307f601
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_ja.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Smart \u30d5\u30a9\u30eb\u30c0\u30e2\u30c7\u30eb
+
+sf_smartFolder.aspect.sf_smartFolder.title=Smart \u30d5\u30a9\u30eb\u30c0
+sf_smartFolder.aspect.sf_smartFolder.description=Smart \u30d5\u30a9\u30eb\u30c0\u30b3\u30f3\u30c6\u30ca\u30ce\u30fc\u30c9
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Smart \u6587\u66f8
+sf_smartFolder.aspect.sf_smartFolderChild.description=Smart \u30d5\u30a9\u30eb\u30c0\u30b3\u30f3\u30c6\u30ca\u30ce\u30fc\u30c9\u306b\u5165\u3063\u3066\u3044\u308b\u30ce\u30fc\u30c9
+
+sf_smartFolder.aspect.sf_virtualization.title=\u30b3\u30f3\u30c6\u30ca Smart \u30d5\u30a9\u30eb\u30c0
+sf_smartFolder.aspect.sf_virtualization.description=\u30b3\u30f3\u30c6\u30ca\u306e Smart \u30d5\u30a9\u30eb\u30c0
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=\u30ab\u30b9\u30bf\u30e0 Smart \u30d5\u30a9\u30eb\u30c0
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=\u30ab\u30b9\u30bf\u30e0\u306e Smart \u30d5\u30a9\u30eb\u30c0
+sf_smartFolder.property.sf_custom-template-association.title=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=\u30b7\u30b9\u30c6\u30e0 Smart \u30d5\u30a9\u30eb\u30c0
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=\u30b7\u30b9\u30c6\u30e0\u306e Smart \u30d5\u30a9\u30eb\u30c0
+sf_smartFolder.property.sf_system-template-location.title=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
+
+sf_smartFolder.type.sf_download.title=\u4e00\u6642 Smart \u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30a2\u30b9\u30da\u30af\u30c8
+sf_smartFolder.type.sf_download.description=\u4e00\u6642\u7684\u306a Smart \u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30b3\u30f3\u30c6\u30ca
+
+sf_smartFolder.nullSystemTemplate.message=\u30b7\u30b9\u30c6\u30e0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_nb.properties b/config/alfresco/messages/smartfolder-model_nb.properties
new file mode 100644
index 0000000000..02deab91aa
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_nb.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Smartmapper Modell
+
+sf_smartFolder.aspect.sf_smartFolder.title=Smartmappe
+sf_smartFolder.aspect.sf_smartFolder.description=En Smartmappe inneholder node
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Smart-dokument
+sf_smartFolder.aspect.sf_smartFolderChild.description=En nodeinntasting i en Smart-mappe inneholder node
+
+sf_smartFolder.aspect.sf_virtualization.title=Beholder Smartmappe
+sf_smartFolder.aspect.sf_virtualization.description=En beholder Smartmappe
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Tilpasset Smartmappe
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=En tilpasset Smartmappe
+sf_smartFolder.property.sf_custom-template-association.title=Smartmappe Mal
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=System Smartmappe
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=En system Smartmappe
+sf_smartFolder.property.sf_system-template-location.title=Smartmappe Mal
+
+sf_smartFolder.type.sf_download.title=Imidlertidig aspekt ved Smartmappe-nedlasting
+sf_smartFolder.type.sf_download.description=Imidlertidig beholder ved Smartmappe-nedlasting
+
+sf_smartFolder.nullSystemTemplate.message=Ingen systemmal funnet
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_nl.properties b/config/alfresco/messages/smartfolder-model_nl.properties
new file mode 100644
index 0000000000..98b121ec7e
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_nl.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Slimme-mappenmodel
+
+sf_smartFolder.aspect.sf_smartFolder.title=Slimme map
+sf_smartFolder.aspect.sf_smartFolder.description=Een slimme-mapcontainernode
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Slim document
+sf_smartFolder.aspect.sf_smartFolderChild.description=Een nodevermelding in een slimme-mapcontainernode
+
+sf_smartFolder.aspect.sf_virtualization.title=Slimme-mapcontainer
+sf_smartFolder.aspect.sf_virtualization.description=Een slimme-mapcontainer
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Aangepaste slimme map
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=Een aangepaste slimme map
+sf_smartFolder.property.sf_custom-template-association.title=Slimme-mapsjabloon
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=Slimme map systeem
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=Een slimme map van het systeem
+sf_smartFolder.property.sf_system-template-location.title=Slimme-mapsjabloon
+
+sf_smartFolder.type.sf_download.title=Kortdurend slimme-mapdownloadaspect
+sf_smartFolder.type.sf_download.description=Kortdurende slimme-mapdownloadcontainer
+
+sf_smartFolder.nullSystemTemplate.message=Er is geen systeemsjabloon gevonden
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_pt_BR.properties b/config/alfresco/messages/smartfolder-model_pt_BR.properties
new file mode 100644
index 0000000000..48d604722d
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_pt_BR.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=Modelo de pastas inteligentes
+
+sf_smartFolder.aspect.sf_smartFolder.title=Pasta inteligente
+sf_smartFolder.aspect.sf_smartFolder.description=Um n\u00f3 contentor de pasta inteligente
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=Documento inteligente
+sf_smartFolder.aspect.sf_smartFolderChild.description=Uma entrada de n\u00f3 em um n\u00f3 contentor de pasta inteligente
+
+sf_smartFolder.aspect.sf_virtualization.title=Pasta inteligente do contentor
+sf_smartFolder.aspect.sf_virtualization.description=Uma pasta inteligente do contentor
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=Pasta inteligente personalizada
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=Uma pasta inteligente personalizada
+sf_smartFolder.property.sf_custom-template-association.title=Modelo de pasta inteligente
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=Pasta inteligente do sistema
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=Uma pasta inteligente do sistema
+sf_smartFolder.property.sf_system-template-location.title=Modelo de pasta inteligente
+
+sf_smartFolder.type.sf_download.title=Aspecto de download para pasta inteligente transit\u00f3ria
+sf_smartFolder.type.sf_download.description=Contentor de download para pasta inteligente transit\u00f3ria
+
+sf_smartFolder.nullSystemTemplate.message=Nenhum modelo de sistema foi encontrado
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_ru.properties b/config/alfresco/messages/smartfolder-model_ru.properties
new file mode 100644
index 0000000000..ec844ba2ce
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_ru.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=\u041c\u043e\u0434\u0435\u043b\u044c \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
+
+sf_smartFolder.aspect.sf_smartFolder.title=\u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+sf_smartFolder.aspect.sf_smartFolder.description=\u041e\u0431\u044a\u0435\u043a\u0442-\u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=\u0423\u043c\u043d\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442
+sf_smartFolder.aspect.sf_smartFolderChild.description=\u041e\u0431\u044a\u0435\u043a\u0442 \u0432 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0435 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+
+sf_smartFolder.aspect.sf_virtualization.title=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+sf_smartFolder.aspect.sf_virtualization.description=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+sf_smartFolder.property.sf_custom-template-association.title=\u0428\u0430\u0431\u043b\u043e\u043d \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
+sf_smartFolder.property.sf_system-template-location.title=\u0428\u0430\u0431\u043b\u043e\u043d \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
+
+sf_smartFolder.type.sf_download.title=\u0410\u0441\u043f\u0435\u043a\u0442 \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
+sf_smartFolder.type.sf_download.description=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0439 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
+
+sf_smartFolder.nullSystemTemplate.message=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0448\u0430\u0431\u043b\u043e\u043d \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
\ No newline at end of file
diff --git a/config/alfresco/messages/smartfolder-model_zh_CN.properties b/config/alfresco/messages/smartfolder-model_zh_CN.properties
new file mode 100644
index 0000000000..63d75909d5
--- /dev/null
+++ b/config/alfresco/messages/smartfolder-model_zh_CN.properties
@@ -0,0 +1,25 @@
+# Display labels for the Smart Folders Model
+
+sf_smartFolder.description=\u667a\u80fd\u6587\u4ef6\u5939\u6a21\u578b
+
+sf_smartFolder.aspect.sf_smartFolder.title=\u667a\u80fd\u6587\u4ef6\u5939
+sf_smartFolder.aspect.sf_smartFolder.description=\u667a\u80fd\u6587\u4ef6\u5939\u5bb9\u5668\u8282\u70b9
+
+sf_smartFolder.aspect.sf_smartFolderChild.title=\u667a\u80fd\u6587\u6863
+sf_smartFolder.aspect.sf_smartFolderChild.description=\u4e00\u4e2a\u667a\u80fd\u6587\u4ef6\u5939\u5bb9\u5668\u8282\u70b9\u4e2d\u7684\u8282\u70b9\u6761\u76ee
+
+sf_smartFolder.aspect.sf_virtualization.title=\u5bb9\u5668\u667a\u80fd\u6587\u4ef6\u5939
+sf_smartFolder.aspect.sf_virtualization.description=\u4e00\u4e2a\u5bb9\u5668\u667a\u80fd\u6587\u4ef6\u5939
+
+sf_smartFolder.aspect.sf_customConfigSmartFolder.title=\u81ea\u5b9a\u4e49\u667a\u80fd\u6587\u4ef6
+sf_smartFolder.aspect.sf_customConfigSmartFolder.description=\u4e00\u4e2a\u81ea\u5b9a\u4e49\u667a\u80fd\u6587\u4ef6
+sf_smartFolder.property.sf_custom-template-association.title=\u667a\u80fd\u6587\u4ef6\u6a21\u677f
+
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.title=\u7cfb\u7edf\u667a\u80fd\u6587\u4ef6
+sf_smartFolder.aspect.sf_systemConfigSmartFolder.description=\u4e00\u4e2a\u7cfb\u7edf\u667a\u80fd\u6587\u4ef6
+sf_smartFolder.property.sf_system-template-location.title=\u667a\u80fd\u6587\u4ef6\u6a21\u677f
+
+sf_smartFolder.type.sf_download.title=\u77ac\u95f4\u667a\u80fd\u6587\u4ef6\u4e0b\u8f7d\u5207\u9762
+sf_smartFolder.type.sf_download.description=\u77ac\u95f4\u667a\u80fd\u6587\u4ef6\u4e0b\u8f7d\u5bb9\u5668
+
+sf_smartFolder.nullSystemTemplate.message=\u672a\u53d1\u73b0\u7cfb\u7edf\u6a21\u677f
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model.properties b/config/alfresco/messages/virtualization-model.properties
deleted file mode 100644
index 0dfe6b0e9e..0000000000
--- a/config/alfresco/messages/virtualization-model.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Smart Folders Model
-
-vm_virtualization.type.vm_virtual.title=Smart Folder
-vm_virtualization.type.vm_virtual.description=A Smart Folder container node
-
-vm_virtualization.type.vm_virtual-document.title=Smart Document
-vm_virtualization.type.vm_virtual-document.description=A node entry in a Smart Folder container node
-
-vm_virtualization.type.vm_virtualization.title=Container Smart Folder
-vm_virtualization.type.vm_virtualization.description=A container Smart Folder
-
-vm_virtualization.type.vm_custom-virtualization.title=Custom Smart Folder
-vm_virtualization.type.vm_custom-virtualization.description=A custom Smart Folder
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Smart Folder Template
-
-vm_virtualization.type.vm_system-virtualization.title=System Smart Folder
-vm_virtualization.type.vm_system-virtualization.description=A system Smart Folder
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Smart Folder Template
-
-vm_virtualization.type.vm_download.title=Transient Smart Folder Download Aspect
-vm_virtualization.type.vm_download.description=Transient Smart Folder download container
-
-vm_virtualization.nullSystemTemplate.message=No system template was found
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_de.properties b/config/alfresco/messages/virtualization-model_de.properties
deleted file mode 100644
index d152a8cc0e..0000000000
--- a/config/alfresco/messages/virtualization-model_de.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Smart-Ordnermodell
-
-vm_virtualization.type.vm_virtual.title=Smart-Ordner
-vm_virtualization.type.vm_virtual.description=Ein Container-Node f\u00fcr den Smart-Ordner
-
-vm_virtualization.type.vm_virtual-document.title=Smart-Dokument
-vm_virtualization.type.vm_virtual-document.description=Ein Node-Eintrag in einem Smart-Ordner-Container-Node
-
-vm_virtualization.type.vm_virtualization.title=Container-Smart-Ordner
-vm_virtualization.type.vm_virtualization.description=Ein Container-Smart-Ordner
-
-vm_virtualization.type.vm_custom-virtualization.title=Parametrierter Smart-Ordner
-vm_virtualization.type.vm_custom-virtualization.description=Ein parametrierter Smart-Ordner
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Vorlage f\u00fcr Smart-Ordner
-
-vm_virtualization.type.vm_system-virtualization.title=System-Smart-Oordner
-vm_virtualization.type.vm_system-virtualization.description=Ein System-Smart-Ordner
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Vorlage f\u00fcr Smart-Ordner
-
-vm_virtualization.type.vm_download.title=Tempor\u00e4rer Smart-Ordner-Download-Aspekt
-vm_virtualization.type.vm_download.description=Tempor\u00e4rer Smart-Ordner-Download-Container
-
-vm_virtualization.nullSystemTemplate.message=Keine Systemvorlage gefunden
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_es.properties b/config/alfresco/messages/virtualization-model_es.properties
deleted file mode 100644
index dc4c04bfbb..0000000000
--- a/config/alfresco/messages/virtualization-model_es.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Modelo de carpetas inteligentes
-
-vm_virtualization.type.vm_virtual.title=Carpeta inteligente
-vm_virtualization.type.vm_virtual.description=Un nodo de contenedor de carpetas inteligentes
-
-vm_virtualization.type.vm_virtual-document.title=Documento inteligente
-vm_virtualization.type.vm_virtual-document.description=Una entrada de nodo en un nodo de contenedor de carpetas inteligentes
-
-vm_virtualization.type.vm_virtualization.title=Carpeta inteligente de contenedor
-vm_virtualization.type.vm_virtualization.description=Una carpeta inteligente de contenedor
-
-vm_virtualization.type.vm_custom-virtualization.title=Carpeta inteligente personalizada
-vm_virtualization.type.vm_custom-virtualization.description=Una carpeta inteligente personalizada
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Plantilla de carpeta inteligente
-
-vm_virtualization.type.vm_system-virtualization.title=Carpeta inteligente del sistema
-vm_virtualization.type.vm_system-virtualization.description=Una carpeta inteligente del sistema
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Plantilla de carpeta inteligente
-
-vm_virtualization.type.vm_download.title=Aspecto de descarga transitorio de carpeta inteligente
-vm_virtualization.type.vm_download.description=Aspecto de descarga transitorio de carpeta inteligente
-
-vm_virtualization.nullSystemTemplate.message=No se ha encontrado ninguna plantilla del sistema
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_fr.properties b/config/alfresco/messages/virtualization-model_fr.properties
deleted file mode 100644
index f18fd52818..0000000000
--- a/config/alfresco/messages/virtualization-model_fr.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Mod\u00e8le de dossiers intelligents
-
-vm_virtualization.type.vm_virtual.title=Dossier intelligent
-vm_virtualization.type.vm_virtual.description=Un n\u0153ud de contenant de dossier intelligent
-
-vm_virtualization.type.vm_virtual-document.title=Document intelligent
-vm_virtualization.type.vm_virtual-document.description=Une entr\u00e9e de n\u0153ud dans un n\u0153ud de contenant de dossier intelligent
-
-vm_virtualization.type.vm_virtualization.title=Dossier intelligent de contenant
-vm_virtualization.type.vm_virtualization.description=Un dossier intelligent de contenant
-
-vm_virtualization.type.vm_custom-virtualization.title=Dossier intelligent personnalis\u00e9
-vm_virtualization.type.vm_custom-virtualization.description=Un dossier intelligent personnalis\u00e9
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Mod\u00e8le de dossier intelligent
-
-vm_virtualization.type.vm_system-virtualization.title=Dossier intelligent syst\u00e8me
-vm_virtualization.type.vm_system-virtualization.description=Un dossier intelligent syst\u00e8me
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Mod\u00e8le de dossier intelligent
-
-vm_virtualization.type.vm_download.title=Aspect de t\u00e9l\u00e9chargement de dossier intelligent transitoire
-vm_virtualization.type.vm_download.description=Contenant de t\u00e9l\u00e9chargement de dossier intelligent transitoire
-
-vm_virtualization.nullSystemTemplate.message=Aucun mod\u00e8le syst\u00e8me trouv\u00e9
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_it.properties b/config/alfresco/messages/virtualization-model_it.properties
deleted file mode 100644
index 5cc0cd914b..0000000000
--- a/config/alfresco/messages/virtualization-model_it.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Modello di cartelle intelligenti
-
-vm_virtualization.type.vm_virtual.title=Cartella intelligente
-vm_virtualization.type.vm_virtual.description=Nodo contenitore di una cartella intelligente
-
-vm_virtualization.type.vm_virtual-document.title=Documento intelligente
-vm_virtualization.type.vm_virtual-document.description=Voce di nodo in un nodo contenitore di una cartella intelligente
-
-vm_virtualization.type.vm_virtualization.title=Cartella intelligente contenitore
-vm_virtualization.type.vm_virtualization.description=Cartella intelligente contenitore
-
-vm_virtualization.type.vm_custom-virtualization.title=Cartella intelligente personalizzata
-vm_virtualization.type.vm_custom-virtualization.description=Cartella intelligente personalizzata
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Modello di cartella intelligente
-
-vm_virtualization.type.vm_system-virtualization.title=Cartella intelligente di sistema
-vm_virtualization.type.vm_system-virtualization.description=Cartella intelligente di sistema
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Modello di cartella intelligente
-
-vm_virtualization.type.vm_download.title=Aspetto transitorio per download di cartelle intelligenti
-vm_virtualization.type.vm_download.description=Contenitore transitorio per download di cartelle intelligenti
-
-vm_virtualization.nullSystemTemplate.message=Impossibile trovare il modello di sistema
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_ja.properties b/config/alfresco/messages/virtualization-model_ja.properties
deleted file mode 100644
index 3675df54ef..0000000000
--- a/config/alfresco/messages/virtualization-model_ja.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Smart \u30d5\u30a9\u30eb\u30c0\u30e2\u30c7\u30eb
-
-vm_virtualization.type.vm_virtual.title=Smart \u30d5\u30a9\u30eb\u30c0
-vm_virtualization.type.vm_virtual.description=Smart \u30d5\u30a9\u30eb\u30c0\u30b3\u30f3\u30c6\u30ca\u30ce\u30fc\u30c9
-
-vm_virtualization.type.vm_virtual-document.title=Smart \u6587\u66f8
-vm_virtualization.type.vm_virtual-document.description=Smart \u30d5\u30a9\u30eb\u30c0\u30b3\u30f3\u30c6\u30ca\u30ce\u30fc\u30c9\u306b\u5165\u3063\u3066\u3044\u308b\u30ce\u30fc\u30c9
-
-vm_virtualization.type.vm_virtualization.title=\u30b3\u30f3\u30c6\u30ca Smart \u30d5\u30a9\u30eb\u30c0
-vm_virtualization.type.vm_virtualization.description=\u30b3\u30f3\u30c6\u30ca\u306e Smart \u30d5\u30a9\u30eb\u30c0
-
-vm_virtualization.type.vm_custom-virtualization.title=\u30ab\u30b9\u30bf\u30e0 Smart \u30d5\u30a9\u30eb\u30c0
-vm_virtualization.type.vm_custom-virtualization.description=\u30ab\u30b9\u30bf\u30e0\u306e Smart \u30d5\u30a9\u30eb\u30c0
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
-
-vm_virtualization.type.vm_system-virtualization.title=\u30b7\u30b9\u30c6\u30e0 Smart \u30d5\u30a9\u30eb\u30c0
-vm_virtualization.type.vm_system-virtualization.description=\u30b7\u30b9\u30c6\u30e0\u306e Smart \u30d5\u30a9\u30eb\u30c0
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Smart \u30d5\u30a9\u30eb\u30c0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
-
-vm_virtualization.type.vm_download.title=\u4e00\u6642 Smart \u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30a2\u30b9\u30da\u30af\u30c8
-vm_virtualization.type.vm_download.description=\u4e00\u6642\u7684\u306a Smart \u30d5\u30a9\u30eb\u30c0\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30b3\u30f3\u30c6\u30ca
-
-vm_virtualization.nullSystemTemplate.message=\u30b7\u30b9\u30c6\u30e0\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_nb.properties b/config/alfresco/messages/virtualization-model_nb.properties
deleted file mode 100644
index efe449df75..0000000000
--- a/config/alfresco/messages/virtualization-model_nb.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Smartmapper Modell
-
-vm_virtualization.type.vm_virtual.title=Smartmappe
-vm_virtualization.type.vm_virtual.description=En Smartmappe inneholder node
-
-vm_virtualization.type.vm_virtual-document.title=Smart-dokument
-vm_virtualization.type.vm_virtual-document.description=En nodeinntasting i en Smart-mappe inneholder node
-
-vm_virtualization.type.vm_virtualization.title=Beholder Smartmappe
-vm_virtualization.type.vm_virtualization.description=En beholder Smartmappe
-
-vm_virtualization.type.vm_custom-virtualization.title=Tilpasset Smartmappe
-vm_virtualization.type.vm_custom-virtualization.description=En tilpasset Smartmappe
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Smartmappe Mal
-
-vm_virtualization.type.vm_system-virtualization.title=System Smartmappe
-vm_virtualization.type.vm_system-virtualization.description=En system Smartmappe
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Smartmappe Mal
-
-vm_virtualization.type.vm_download.title=Imidlertidig aspekt ved Smartmappe-nedlasting
-vm_virtualization.type.vm_download.description=Imidlertidig beholder ved Smartmappe-nedlasting
-
-vm_virtualization.nullSystemTemplate.message=Ingen systemmal funnet
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_nl.properties b/config/alfresco/messages/virtualization-model_nl.properties
deleted file mode 100644
index 01fcf59f60..0000000000
--- a/config/alfresco/messages/virtualization-model_nl.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Slimme-mappenmodel
-
-vm_virtualization.type.vm_virtual.title=Slimme map
-vm_virtualization.type.vm_virtual.description=Een slimme-mapcontainernode
-
-vm_virtualization.type.vm_virtual-document.title=Slim document
-vm_virtualization.type.vm_virtual-document.description=Een nodevermelding in een slimme-mapcontainernode
-
-vm_virtualization.type.vm_virtualization.title=Slimme-mapcontainer
-vm_virtualization.type.vm_virtualization.description=Een slimme-mapcontainer
-
-vm_virtualization.type.vm_custom-virtualization.title=Aangepaste slimme map
-vm_virtualization.type.vm_custom-virtualization.description=Een aangepaste slimme map
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Slimme-mapsjabloon
-
-vm_virtualization.type.vm_system-virtualization.title=Slimme map systeem
-vm_virtualization.type.vm_system-virtualization.description=Een slimme map van het systeem
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Slimme-mapsjabloon
-
-vm_virtualization.type.vm_download.title=Kortdurend slimme-mapdownloadaspect
-vm_virtualization.type.vm_download.description=Kortdurende slimme-mapdownloadcontainer
-
-vm_virtualization.nullSystemTemplate.message=Er is geen systeemsjabloon gevonden
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_pt_BR.properties b/config/alfresco/messages/virtualization-model_pt_BR.properties
deleted file mode 100644
index f3254abe52..0000000000
--- a/config/alfresco/messages/virtualization-model_pt_BR.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=Modelo de pastas inteligentes
-
-vm_virtualization.type.vm_virtual.title=Pasta inteligente
-vm_virtualization.type.vm_virtual.description=Um n\u00f3 contentor de pasta inteligente
-
-vm_virtualization.type.vm_virtual-document.title=Documento inteligente
-vm_virtualization.type.vm_virtual-document.description=Uma entrada de n\u00f3 em um n\u00f3 contentor de pasta inteligente
-
-vm_virtualization.type.vm_virtualization.title=Pasta inteligente do contentor
-vm_virtualization.type.vm_virtualization.description=Uma pasta inteligente do contentor
-
-vm_virtualization.type.vm_custom-virtualization.title=Pasta inteligente personalizada
-vm_virtualization.type.vm_custom-virtualization.description=Uma pasta inteligente personalizada
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=Modelo de pasta inteligente
-
-vm_virtualization.type.vm_system-virtualization.title=Pasta inteligente do sistema
-vm_virtualization.type.vm_system-virtualization.description=Uma pasta inteligente do sistema
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=Modelo de pasta inteligente
-
-vm_virtualization.type.vm_download.title=Aspecto de download para pasta inteligente transit\u00f3ria
-vm_virtualization.type.vm_download.description=Contentor de download para pasta inteligente transit\u00f3ria
-
-vm_virtualization.nullSystemTemplate.message=Nenhum modelo de sistema foi encontrado
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_ru.properties b/config/alfresco/messages/virtualization-model_ru.properties
deleted file mode 100644
index 6509e702c8..0000000000
--- a/config/alfresco/messages/virtualization-model_ru.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=\u041c\u043e\u0434\u0435\u043b\u044c \u0423\u043c\u043d\u044b\u0445 \u043f\u0430\u043f\u043e\u043a
-
-vm_virtualization.type.vm_virtual.title=\u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-vm_virtualization.type.vm_virtual.description=\u041e\u0431\u044a\u0435\u043a\u0442-\u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-
-vm_virtualization.type.vm_virtual-document.title=\u0423\u043c\u043d\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442
-vm_virtualization.type.vm_virtual-document.description=\u041e\u0431\u044a\u0435\u043a\u0442 \u0432 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0435 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-
-vm_virtualization.type.vm_virtualization.title=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-vm_virtualization.type.vm_virtualization.description=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0442\u0438\u043f\u0430 \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-
-vm_virtualization.type.vm_custom-virtualization.title=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-vm_virtualization.type.vm_custom-virtualization.description=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=\u0428\u0430\u0431\u043b\u043e\u043d \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
-
-vm_virtualization.type.vm_system-virtualization.title=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-vm_virtualization.type.vm_system-virtualization.description=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f \u0423\u043c\u043d\u0430\u044f \u043f\u0430\u043f\u043a\u0430
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=\u0428\u0430\u0431\u043b\u043e\u043d \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
-
-vm_virtualization.type.vm_download.title=\u0410\u0441\u043f\u0435\u043a\u0442 \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
-vm_virtualization.type.vm_download.description=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0439 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0423\u043c\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0438
-
-vm_virtualization.nullSystemTemplate.message=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0448\u0430\u0431\u043b\u043e\u043d \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
\ No newline at end of file
diff --git a/config/alfresco/messages/virtualization-model_zh_CN.properties b/config/alfresco/messages/virtualization-model_zh_CN.properties
deleted file mode 100644
index 67ddef3667..0000000000
--- a/config/alfresco/messages/virtualization-model_zh_CN.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Display labels for the Smart Folders Model
-
-vm_virtualization.description=\u667a\u80fd\u6587\u4ef6\u5939\u6a21\u578b
-
-vm_virtualization.type.vm_virtual.title=\u667a\u80fd\u6587\u4ef6\u5939
-vm_virtualization.type.vm_virtual.description=\u667a\u80fd\u6587\u4ef6\u5939\u5bb9\u5668\u8282\u70b9
-
-vm_virtualization.type.vm_virtual-document.title=\u667a\u80fd\u6587\u6863
-vm_virtualization.type.vm_virtual-document.description=\u4e00\u4e2a\u667a\u80fd\u6587\u4ef6\u5939\u5bb9\u5668\u8282\u70b9\u4e2d\u7684\u8282\u70b9\u6761\u76ee
-
-vm_virtualization.type.vm_virtualization.title=\u5bb9\u5668\u667a\u80fd\u6587\u4ef6\u5939
-vm_virtualization.type.vm_virtualization.description=\u4e00\u4e2a\u5bb9\u5668\u667a\u80fd\u6587\u4ef6\u5939
-
-vm_virtualization.type.vm_custom-virtualization.title=\u81ea\u5b9a\u4e49\u667a\u80fd\u6587\u4ef6
-vm_virtualization.type.vm_custom-virtualization.description=\u4e00\u4e2a\u81ea\u5b9a\u4e49\u667a\u80fd\u6587\u4ef6
-vm_virtualization.type.vm_custom-virtualization.property.vm_custom-template-association=\u667a\u80fd\u6587\u4ef6\u6a21\u677f
-
-vm_virtualization.type.vm_system-virtualization.title=\u7cfb\u7edf\u667a\u80fd\u6587\u4ef6
-vm_virtualization.type.vm_system-virtualization.description=\u4e00\u4e2a\u7cfb\u7edf\u667a\u80fd\u6587\u4ef6
-vm_virtualization.type.vm_system-virtualization.property.vm_system-template-location=\u667a\u80fd\u6587\u4ef6\u6a21\u677f
-
-vm_virtualization.type.vm_download.title=\u77ac\u95f4\u667a\u80fd\u6587\u4ef6\u4e0b\u8f7d\u5207\u9762
-vm_virtualization.type.vm_download.description=\u77ac\u95f4\u667a\u80fd\u6587\u4ef6\u4e0b\u8f7d\u5bb9\u5668
-
-vm_virtualization.nullSystemTemplate.message=\u672a\u53d1\u73b0\u7cfb\u7edf\u6a21\u677f
\ No newline at end of file
diff --git a/config/alfresco/model/virtualization-model.xml b/config/alfresco/model/smartfolder-model.xml
similarity index 58%
rename from config/alfresco/model/virtualization-model.xml
rename to config/alfresco/model/smartfolder-model.xml
index 78a496df17..54efbd9404 100644
--- a/config/alfresco/model/virtualization-model.xml
+++ b/config/alfresco/model/smartfolder-model.xml
@@ -1,8 +1,8 @@
-
+
- Virtualization Model
+ Smart Folder Model
Alfresco
1.0
@@ -16,11 +16,11 @@
-
+
-
+
systemTemplateLocations
@@ -29,8 +29,8 @@
-
- Virtual Folder Template
+
+ Smart Folder Template
cm:content
@@ -38,27 +38,27 @@
-
- Virtual
- A virtualized container node
+
+ Smart Folder
+ A smart container node
-
- Virtual Document
+
+ Smart Folder Child
-
+
Virtualization
-
- Custom Virtual Folder
- vm:virtualization
+
+ Custom Smart Folder
+ sf:virtualization
-
- Virtual Folder Template
+
+ Smart Folder Template
false
true
@@ -72,16 +72,16 @@
-
- System Virtual Folder
- vm:virtualization
+
+ System Smart Folder
+ sf:virtualization
-
- Virtual Folder Template
+
+ Smart Folder Template
d:text
true
-
+
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index b98808cbcd..81cf764551 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -494,8 +494,8 @@ spaces.templates.email.workflowemailnotification.childname=cm:workflownotificati
spaces.nodetemplates.childname=app:node_templates
spaces.shared.childname=app:shared
spaces.solr_facets.root.childname=srft:facets
-spaces.smartfolders.childname=app:virtual_folders
-spaces.smartdownloads.childname=app:virtual_downloads
+spaces.smartfolders.childname=app:smart_folders
+spaces.smartdownloads.childname=app:smart_downloads
spaces.transfer_summary_report.location=/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.transfers.childname}/${spaces.inbound_transfer_records.childname}
# ADM VersionStore Configuration
@@ -1115,8 +1115,8 @@ cmis.disable.hidden.leading.period.files=false
#Smart Folders Config Properties
smart.folders.enabled=false
-smart.folders.model=alfresco/model/virtualization-model.xml
-smart.folders.model.labels=alfresco/messages/virtualization-model
+smart.folders.model=alfresco/model/smartfolder-model.xml
+smart.folders.model.labels=alfresco/messages/smartfolder-model
#Smart reference config
@@ -1137,22 +1137,22 @@ smart.folders.config.vanilla.processor.classpath=/org/alfresco/repo/virtual/node
#System virtualization method config
#System virtualization method aspect.
-smart.folders.config.system.aspect=vm:system-virtualization
+smart.folders.config.system.aspect=sf:systemConfigSmartFolder
#System virtualization method aspect defined template location property.
-smart.folders.config.system.aspect.template.location.property=vm:system-template-location
+smart.folders.config.system.aspect.template.location.property=sf:system-template-location
#Classpath to be explored for *.json entries defining system templates.
smart.folders.config.system.templates.classpath=/org/alfresco/repo/virtual/node
#A company home relative name or qname path location of repository system templates.
smart.folders.config.system.templates.path=${spaces.dictionary.childname}/${spaces.smartfolders.childname}
#Content sub type of repository system templates.
-smart.folders.config.system.templates.template.type=vm:virtualFolderTemplate
+smart.folders.config.system.templates.template.type=sf:smartFolderTemplate
#Custom virtualization method config
#Custom virtualization method aspect.
-smart.folders.config.custom.aspect=vm:custom-virtualization
+smart.folders.config.custom.aspect=sf:customConfigSmartFolder
#Custom virtualization method aspect template content association.
-smart.folders.config.custom.aspect.template.association=vm:custom-template-association
+smart.folders.config.custom.aspect.template.association=sf:custom-template-association
#Type virtualization method config
diff --git a/config/alfresco/virtualization-context.xml b/config/alfresco/smartfolder-context.xml
similarity index 90%
rename from config/alfresco/virtualization-context.xml
rename to config/alfresco/smartfolder-context.xml
index 04d535c553..593efbb944 100644
--- a/config/alfresco/virtualization-context.xml
+++ b/config/alfresco/smartfolder-context.xml
@@ -53,7 +53,7 @@
-
+
${smart.folders.model}
@@ -118,7 +118,7 @@
-
+
@@ -128,17 +128,17 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
Unlock
CancelCheckOut
@@ -152,11 +152,11 @@
CreateAssociations
-
+
-
+
ChangePermissions
WriteProperties
@@ -188,13 +188,13 @@
-
+
-
+
@@ -205,27 +205,27 @@
-
+
-
+
-
+
-
+
-
+
@@ -235,7 +235,7 @@
-
+
@@ -246,7 +246,7 @@
-
+
diff --git a/source/java/org/alfresco/repo/virtual/VirtualContentModel.java b/source/java/org/alfresco/repo/virtual/VirtualContentModel.java
index c5c8d685b0..da9d97d864 100644
--- a/source/java/org/alfresco/repo/virtual/VirtualContentModel.java
+++ b/source/java/org/alfresco/repo/virtual/VirtualContentModel.java
@@ -28,16 +28,16 @@ import org.alfresco.service.namespace.QName;
*/
public interface VirtualContentModel
{
- static final String VIRTUAL_CONTENT_MODEL_1_0_URI = "http://www.alfresco.org/model/content/virtual/1.0";
+ static final String VIRTUAL_CONTENT_MODEL_1_0_URI = "http://www.alfresco.org/model/content/smartfolder/1.0";
static final QName ASPECT_VIRTUAL = QName.createQName(VIRTUAL_CONTENT_MODEL_1_0_URI,
- "virtual");
+ "smartFolder");
static final QName ASPECT_VIRTUAL_DOCUMENT = QName.createQName(VIRTUAL_CONTENT_MODEL_1_0_URI,
- "virtual-document");
+ "smartFolderChild");
static final QName TYPE_VIRTUAL_FOLDER_TEMPLATE = QName.createQName(VIRTUAL_CONTENT_MODEL_1_0_URI,
- "virtualFolderTemplate");
+ "smartFolderTemplate");
static final QName PROP_ACTUAL_NODE_REF = QName.createQName(VIRTUAL_CONTENT_MODEL_1_0_URI,
"actualNodeRef");
diff --git a/source/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java b/source/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java
index bac01a4b7d..bdfb13425a 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java
@@ -33,14 +33,14 @@ import org.alfresco.service.cmr.repository.Path;
public class GetPathMethod extends AbstractProtocolMethod
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
private ActualEnvironment environment;
- public GetPathMethod(VirtualStore virtualStore, ActualEnvironment actualEnvironment)
+ public GetPathMethod(VirtualStore smartStore, ActualEnvironment actualEnvironment)
{
super();
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
this.environment = actualEnvironment;
}
@@ -64,7 +64,7 @@ public class GetPathMethod extends AbstractProtocolMethod
{
path = environment.getPath(actualNodeRef);
}
- Path virtualPath = virtualStore.getPath(reference);
+ Path virtualPath = smartStore.getPath(reference);
return path.append(virtualPath);
}
catch (ReferenceEncodingException e)
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
index 1371860dcc..211da974e2 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
@@ -42,11 +42,11 @@ public class VirtualCheckOutCheckInServiceExtension extends
super(CheckOutCheckInServiceTrait.class);
}
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
- public void setVirtualStore(VirtualStore virtualStore)
+ public void setSmartStore(VirtualStore smartStore)
{
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
}
@Override
@@ -54,8 +54,8 @@ public class VirtualCheckOutCheckInServiceExtension extends
QName destinationAssocQName)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialNodeRef = virtualStore.materializeIfPossible(nodeRef);
- NodeRef materialDestination = virtualStore.materializeIfPossible(destinationParentNodeRef);
+ NodeRef materialNodeRef = smartStore.materializeIfPossible(nodeRef);
+ NodeRef materialDestination = smartStore.materializeIfPossible(destinationParentNodeRef);
NodeRef workingCopy = theTrait.checkout(materialNodeRef,
materialDestination,
destinationAssocTypeQName,
@@ -79,7 +79,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef checkout(NodeRef nodeRef)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialNodeRef = virtualStore.materializeIfPossible(nodeRef);
+ NodeRef materialNodeRef = smartStore.materializeIfPossible(nodeRef);
NodeRef workingCopy = theTrait.checkout(materialNodeRef);
return virtualizeOriginalIfNeeded(nodeRef,
@@ -91,7 +91,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
boolean keepCheckedOut)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialWorkingCopy = virtualStore.materializeIfPossible(workingCopyNodeRef);
+ NodeRef materialWorkingCopy = smartStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialOriginalNode = theTrait.checkin(materialWorkingCopy,
versionProperties,
contentUrl,
@@ -104,7 +104,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef checkin(NodeRef workingCopyNodeRef, Map versionProperties, String contentUrl)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialWorkingCopy = virtualStore.materializeIfPossible(workingCopyNodeRef);
+ NodeRef materialWorkingCopy = smartStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialOriginalNode = theTrait.checkin(materialWorkingCopy,
versionProperties,
contentUrl);
@@ -133,7 +133,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef checkin(NodeRef workingCopyNodeRef, Map versionProperties)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialWorkingCopy = virtualStore.materializeIfPossible(workingCopyNodeRef);
+ NodeRef materialWorkingCopy = smartStore.materializeIfPossible(workingCopyNodeRef);
NodeRef materialOriginalNode = theTrait.checkin(materialWorkingCopy,
versionProperties);
@@ -144,7 +144,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
@Override
public NodeRef cancelCheckout(NodeRef workingCopyNodeRef)
{
- NodeRef materialOriginalNode = getTrait().cancelCheckout(virtualStore.materializeIfPossible(workingCopyNodeRef));
+ NodeRef materialOriginalNode = getTrait().cancelCheckout(smartStore.materializeIfPossible(workingCopyNodeRef));
return virtualizeOriginalIfNeeded(workingCopyNodeRef,
materialOriginalNode);
@@ -154,7 +154,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef getWorkingCopy(NodeRef nodeRef)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialWorkingCopy = theTrait.getWorkingCopy(virtualStore.materializeIfPossible(nodeRef));
+ NodeRef materialWorkingCopy = theTrait.getWorkingCopy(smartStore.materializeIfPossible(nodeRef));
return virtualizeVersionIfNeeded(nodeRef,
materialWorkingCopy);
@@ -181,7 +181,7 @@ public class VirtualCheckOutCheckInServiceExtension extends
public NodeRef getCheckedOut(NodeRef nodeRef)
{
CheckOutCheckInServiceTrait theTrait = getTrait();
- NodeRef materialChekedOut = theTrait.getCheckedOut(virtualStore.materializeIfPossible(nodeRef));
+ NodeRef materialChekedOut = theTrait.getCheckedOut(smartStore.materializeIfPossible(nodeRef));
return virtualizeVersionIfNeeded(nodeRef,
materialChekedOut);
}
@@ -189,13 +189,13 @@ public class VirtualCheckOutCheckInServiceExtension extends
@Override
public boolean isWorkingCopy(NodeRef nodeRef)
{
- return getTrait().isWorkingCopy(virtualStore.materializeIfPossible(nodeRef));
+ return getTrait().isWorkingCopy(smartStore.materializeIfPossible(nodeRef));
}
@Override
public boolean isCheckedOut(NodeRef nodeRef)
{
- return getTrait().isCheckedOut(virtualStore.materializeIfPossible(nodeRef));
+ return getTrait().isCheckedOut(smartStore.materializeIfPossible(nodeRef));
}
}
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
index c3fda6642f..be03074c00 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
@@ -54,7 +54,7 @@ public class VirtualFileFolderServiceExtension
extends VirtualSpringBeanExtension
implements FileFolderServiceExtension
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
private ActualEnvironment environment;
@@ -63,9 +63,9 @@ public class VirtualFileFolderServiceExtension
super(FileFolderServiceTrait.class);
}
- public void setVirtualStore(VirtualStore virtualStore)
+ public void setSmartStore(VirtualStore smartStore)
{
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
}
public void setEnvironment(ActualEnvironment environment)
@@ -73,14 +73,14 @@ public class VirtualFileFolderServiceExtension
this.environment = environment;
}
- public List asFileInfos(List references, VirtualStore virtualStore,
+ public List asFileInfos(List references, VirtualStore smartStore,
ActualEnvironment environment) throws VirtualizationException
{
List fileInfos = new LinkedList<>();
for (Reference reference : references)
{
- FileInfo fileInfo = asFileInfo(virtualStore,
+ FileInfo fileInfo = asFileInfo(smartStore,
environment,
reference);
@@ -90,11 +90,11 @@ public class VirtualFileFolderServiceExtension
return fileInfos;
}
- public FileInfo asFileInfo(VirtualStore virtualStore, ActualEnvironment environment, Reference reference)
+ public FileInfo asFileInfo(VirtualStore smartStore, ActualEnvironment environment, Reference reference)
throws VirtualizationException
{
- Map properties = virtualStore.getProperties(reference);
- QName qNameType = virtualStore.getType(reference);
+ Map properties = smartStore.getProperties(reference);
+ QName qNameType = smartStore.getType(reference);
FileFolderServiceType type = getTrait().getType(qNameType);
boolean isFolder = type.equals(FileFolderServiceType.FOLDER);
@@ -113,11 +113,11 @@ public class VirtualFileFolderServiceExtension
{
if (canVirtualize(contextNodeRef))
{
- Reference reference = virtualStore.virtualize(contextNodeRef);
+ Reference reference = smartStore.virtualize(contextNodeRef);
- List virtualNodes = virtualStore.list(reference);
+ List virtualNodes = smartStore.list(reference);
List searchResult = asFileInfos(virtualNodes,
- virtualStore,
+ smartStore,
environment);
if (mergeActualNode(reference))
@@ -136,17 +136,17 @@ public class VirtualFileFolderServiceExtension
protected boolean mergeActualNode(Reference reference) throws VirtualizationException
{
- return virtualStore.canMaterialize(reference);
+ return smartStore.canMaterialize(reference);
}
protected NodeRef actualNodeFrom(Reference reference) throws VirtualizationException
{
- return virtualStore.materialize(reference);
+ return smartStore.materialize(reference);
}
protected boolean canVirtualize(NodeRef nodeRef) throws VirtualizationException
{
- return virtualStore.canVirtualize(nodeRef);
+ return smartStore.canVirtualize(nodeRef);
}
private Set[] buildSearchAndIgnore(final boolean files, final boolean folders, Set ignoreQNames)
@@ -192,14 +192,14 @@ public class VirtualFileFolderServiceExtension
if (canVirtualize(contextNodeRef))
{
- final Reference reference = virtualStore.virtualize(contextNodeRef);
+ final Reference reference = smartStore.virtualize(contextNodeRef);
Set[] searchAndIgnore = buildSearchAndIgnore(files,
folders,
ignoreQNames);
if (mergeActualNode(reference))
{
- PagingResults virtualChildren = virtualStore.list(reference,
+ PagingResults virtualChildren = smartStore.list(reference,
false,
true,
files,
@@ -241,7 +241,7 @@ public class VirtualFileFolderServiceExtension
{
return new PageCollator().collate(asFileInfoResults(environment,
virtualChildren,
- virtualStore).getPage(),
+ smartStore).getPage(),
superSource,
pagingRequest,
comparator);
@@ -255,7 +255,7 @@ public class VirtualFileFolderServiceExtension
else
{
- PagingResults children = virtualStore.list(reference,
+ PagingResults children = smartStore.list(reference,
true,
true,
files,
@@ -268,7 +268,7 @@ public class VirtualFileFolderServiceExtension
return asFileInfoResults(environment,
children,
- virtualStore);
+ smartStore);
}
@@ -343,7 +343,7 @@ public class VirtualFileFolderServiceExtension
{
if (canVirtualize(rootNodeRef))
{
- final Reference reference = virtualStore.virtualize(rootNodeRef);
+ final Reference reference = smartStore.virtualize(rootNodeRef);
List> sortingPropoerties = sortProps;
if (sortingPropoerties == null || sortingPropoerties.isEmpty())
{
@@ -353,7 +353,7 @@ public class VirtualFileFolderServiceExtension
if (mergeActualNode(reference))
{
- PagingResults virtualChildren = virtualStore.list(reference,
+ PagingResults virtualChildren = smartStore.list(reference,
false,
true,
searchTypeQNames,
@@ -390,7 +390,7 @@ public class VirtualFileFolderServiceExtension
{
return new PageCollator().collate(asFileInfoResults(environment,
virtualChildren,
- virtualStore).getPage(),
+ smartStore).getPage(),
superSource,
pagingRequest,
comparator);
@@ -403,7 +403,7 @@ public class VirtualFileFolderServiceExtension
}
else
{
- PagingResults children = virtualStore.list(reference,
+ PagingResults children = smartStore.list(reference,
true,
true,
searchTypeQNames,
@@ -414,7 +414,7 @@ public class VirtualFileFolderServiceExtension
return asFileInfoResults(environment,
children,
- virtualStore);
+ smartStore);
}
}
@@ -451,18 +451,18 @@ public class VirtualFileFolderServiceExtension
{
if (canVirtualize(contextNodeRef))
{
- Reference reference = virtualStore.virtualize(contextNodeRef);
+ Reference reference = smartStore.virtualize(contextNodeRef);
List virtualNodes = Collections.emptyList();
if (!includeSubFolders)
{
- virtualNodes = virtualStore.search(reference,
+ virtualNodes = smartStore.search(reference,
namePattern,
fileSearch,
folderSearch,
false);
}
List searchResult = asFileInfos(virtualNodes,
- virtualStore,
+ smartStore,
environment);
if (mergeActualNode(reference))
@@ -488,7 +488,7 @@ public class VirtualFileFolderServiceExtension
@Override
public FileInfo rename(NodeRef sourceNodeRef, String newName) throws FileExistsException, FileNotFoundException
{
- return getTrait().rename(virtualStore.materializeIfPossible(sourceNodeRef),
+ return getTrait().rename(smartStore.materializeIfPossible(sourceNodeRef),
newName);
}
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java
index 0ed2c01bd3..c9b7f35ae3 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java
@@ -36,29 +36,29 @@ import org.alfresco.traitextender.SpringBeanExtension;
public class VirtualLockServiceExtension extends SpringBeanExtension
implements LockServiceExtension
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
public VirtualLockServiceExtension()
{
super(LockServiceTrait.class);
}
- public void setVirtualStore(VirtualStore virtualStore)
+ public void setSmartStore(VirtualStore smartStore)
{
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
}
@Override
public void lock(NodeRef nodeRef, LockType lockType) throws UnableToAquireLockException
{
- getTrait().lock(virtualStore.materializeIfPossible(nodeRef),
+ getTrait().lock(smartStore.materializeIfPossible(nodeRef),
lockType);
}
@Override
public void lock(NodeRef nodeRef, LockType lockType, int timeToExpire) throws UnableToAquireLockException
{
- getTrait().lock(virtualStore.materializeIfPossible(nodeRef),
+ getTrait().lock(smartStore.materializeIfPossible(nodeRef),
lockType,
timeToExpire);
}
@@ -67,7 +67,7 @@ public class VirtualLockServiceExtension extends SpringBeanExtension nodeRefs, LockType lockType, int timeToExpire)
throws UnableToAquireLockException
{
- getTrait().lock(virtualStore.materializeIfPossible(nodeRefs),
+ getTrait().lock(smartStore.materializeIfPossible(nodeRefs),
lockType,
timeToExpire);
}
@@ -106,13 +106,13 @@ public class VirtualLockServiceExtension extends SpringBeanExtension nodeRefs) throws UnableToReleaseLockException
{
- getTrait().unlock(virtualStore.materializeIfPossible(nodeRefs));
+ getTrait().unlock(smartStore.materializeIfPossible(nodeRefs));
}
@Override
public LockStatus getLockStatus(NodeRef nodeRef)
{
- return getTrait().getLockStatus(virtualStore.materializeIfPossible(nodeRef));
+ return getTrait().getLockStatus(smartStore.materializeIfPossible(nodeRef));
}
@Override
public LockStatus getLockStatus(NodeRef nodeRef, String userName)
{
- return getTrait().getLockStatus(virtualStore.materializeIfPossible(nodeRef),
+ return getTrait().getLockStatus(smartStore.materializeIfPossible(nodeRef),
userName);
}
@Override
public LockType getLockType(NodeRef nodeRef)
{
- return getTrait().getLockType(virtualStore.materializeIfPossible(nodeRef));
+ return getTrait().getLockType(smartStore.materializeIfPossible(nodeRef));
}
@Override
public void checkForLock(NodeRef nodeRef)
{
- getTrait().checkForLock(virtualStore.materializeIfPossible(nodeRef));
+ getTrait().checkForLock(smartStore.materializeIfPossible(nodeRef));
}
@Override
@@ -171,13 +171,13 @@ public class VirtualLockServiceExtension extends SpringBeanExtension getVirtualProperties(Reference reference)
{
- return virtualStore.getProperties(reference);
+ return smartStore.getProperties(reference);
}
@Override
@@ -195,7 +195,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension properties = virtualStore.getProperties(reference);
+ Map properties = smartStore.getProperties(reference);
Serializable name = properties.get(ContentModel.PROP_NAME);
QName assocChildName = QName
.createQNameWithValidLocalName(VirtualContentModel.VIRTUAL_CONTENT_MODEL_1_0_URI,
@@ -558,16 +558,16 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore.getChildAssocs(reference,
+ Reference reference = smartStore.virtualize(nodeRef);
+ List virtualAssociations = smartStore.getChildAssocs(reference,
RegexQNamePattern.MATCH_ALL,
RegexQNamePattern.MATCH_ALL,
Integer.MAX_VALUE,
false);
List associations = new LinkedList<>(virtualAssociations);
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- NodeRef materialReference = virtualStore.materialize(reference);
+ NodeRef materialReference = smartStore.materialize(reference);
List actualAssociations = theTrait.getChildAssocs(materialReference,
RegexQNamePattern.MATCH_ALL,
RegexQNamePattern.MATCH_ALL,
@@ -592,17 +592,17 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore.getChildAssocs(reference,
+ Reference reference = smartStore.virtualize(nodeRef);
+ List virtualAssociations = smartStore.getChildAssocs(reference,
typeQNamePattern,
qnamePattern,
Integer.MAX_VALUE,
false);
List associations = new LinkedList<>(virtualAssociations);
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- NodeRef materialReference = virtualStore.materialize(reference);
+ NodeRef materialReference = smartStore.materialize(reference);
List actualAssociations = theTrait.getChildAssocs(materialReference,
typeQNamePattern,
qnamePattern);
@@ -626,8 +626,8 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore.getChildAssocs(reference,
+ Reference reference = smartStore.virtualize(nodeRef);
+ List virtualAssociations = smartStore.getChildAssocs(reference,
typeQNamePattern,
qnamePattern,
maxResults,
@@ -636,9 +636,9 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension actualAssociations = theTrait.getChildAssocs(materialReference,
typeQNamePattern,
qnamePattern,
@@ -662,7 +662,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore.getChildAssocs(reference,
+ Reference reference = smartStore.virtualize(nodeRef);
+ List virtualAssociations = smartStore.getChildAssocs(reference,
typeQNamePattern,
qnamePattern,
Integer.MAX_VALUE,
preload);
List associations = new LinkedList<>(virtualAssociations);
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- NodeRef materialReference = virtualStore.materialize(reference);
+ NodeRef materialReference = smartStore.materialize(reference);
List actualAssociations = theTrait.getChildAssocs(materialReference,
typeQNamePattern,
qnamePattern,
@@ -709,13 +709,13 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore.getChildAssocs(reference,
+ Reference reference = smartStore.virtualize(nodeRef);
+ List virtualAssociations = smartStore.getChildAssocs(reference,
childNodeTypeQNames);
List associations = new LinkedList<>(virtualAssociations);
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- NodeRef materialReference = virtualStore.materialize(reference);
+ NodeRef materialReference = smartStore.materialize(reference);
List actualAssociations = theTrait.getChildAssocs(materialReference,
childNodeTypeQNames);
associations.addAll(actualAssociations);
@@ -738,14 +738,14 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore.getChildAssocsByPropertyValue(reference,
+ Reference reference = smartStore.virtualize(nodeRef);
+ List virtualAssociations = smartStore.getChildAssocsByPropertyValue(reference,
propertyQName,
value);
List associations = new LinkedList<>(virtualAssociations);
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- NodeRef materialReference = virtualStore.materialize(reference);
+ NodeRef materialReference = smartStore.materialize(reference);
List actualAssociations = theTrait.getChildAssocsByPropertyValue(materialReference,
propertyQName,
value);
@@ -767,11 +767,11 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension materialAssocs = new ArrayList();
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- List sourceAssocs = theTrait.getSourceAssocs(virtualStore.materialize(reference),
+ List sourceAssocs = theTrait.getSourceAssocs(smartStore.materialize(reference),
qnamePattern);
for (AssociationRef associationRef : sourceAssocs)
{
@@ -1147,9 +1147,9 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension revertVirtualAssociation(ChildAssociationRef childAssocRef,
NodeServiceTrait theTrait, NodeRef childRef)
{
- childRef = virtualStore.materialize(Reference.fromNodeRef(childRef));
+ childRef = smartStore.materialize(Reference.fromNodeRef(childRef));
ChildAssociationRef parent = theTrait.getPrimaryParent(childRef);
final QName assocName = childAssocRef.getQName();
List assocsToRemove = theTrait.getChildAssocs(parent.getParentRef(),
@@ -1427,14 +1427,14 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension virtualAssociations = virtualStore
+ Reference reference = smartStore.virtualize(nodeRef);
+ Collection virtualAssociations = smartStore
.getChildAssocsWithoutParentAssocsOfType(reference,
assocTypeQName);
List associations = new LinkedList<>(virtualAssociations);
- if (virtualStore.canMaterialize(reference))
+ if (smartStore.canMaterialize(reference))
{
- NodeRef materialReference = virtualStore.materialize(reference);
+ NodeRef materialReference = smartStore.materialize(reference);
Collection actualAssociations = theTrait
.getChildAssocsWithoutParentAssocsOfType(materialReference,
assocTypeQName);
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
index 1528c9d337..e43697d16f 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
@@ -50,16 +50,16 @@ public class VirtualPermissionServiceExtension extends
{
private static Log logger = LogFactory.getLog(VirtualPermissionServiceExtension.class);
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
public VirtualPermissionServiceExtension()
{
super(PermissionServiceTrait.class);
}
- public void setVirtualStore(VirtualStore virtualStore)
+ public void setSmartStore(VirtualStore smartStore)
{
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
}
public AccessStatus hasPermission(NodeRef nodeRef, String perm)
@@ -73,7 +73,7 @@ public class VirtualPermissionServiceExtension extends
else
{
Reference reference = Reference.fromNodeRef(nodeRef);
- AccessStatus virtualAccessStatus = virtualStore.hasPermission(reference,
+ AccessStatus virtualAccessStatus = smartStore.hasPermission(reference,
perm);
if (!AccessStatus.UNDETERMINED.equals(virtualAccessStatus))
{
@@ -106,7 +106,7 @@ public class VirtualPermissionServiceExtension extends
else
{
Reference reference = Reference.fromNodeRef(nodeRef);
- AccessStatus virtualAccessStatus = virtualStore.hasPermission(reference,
+ AccessStatus virtualAccessStatus = smartStore.hasPermission(reference,
perm);
if (!AccessStatus.UNDETERMINED.equals(virtualAccessStatus))
{
@@ -164,7 +164,7 @@ public class VirtualPermissionServiceExtension extends
else
{
Reference reference = Reference.fromNodeRef(nodeRef);
- NodePermissionEntry virtualSetPermissions = virtualStore.getSetPermissions(reference);
+ NodePermissionEntry virtualSetPermissions = smartStore.getSetPermissions(reference);
NodeRef nodeToAdhereTo = establishPermisisonAdherence(reference);
List extends PermissionEntry> actualPermissionEntries;
@@ -205,7 +205,7 @@ public class VirtualPermissionServiceExtension extends
private NodeRef establishPermisisonAdherence(Reference reference)
{
- NodeRef nodeToAdhereTo = virtualStore.adhere(reference,
+ NodeRef nodeToAdhereTo = smartStore.adhere(reference,
VirtualStore.FILING_OR_MATERIAL_ADHERENCE);
if (logger.isDebugEnabled())
{
@@ -218,7 +218,7 @@ public class VirtualPermissionServiceExtension extends
@Override
public NodePermissionEntry explainPermission(NodeRef nodeRef, PermissionReference perm)
{
- return getTrait().explainPermission(virtualStore.materializeIfPossible(nodeRef),
+ return getTrait().explainPermission(smartStore.materializeIfPossible(nodeRef),
perm);
}
@@ -333,7 +333,7 @@ public class VirtualPermissionServiceExtension extends
else
{
Reference reference = Reference.fromNodeRef(nodeRef);
- Set virtualSetPermissions = virtualStore.getAllSetPermissions(reference);
+ Set virtualSetPermissions = smartStore.getAllSetPermissions(reference);
NodeRef nodeToAdhereTo = establishPermisisonAdherence(reference);
Set mergedEntries = new HashSet<>(virtualSetPermissions);
if (nodeToAdhereTo != null)
@@ -356,7 +356,7 @@ public class VirtualPermissionServiceExtension extends
else
{
Reference reference = Reference.fromNodeRef(nodeRef);
- Set virtualSetPermissions = virtualStore.getAllSetPermissions(reference);
+ Set virtualSetPermissions = smartStore.getAllSetPermissions(reference);
NodeRef nodeToAdhereTo = establishPermisisonAdherence(reference);
Set actualSetPermissions;
if (nodeToAdhereTo != null)
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java
index 4a22566e2e..1e8941e7ba 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java
@@ -35,23 +35,23 @@ public class VirtualRatingServiceExtension extends SpringBeanExtension getRatingsByCurrentUser(NodeRef targetNode)
{
- NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
+ NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getRatingsByCurrentUser(materialNode);
}
public Rating removeRatingByCurrentUser(NodeRef targetNode, String ratingSchemeName)
{
- NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
+ NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().removeRatingByCurrentUser(materialNode,
ratingSchemeName);
}
public Serializable getRatingRollup(NodeRef targetNode, String ratingSchemeName, String ratingRollupName)
{
- NodeRef materialNode = virtualStore.materializeIfPossible(targetNode);
+ NodeRef materialNode = smartStore.materializeIfPossible(targetNode);
return getTrait().getRatingRollup(materialNode,
ratingSchemeName,
ratingRollupName);
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
index d069047e1d..37f745b4b7 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
@@ -47,7 +47,7 @@ import org.alfresco.traitextender.SpringBeanExtension;
public class VirtualVersionServiceExtension extends SpringBeanExtension
implements VersionServiceExtension
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
public class VirtualVersionHistory implements VersionHistory
{
@@ -126,9 +126,9 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension virtualProperties = virtualVersion.getVersionProperties();
@@ -194,7 +194,7 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension actualVersions = theTrait.createVersion(materialNode,
versionProperties,
versionChildren);
@@ -366,7 +366,7 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension implements WorkflowPackageExtension
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
public VirtualWorkflowPackageExtension()
{
super(WorkflowPackageTrait.class);
}
- public void setVirtualStore(VirtualStore virtualStore)
+ public void setSmartStore(VirtualStore smartStore)
{
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
}
@Override
public NodeRef createPackage(NodeRef container)
{
- return getTrait().createPackage(virtualStore.materializeIfPossible(container));
+ return getTrait().createPackage(smartStore.materializeIfPossible(container));
}
@Override
public void deletePackage(NodeRef container)
{
- getTrait().deletePackage(virtualStore.materializeIfPossible(container));
+ getTrait().deletePackage(smartStore.materializeIfPossible(container));
}
@Override
public List getWorkflowIdsForContent(NodeRef packageItem)
{
- return getTrait().getWorkflowIdsForContent(virtualStore.materializeIfPossible(packageItem));
+ return getTrait().getWorkflowIdsForContent(smartStore.materializeIfPossible(packageItem));
}
@Override
diff --git a/source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java b/source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
index 8cff3c1977..277f8a5bab 100644
--- a/source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
+++ b/source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
@@ -57,7 +57,7 @@ public class SystemTemplateLocationsConstraint extends ListOfValuesConstraint
{
public static final String NULL_SYSTEM_TEMPLATE = "nullSystemTemplate";
- public static final String NULL_SYSTEM_TEMPLATE_MESSAGE = "vm_virtualization.nullSystemTemplate.message";
+ public static final String NULL_SYSTEM_TEMPLATE_MESSAGE = "sf_smartFolder.nullSystemTemplate.message";
private NodeService nodeService;
diff --git a/source/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java b/source/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java
index 12cedc6bdf..96e3d07022 100644
--- a/source/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java
+++ b/source/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java
@@ -56,8 +56,8 @@ public class GetAllSetPermissionsMethod extends AbstractProtocolMethod execute(VirtualProtocol virtualProtocol, Reference reference)
throws ProtocolMethodException
{
- Set toAllow = userPermissions.getAllowVirtualNodes();
- Set toDeny = userPermissions.getDenyVirtualNodes();
+ Set toAllow = userPermissions.getAllowSmartNodes();
+ Set toDeny = userPermissions.getDenySmartNodes();
VirtualFolderDefinition definition = resolver.resolveVirtualFolderDefinition(reference);
FilingRule filingRule = definition.getFilingRule();
@@ -65,7 +65,7 @@ public class GetAllSetPermissionsMethod extends AbstractProtocolMethod deniedPermissions = userPermissions.getDenyReadonlyVirtualNodes();
+ Set deniedPermissions = userPermissions.getDenyReadonlySmartNodes();
toDeny = new HashSet<>(toDeny);
toDeny.addAll(deniedPermissions);
toAllow.add(PermissionService.READ);
diff --git a/source/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java b/source/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java
index 5e009303a4..d2ce6c096d 100644
--- a/source/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java
+++ b/source/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java
@@ -40,7 +40,7 @@ import org.alfresco.service.namespace.QNamePattern;
public class GetChildAssocsMethod extends AbstractProtocolMethod>
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
private ActualEnvironment environment;
@@ -52,11 +52,11 @@ public class GetChildAssocsMethod extends AbstractProtocolMethod childAssocs = new LinkedList<>();
- List children = virtualStore.list(reference);
+ List children = smartStore.list(reference);
NodeRef nodeRefReference = reference.toNodeRef();
int count = 0;
for (Reference child : children)
diff --git a/source/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java b/source/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java
index 62bfc1fb07..5122a738c2 100644
--- a/source/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java
+++ b/source/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java
@@ -63,15 +63,15 @@ public class GetSetPermissionsMethod extends AbstractProtocolMethod toAllow = userPermissions.getAllowVirtualNodes();
- Set toDeny = userPermissions.getDenyVirtualNodes();
+ Set toAllow = userPermissions.getAllowSmartNodes();
+ Set toDeny = userPermissions.getDenySmartNodes();
VirtualFolderDefinition definition = resolver.resolveVirtualFolderDefinition(reference);
FilingRule filingRule = definition.getFilingRule();
boolean readonly = filingRule.isNullFilingRule()
|| filingRule.filingNodeRefFor(new FilingParameters(reference)) == null;
if (readonly)
{
- Set deniedPermissions = userPermissions.getDenyReadonlyVirtualNodes();
+ Set deniedPermissions = userPermissions.getDenyReadonlySmartNodes();
toDeny = new HashSet<>(toDeny);
toDeny.addAll(deniedPermissions);
toAllow.add(PermissionService.READ);
diff --git a/source/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java b/source/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java
index 01bdecdd50..df44892ee5 100644
--- a/source/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java
+++ b/source/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java
@@ -59,7 +59,7 @@ public class HasPermissionMethod extends AbstractProtocolMethod
|| filingRule.filingNodeRefFor(new FilingParameters(reference)) == null;
if (readonly)
{
- Set deniedPermissions = userPermissions.getDenyReadonlyVirtualNodes();
+ Set deniedPermissions = userPermissions.getDenyReadonlySmartNodes();
if (deniedPermissions.contains(permissionToCheck))
{
return AccessStatus.DENIED;
diff --git a/source/java/org/alfresco/repo/virtual/store/ReferenceComparator.java b/source/java/org/alfresco/repo/virtual/store/ReferenceComparator.java
index 73a2d8cebe..89bba7d3ad 100644
--- a/source/java/org/alfresco/repo/virtual/store/ReferenceComparator.java
+++ b/source/java/org/alfresco/repo/virtual/store/ReferenceComparator.java
@@ -43,17 +43,17 @@ import org.springframework.extensions.surf.util.I18NUtil;
*/
public class ReferenceComparator implements Comparator
{
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
private List> sortProps;
private Collator collator;
- public ReferenceComparator(VirtualStore virtualStore, List> sortProps)
+ public ReferenceComparator(VirtualStore smartStore, List> sortProps)
{
this.sortProps = sortProps;
this.collator = AlfrescoCollator.getInstance(I18NUtil.getContentLocale());
- this.virtualStore = virtualStore;
+ this.smartStore = smartStore;
}
@Override
@@ -91,10 +91,10 @@ public class ReferenceComparator implements Comparator
int result = 0;
- Map properties1 = virtualStore.getProperties(ref1);
+ Map properties1 = smartStore.getProperties(ref1);
pv1 = properties1.get(sortPropQName);
- Map properties2 = virtualStore.getProperties(ref2);
+ Map properties2 = smartStore.getProperties(ref2);
pv2 = properties2.get(sortPropQName);
if (pv1 == null)
diff --git a/source/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java b/source/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java
index c7eaa0184a..0f85549737 100644
--- a/source/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java
+++ b/source/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java
@@ -34,17 +34,17 @@ import org.alfresco.service.namespace.QName;
*/
public class VirtualUserPermissions
{
- private Set allowVirtualNodes = Collections.emptySet();
+ private Set allowSmartNodes = Collections.emptySet();
- private Set allowVirtualNodesFull = Collections.emptySet();
+ private Set allowSmartNodesFull = Collections.emptySet();
- private Set denyVirtualNodes = Collections.emptySet();
+ private Set denySmartNodes = Collections.emptySet();
- private Set denyVirtualNodesFull = Collections.emptySet();
+ private Set denySmartNodesFull = Collections.emptySet();
- private Set denyReadonlyVirtualNodes = Collections.emptySet();
+ private Set denyReadonlySmartNodes = Collections.emptySet();
- private Set denyReadonlyVirtualNodesFull = Collections.emptySet();
+ private Set denyReadonlySmartNodesFull = Collections.emptySet();
private Set allowQueryNodes = Collections.emptySet();
@@ -63,11 +63,11 @@ public class VirtualUserPermissions
public VirtualUserPermissions(VirtualUserPermissions userPermissions)
{
- this.allowVirtualNodes = new HashSet<>(userPermissions.allowVirtualNodes);
- this.denyVirtualNodes = new HashSet<>(userPermissions.denyVirtualNodes);
+ this.allowSmartNodes = new HashSet<>(userPermissions.allowSmartNodes);
+ this.denySmartNodes = new HashSet<>(userPermissions.denySmartNodes);
this.allowQueryNodes = new HashSet<>(userPermissions.allowQueryNodes);
this.denyQueryNodes = new HashSet<>(userPermissions.denyQueryNodes);
- this.denyReadonlyVirtualNodes = new HashSet<>(userPermissions.denyReadonlyVirtualNodes);
+ this.denyReadonlySmartNodes = new HashSet<>(userPermissions.denyReadonlySmartNodes);
init();
}
@@ -85,10 +85,10 @@ public class VirtualUserPermissions
public void init()
{
this.allowQueryNodesFull = asFullNamePermissions(allowQueryNodes);
- this.allowVirtualNodesFull = asFullNamePermissions(allowVirtualNodes);
+ this.allowSmartNodesFull = asFullNamePermissions(allowSmartNodes);
this.denyQueryNodesFull = asFullNamePermissions(denyQueryNodes);
- this.denyVirtualNodesFull = asFullNamePermissions(denyVirtualNodes);
- this.denyReadonlyVirtualNodesFull = asFullNamePermissions(denyReadonlyVirtualNodes);
+ this.denySmartNodesFull = asFullNamePermissions(denySmartNodes);
+ this.denyReadonlySmartNodesFull = asFullNamePermissions(denyReadonlySmartNodes);
}
public QName getPermissionTypeQName()
@@ -100,17 +100,17 @@ public class VirtualUserPermissions
{
if (readonly)
{
- if (denyReadonlyVirtualNodesFull.contains(permission) || denyReadonlyVirtualNodes.contains(permission))
+ if (denyReadonlySmartNodesFull.contains(permission) || denyReadonlySmartNodes.contains(permission))
{
return AccessStatus.DENIED;
}
}
- if (denyVirtualNodesFull.contains(permission) || denyVirtualNodes.contains(permission))
+ if (denySmartNodesFull.contains(permission) || denySmartNodes.contains(permission))
{
return AccessStatus.DENIED;
}
- else if (allowVirtualNodesFull.contains(permission) || allowVirtualNodes.contains(permission))
+ else if (allowSmartNodesFull.contains(permission) || allowSmartNodes.contains(permission))
{
return AccessStatus.ALLOWED;
}
@@ -136,34 +136,34 @@ public class VirtualUserPermissions
}
}
- public Set getAllowVirtualNodes()
+ public Set getAllowSmartNodes()
{
- return this.allowVirtualNodes;
+ return this.allowSmartNodes;
}
- public void setAllowVirtualNodes(Set allowFolders)
+ public void setAllowSmartNodes(Set allowFolders)
{
- this.allowVirtualNodes = allowFolders;
+ this.allowSmartNodes = allowFolders;
}
- public Set getDenyVirtualNodes()
+ public Set getDenySmartNodes()
{
- return this.denyVirtualNodes;
+ return this.denySmartNodes;
}
- public void setDenyVirtualNodes(Set denyFolders)
+ public void setDenySmartNodes(Set denyFolders)
{
- this.denyVirtualNodes = denyFolders;
+ this.denySmartNodes = denyFolders;
}
- public void setDenyReadonlyVirtualNodes(Set denyReadonlyVirtualNodes)
+ public void setDenyReadonlySmartNodes(Set denyReadonlySmartNodes)
{
- this.denyReadonlyVirtualNodes = denyReadonlyVirtualNodes;
+ this.denyReadonlySmartNodes = denyReadonlySmartNodes;
}
- public Set getDenyReadonlyVirtualNodes()
+ public Set getDenyReadonlySmartNodes()
{
- return this.denyReadonlyVirtualNodes;
+ return this.denyReadonlySmartNodes;
}
public Set getAllowQueryNodes()
diff --git a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
index 9cb2c99c7e..cbe3203a84 100644
--- a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
@@ -72,7 +72,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
{
private static Log logger = LogFactory.getLog(VirtualizationIntegrationTest.class);
- private static final String PROP_VM_TEMPLATE_CLASSPATH = "prop_vm_system-template-location";
+ private static final String PROP_VM_TEMPLATE_CLASSPATH = "prop_sf_system-template-location";
protected static final String VIRTUAL_FOLDER_1_NAME = "VirtualFolder1";
@@ -206,7 +206,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
if (!virtualizationConfigTestBootstrap.areVirtualFoldersEnabled())
{
// "use the force" and enable virtual folders
- SpringExtensionBundle vfBundle = ctx.getBean("virtualFoldersBundle",
+ SpringExtensionBundle vfBundle = ctx.getBean("smartFoldersBundle",
SpringExtensionBundle.class);
vfBundle.start();
}
@@ -239,7 +239,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
if (!virtualizationConfigTestBootstrap.areVirtualFoldersEnabled())
{
// "use the force" and disable virtual folders
- SpringExtensionBundle vfBundle = ctx.getBean("virtualFoldersBundle",
+ SpringExtensionBundle vfBundle = ctx.getBean("smartFoldersBundle",
SpringExtensionBundle.class);
vfBundle.stop();
}
@@ -276,7 +276,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
protected NodeRef createVirtualizedFolder(NodeRef parent, String name, String templateSysPath)
{
Item testItem = new Item("typeAndAspects",
- "cm:folder,vm:system-virtualization");
+ "cm:folder,sf:systemConfigSmartFolder");
FormData testFormData = new FormData();
testFormData.addFieldData(FORM_DATA_PROP_NAME,
diff --git a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
index f3a438093a..e551d0035a 100644
--- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
@@ -65,7 +65,7 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
private static Log logger = LogFactory.getLog(VirtualNodeServiceExtensionTest.class);
- private VirtualStore virtualStore;
+ private VirtualStore smartStore;
private DownloadStorage downloadStorage;
@@ -82,7 +82,7 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
{
// TODO:is the store really needed when testing node service ? why ?
super.setUp();
- virtualStore = ctx.getBean("virtualStore",
+ smartStore = ctx.getBean("smartStore",
VirtualStore.class);
downloadStorage = ctx.getBean("downloadStorage",
DownloadStorage.class);
@@ -192,18 +192,18 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
public void testCreateNode() throws Exception
{
- assertTrue(virtualStore.canVirtualize(virtualFolder1NodeRef));
+ assertTrue(smartStore.canVirtualize(virtualFolder1NodeRef));
- Reference semiVirtualFolder = virtualStore.virtualize(virtualFolder1NodeRef);
+ Reference semiVirtualFolder = smartStore.virtualize(virtualFolder1NodeRef);
assertNotNull(semiVirtualFolder);
assertTrue(semiVirtualFolder.getProtocol() instanceof VirtualProtocol);
- Reference firstChild = virtualStore.getChildByName(semiVirtualFolder,
+ Reference firstChild = smartStore.getChildByName(semiVirtualFolder,
ContentModel.ASSOC_CONTAINS,
"Node1");
assertNotNull(firstChild);
- Reference secondChild = virtualStore.getChildByName(semiVirtualFolder,
+ Reference secondChild = smartStore.getChildByName(semiVirtualFolder,
ContentModel.ASSOC_CONTAINS,
"Node2");
assertNotNull(secondChild);
@@ -402,7 +402,7 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
assertNotNull(node2);
Path node2Path = nodeService.getPath(node2);
assertNotNull(node2Path);
- assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/vm:Node2",
+ assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/sf:Node2",
node2Path.toPrefixString(environment.getNamespacePrefixResolver()));
}
@@ -422,7 +422,7 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
ContentModel.ASSOC_CONTAINS,
"testfile.txt");
Path path = nodeService.getPath(childRef);
- assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/vm:Node2/cm:testfile.txt",
+ assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/sf:Node2/cm:testfile.txt",
path.toPrefixString(environment.getNamespacePrefixResolver()));
NodeRef physicalNode = nodeService.getChildByName(virtualFolder1NodeRef,
@@ -446,7 +446,7 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
ContentModel.ASSOC_CONTAINS,
"testfile-1.txt");
Path path_1 = nodeService.getPath(childRef_1);
- assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/vm:Node2/vm:Node2_1/cm:testfile-1.txt",
+ assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/sf:Node2/sf:Node2_1/cm:testfile-1.txt",
path_1.toPrefixString(environment.getNamespacePrefixResolver()));
}
@@ -522,7 +522,7 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
List actualAssocs = nodeService.getChildAssocs(actualParentNodeRef);
NodeRef virtualChildNodeRef = virtualAssoc.getChildRef();
assertTrue(Reference.isReference(virtualChildNodeRef));
- NodeRef materialNodeRef = virtualStore.materialize(Reference.fromNodeRef(virtualChildNodeRef));
+ NodeRef materialNodeRef = smartStore.materialize(Reference.fromNodeRef(virtualChildNodeRef));
for (ChildAssociationRef actualAssocRef : actualAssocs)
{
@@ -992,8 +992,8 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
VIRTUAL_FOLDER_2_NAME,
TEST_TEMPLATE_4_JSON_SYS_PATH);
- assertTrue(virtualStore.canVirtualize(virtualFolder));
- Reference semiVirtualFolder = virtualStore.virtualize(virtualFolder);
+ assertTrue(smartStore.canVirtualize(virtualFolder));
+ Reference semiVirtualFolder = smartStore.virtualize(virtualFolder);
assertNotNull(semiVirtualFolder);
// access virtual entry
diff --git a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
index eb0723a33f..e094c4acbd 100644
--- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
@@ -57,7 +57,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
private NodeRef virtualContent;
- private VirtualStoreImpl virtualStore;
+ private VirtualStoreImpl smartStore;
/** original user permissions to be restored on tear down */
private VirtualUserPermissions savedUserPermissions;
@@ -68,7 +68,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
super.setUp();
// we set our own virtual user permissions in order to be context xml
// independent
- virtualStore = VirtualPermissionServiceExtensionTest.ctx.getBean("virtualStore",
+ smartStore = VirtualPermissionServiceExtensionTest.ctx.getBean("smartStore",
VirtualStoreImpl.class);
permissionService = VirtualPermissionServiceExtensionTest.ctx.getBean("permissionServiceImpl",
@@ -115,19 +115,19 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
protected void setUpTestPermissions()
{
// we save the original permissions
- savedUserPermissions = virtualStore.getUserPermissions();
+ savedUserPermissions = smartStore.getUserPermissions();
VirtualUserPermissions testPermissions = new VirtualUserPermissions(savedUserPermissions);
- Set allowVirtualNodes = new HashSet<>(savedUserPermissions.getAllowVirtualNodes());
+ Set allowSmartNodes = new HashSet<>(savedUserPermissions.getAllowSmartNodes());
// we force create children on virtual nodes
- allowVirtualNodes.add(PermissionService.CREATE_CHILDREN);
+ allowSmartNodes.add(PermissionService.CREATE_CHILDREN);
- testPermissions.setAllowVirtualNodes(allowVirtualNodes);
+ testPermissions.setAllowSmartNodes(allowSmartNodes);
testPermissions.init();
- virtualStore.setUserPermissions(testPermissions);
+ smartStore.setUserPermissions(testPermissions);
}
@Override
@@ -135,7 +135,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
{
if (savedUserPermissions != null)
{
- virtualStore.setUserPermissions(savedUserPermissions);
+ smartStore.setUserPermissions(savedUserPermissions);
savedUserPermissions = null;
}
@@ -617,7 +617,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
private String asTypedPermission(String perm)
{
- return virtualStore.getUserPermissions().getPermissionTypeQName() + "." + perm;
+ return smartStore.getUserPermissions().getPermissionTypeQName() + "." + perm;
}
}
diff --git a/source/test-java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java b/source/test-java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java
index 63260b723d..0670388b68 100644
--- a/source/test-java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java
@@ -109,7 +109,7 @@ public class PlainReferenceParserTest extends AbstractReferenceParserTest
// testing parse for node protocol with an repository node as reference
// parameter
Reference reference = new PlainReferenceParser()
- .parse("node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:node:workspace:SpacesStore:0029-122-333-0023:ref:node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:path:/Foo/Bar:s:vm_virtual:*");
+ .parse("node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:node:workspace:SpacesStore:0029-122-333-0023:ref:node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:path:/Foo/Bar:s:sf_smartFolder:*");
RepositoryResource rr = new RepositoryResource(new RepositoryNodeRef(new NodeRef("workspace://SpacesStore/0029-122-333-0023")));
List params = Arrays. asList(new ResourceParameter(rr),
@@ -137,11 +137,11 @@ public class PlainReferenceParserTest extends AbstractReferenceParserTest
// testing parse for node protocol with an repository path and a string
// as reference parameters
reference = new PlainReferenceParser()
- .parse("node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:path:/Foo/Bar:s:vm_virtual");
+ .parse("node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:path:/Foo/Bar:s:sf_smartFolder");
rr = new RepositoryResource(new RepositoryPath("/Foo/Bar"));
params = Arrays. asList(new ResourceParameter(rr),
- new StringParameter("vm_virtual"));
+ new StringParameter("sf_smartFolder"));
assertEquals(reference,
new Reference(Encodings.PLAIN.encoding,
Protocols.NODE.protocol,
diff --git a/source/test-java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java b/source/test-java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java
index 073f840af5..53a457271d 100644
--- a/source/test-java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java
@@ -209,11 +209,11 @@ public class ZeroReferenceParserTest extends AbstractReferenceParserTest
// testing parse for node protocol with an repository path and a string
// as resource and respectively String parameters
- reference = new ZeroReferenceParser().parse("7:0029-222-333-444:0:/Foo/Bar:s:vm_virtual");
+ reference = new ZeroReferenceParser().parse("7:0029-222-333-444:0:/Foo/Bar:s:sf_smartFolder");
rr = new RepositoryResource(new RepositoryPath("/Foo/Bar"));
params = Arrays. asList(new ResourceParameter(rr),
- new StringParameter("vm_virtual"));
+ new StringParameter("sf_smartFolder"));
assertEquals(reference,
new Reference(Encodings.ZERO.encoding,
Protocols.NODE.protocol,
diff --git a/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java b/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
index 43fda186ed..2d83ccf0e4 100644
--- a/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
@@ -42,14 +42,14 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
{
private static Log logger = LogFactory.getLog(VirtualStoreImplTest.class);
- private VirtualStoreImpl virtualStore;
+ private VirtualStoreImpl smartStore;
@Override
protected void setUp() throws Exception
{
super.setUp();
- virtualStore = ctx.getBean("virtualStore",
+ smartStore = ctx.getBean("smartStore",
VirtualStoreImpl.class);
}
@@ -96,7 +96,7 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
// We use transactional-synchronized resources for caching. In
// non-transactional contexts they might not be available.
- virtualStore.resolveVirtualFolderDefinition(aVanillaRef);
+ smartStore.resolveVirtualFolderDefinition(aVanillaRef);
}
finally
@@ -123,11 +123,11 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
NodeRef aNodeRef = createVirtualizedFolder(testRootFolder.getNodeRef(),
"TestVirtualStoreImpl_createVirtualizedFolder",
null);
- assertFalse(virtualStore.canVirtualize(aNodeRef));
+ assertFalse(smartStore.canVirtualize(aNodeRef));
try
{
- virtualStore.virtualize(aNodeRef);
+ smartStore.virtualize(aNodeRef);
fail("Should not be able to virtualize non-virtualizable nodes.");
}
catch (VirtualizationException e)
@@ -140,19 +140,19 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
public void testCanVirtualize() throws Exception
{
NodeRef solrFacetsNodeRef = new NodeRef("workspace://SpacesStore/solr_facets_root_space");
- boolean canVirtualize = virtualStore.canVirtualize(solrFacetsNodeRef);
+ boolean canVirtualize = smartStore.canVirtualize(solrFacetsNodeRef);
assertEquals(false,
canVirtualize);
}
private String asTypedPermission(String perm)
{
- return virtualStore.getUserPermissions().getPermissionTypeQName() + "." + perm;
+ return smartStore.getUserPermissions().getPermissionTypeQName() + "." + perm;
}
private void assertHasQueryNodePermission(AccessStatus accessStatus, String perm)
{
- VirtualUserPermissions virtualUserPermissions = virtualStore.getUserPermissions();
+ VirtualUserPermissions virtualUserPermissions = smartStore.getUserPermissions();
assertEquals(AccessStatus.DENIED,
virtualUserPermissions.hasQueryNodePermission(perm));
@@ -162,7 +162,7 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
private void assertHasVirtualNodePermission(AccessStatus accessStatus, String perm, boolean readonly)
{
- VirtualUserPermissions virtualUserPermissions = virtualStore.getUserPermissions();
+ VirtualUserPermissions virtualUserPermissions = smartStore.getUserPermissions();
assertEquals(AccessStatus.DENIED,
virtualUserPermissions.hasVirtualNodePermission(perm,