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 
121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-01-29 14:49:19 +00:00
parent c1d4fccc48
commit 9f2d3441df
63 changed files with 643 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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_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,