From d7dd06fac31080be93e87d2951987182e1222015 Mon Sep 17 00:00:00 2001 From: Ramona Neamtu Date: Wed, 17 Feb 2016 12:01:10 +0000 Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1) 122265 slanglois: Merged 5.1.0 (5.1.0) to HEAD (5.1) 122178 slanglois: Merged DEV/ACE-5111 to 5.1.0 122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco-global.properties.sample | 10 ++--- .../example_smartfoldertemplates.acp | Bin 2451 -> 2418 bytes .../messages/smartfolder-model.properties | 40 +++++++++--------- .../messages/smartfolder-model_de.properties | 40 +++++++++--------- .../messages/smartfolder-model_es.properties | 40 +++++++++--------- .../messages/smartfolder-model_fr.properties | 40 +++++++++--------- .../messages/smartfolder-model_it.properties | 40 +++++++++--------- .../messages/smartfolder-model_ja.properties | 40 +++++++++--------- .../messages/smartfolder-model_nb.properties | 40 +++++++++--------- .../messages/smartfolder-model_nl.properties | 40 +++++++++--------- .../smartfolder-model_pt_BR.properties | 40 +++++++++--------- .../messages/smartfolder-model_ru.properties | 40 +++++++++--------- .../smartfolder-model_zh_CN.properties | 40 +++++++++--------- config/alfresco/model/smartfolder-model.xml | 28 ++++++------ config/alfresco/repository.properties | 10 ++--- .../SystemTemplateLocationsConstraint.java | 2 +- .../VirtualizationIntegrationTest.java | 4 +- .../VirtualNodeServiceExtensionTest.java | 6 +-- .../virtual/ref/PlainReferenceParserTest.java | 6 +-- .../virtual/ref/ZeroReferenceParserTest.java | 4 +- 20 files changed, 255 insertions(+), 255 deletions(-) diff --git a/config/alfresco-global.properties.sample b/config/alfresco-global.properties.sample index 2f1f41f56f..a76e00e0a1 100644 --- a/config/alfresco-global.properties.sample +++ b/config/alfresco-global.properties.sample @@ -181,22 +181,22 @@ smart.folders.model.labels=alfresco/messages/smartfolder-model #System virtualization method config #System virtualization method aspect. -#smart.folders.config.system.aspect=sf:systemConfigSmartFolder +#smart.folders.config.system.aspect=smf:systemConfigSmartFolder #System virtualization method aspect defined template location property. -#smart.folders.config.system.aspect.template.location.property=sf:system-template-location +#smart.folders.config.system.aspect.template.location.property=smf: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=sf:smartFolderTemplate +#smart.folders.config.system.templates.template.type=smf:smartFolderTemplate #Custom virtualization method config #Custom virtualization method aspect. -#smart.folders.config.custom.aspect=sf:customConfigSmartFolder +#smart.folders.config.custom.aspect=smf:customConfigSmartFolder #Custom virtualization method aspect template content association. -#smart.folders.config.custom.aspect.template.association=sf:custom-template-association +#smart.folders.config.custom.aspect.template.association=smf:custom-template-association #Type virtualization method config diff --git a/config/alfresco/bootstrap/example_smartfoldertemplates.acp b/config/alfresco/bootstrap/example_smartfoldertemplates.acp index ddf72186decc0a71eeb7ac8167567a76bae6d02d..b836f66df3ea087741446be46d62f82146788f74 100644 GIT binary patch delta 592 zcmV-W0&}M->792mn1_Oh|{=^h+TE008#}001VFz5*o%E_iKhl~s|4AQY2* z2>9m+n z$f-iVc4;#b9#@wWk2z4w^C~io<JYN(g1Xl_zwjE_d+q(;{)xjpY+muiojmTFy(UII`AX`m)@hnmuS_JA7Jv%in(tW zdg-Mb_kR2CXWj`o$5vEvcE4k=9Gr`!o!O@6qgPF07nvfZ%M6QNDoDWZ**%A!li2~S z`K4vJ6fX{%{9ukFF~n?kvl`p^CslK_Vw27E5u{_Ia0}6*7j!_PT0WZMyVV zZus#N#;)J6_7Ah80@(#26aW+e0ssgAJzq>nhuHK>Ap!sZ_XYp}CIA2c000000h65w eFO%>HDgveglfMEzlUWHc3RVFC00syE0002dNfe6! delta 625 zcmew)G+B6pyC?$#2ZL&)jR)tuU{N_H28J(e3=C?M4>GB;=~d+B%ng~?t{`&Gj^$6e zn%}pi`$DW2bM`!b|McVHiM!S69a)+SZ%p|uaHntM<(DCaSF0TowO`M_X>r=dqT48< zK5?<$N|B>W7At<}W0&*3t~6)v*N4&fjo#hyi+Hvv`PL6{)9(*g zZeO+djp=C-HTAOW&}4hT_sZ`Xw*=c9*rW31y7-b@_AbtBrWpqo9eW}>-Hdz21WuXy zmhL;vA9_4ECoBnHyKY9F_L)l)H2&WIU36CE&@|=#Hp!DaeJ2%ras8WRx!`^h-;C|w zIc87!si3UO7qsfaS^K^pcdx=6w&s5}H^pXrAQf+7_X# z_Vml_-j{3Tjie0&syoeUS9i>MrcoSuBwGDjP-%Vq&Sf?yV^>bN+}dok`hCRid^7+4Umt76=Qp~v*1an~TU4NCH2+N5Kf9`{XWl3U z@_deNbJZ7p;QIZ^%){q5-(+0-bE&Frr#QQBmErN3vvkw8@7_4qp3ivELgowWSQXFp zL~MJs?d@qzN9`1z?k)Z1TYsMX|NFP!WaHF7ng1C!FJrpNs%Xz3!hkg?FsJ~ - + Smart Folder Model Alfresco @@ -16,11 +16,11 @@ - + - + systemTemplateLocations @@ -29,7 +29,7 @@ - + Smart Folder Template cm:content @@ -38,26 +38,26 @@ - + Smart Folder A smart container node - + Smart Folder Child - + Virtualization - + Custom Smart Folder - sf:virtualization + smf:virtualization - + Smart Folder Template false @@ -72,16 +72,16 @@ - + System Smart Folder - sf:virtualization + smf:virtualization - + Smart Folder Template d:text true - + diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties index a5f1101527..4a10a1f4e0 100644 --- a/config/alfresco/repository.properties +++ b/config/alfresco/repository.properties @@ -1133,22 +1133,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=sf:systemConfigSmartFolder +smart.folders.config.system.aspect=smf:systemConfigSmartFolder #System virtualization method aspect defined template location property. -smart.folders.config.system.aspect.template.location.property=sf:system-template-location +smart.folders.config.system.aspect.template.location.property=smf: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=sf:smartFolderTemplate +smart.folders.config.system.templates.template.type=smf:smartFolderTemplate #Custom virtualization method config #Custom virtualization method aspect. -smart.folders.config.custom.aspect=sf:customConfigSmartFolder +smart.folders.config.custom.aspect=smf:customConfigSmartFolder #Custom virtualization method aspect template content association. -smart.folders.config.custom.aspect.template.association=sf:custom-template-association +smart.folders.config.custom.aspect.template.association=smf:custom-template-association #Type virtualization method config diff --git a/source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java b/source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java index 277f8a5bab..7ad17168f6 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 = "sf_smartFolder.nullSystemTemplate.message"; + public static final String NULL_SYSTEM_TEMPLATE_MESSAGE = "smf_smartFolder.nullSystemTemplate.message"; private NodeService nodeService; diff --git a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java index cbe3203a84..92bf85f379 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_sf_system-template-location"; + private static final String PROP_VM_TEMPLATE_CLASSPATH = "prop_smf_system-template-location"; protected static final String VIRTUAL_FOLDER_1_NAME = "VirtualFolder1"; @@ -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,sf:systemConfigSmartFolder"); + "cm:folder,smf: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 e551d0035a..1a9950fd95 100644 --- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java +++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java @@ -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/sf:Node2", + assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/smf: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/sf:Node2/cm:testfile.txt", + assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/smf: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/sf:Node2/sf:Node2_1/cm:testfile-1.txt", + assertEquals("/app:company_home/cm:TestFolder/cm:VirtualFolder1/smf:Node2/smf:Node2_1/cm:testfile-1.txt", path_1.toPrefixString(environment.getNamespacePrefixResolver())); } 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 0670388b68..a6977f2923 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:sf_smartFolder:*"); + .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:smf_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:sf_smartFolder"); + .parse("node:repository:node:workspace:SpacesStore:0029-222-333-444:r:repository:path:/Foo/Bar:s:smf_smartFolder"); rr = new RepositoryResource(new RepositoryPath("/Foo/Bar")); params = Arrays. asList(new ResourceParameter(rr), - new StringParameter("sf_smartFolder")); + new StringParameter("smf_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 53a457271d..7280108a97 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:sf_smartFolder"); + reference = new ZeroReferenceParser().parse("7:0029-222-333-444:0:/Foo/Bar:s:smf_smartFolder"); rr = new RepositoryResource(new RepositoryPath("/Foo/Bar")); params = Arrays. asList(new ResourceParameter(rr), - new StringParameter("sf_smartFolder")); + new StringParameter("smf_smartFolder")); assertEquals(reference, new Reference(Encodings.ZERO.encoding, Protocols.NODE.protocol,