inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
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
This commit is contained in:
Ramona Neamtu
2016-02-17 12:01:10 +00:00
parent b335799e86
commit d7dd06fac3
20 changed files with 255 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
View File

@@ -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,