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 BRANCHES/DEV/VF_REP_INT_51 to HEAD

Browse Source 
ACE-4716 Can't rename a document in a virtual context from CMIS
ACE-4752 Type virtualization method does not work
ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mihai Cozma
2015-12-02 14:27:31 +00:00
parent 75a5b793e5
commit 6f16b07e61
29 changed files with 1228 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.forms.FormData;
import org.alfresco.repo.forms.Item;
import org.alfresco.repo.model.Repository;
import org.alfresco.repo.node.integrity.IntegrityChecker;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -53,6 +52,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
@@ -129,45 +129,73 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
protected static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(CONFIG_LOCATIONS);
protected ContentService contentService;
private TransactionService transactionService;
protected FileInfo testRootFolder;
protected FileFolderService fileAndFolderService;
protected ActualEnvironment environment;
protected ContentService contentService;
protected NodeRef virtualFolder1NodeRef;
protected TransactionService transactionService;
protected NodeService nodeService;
protected PermissionService permissionService;
protected SearchService searchService;
protected RetryingTransactionHelper retryingTransactionHelper;
protected FileInfo testRootFolder;
protected NodeRef virtualFolder1NodeRef;
protected NodeRef rootNodeRef;
protected ActualEnvironment environment;
protected TypeAndAspectsFormProcessor typeAndAspectsFormProcessor;
private UserTransaction txn;
protected AuthenticationComponent authenticationComponent;
protected PermissionService permissionService;
/** The root node reference */
protected NodeRef rootNodeRef;
protected VirtualizationConfigTestBootstrap virtualizationConfigTestBootstrap;
protected String configuredTemplatesClassPath = null;
protected SystemTemplateLocationsConstraint constraints;
/** when set to a not-null value will be restored up[on {@link #tearDown()} */
protected String configuredTemplatesClassPath = null;
@Override
protected void setUp() throws Exception
{
virtualizationConfigTestBootstrap = ctx.getBean(VIRTUALIZATION_CONFIG_TEST_BOOTSTRAP_BEAN_ID,
VirtualizationConfigTestBootstrap.class);
// Get the required services
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry");
transactionService = serviceRegistry.getTransactionService();
retryingTransactionHelper = serviceRegistry.getRetryingTransactionHelper();
nodeService = serviceRegistry.getNodeService();
contentService = serviceRegistry.getContentService();
fileAndFolderService = serviceRegistry.getFileFolderService();
permissionService = serviceRegistry.getPermissionService();
searchService=serviceRegistry.getSearchService();
authenticationComponent = ctx.getBean("authenticationComponent",
AuthenticationComponent.class);
environment = ctx.getBean("actualEnvironment",
ActualEnvironment.class);
typeAndAspectsFormProcessor = ctx.getBean("typeAndAspectsFormProcessor",
TypeAndAspectsFormProcessor.class);
constraints = ctx.getBean("systemTemplateLocations",
SystemTemplateLocationsConstraint.class);
Repository repository = ctx.getBean("repositoryHelper",
Repository.class);
if (!virtualizationConfigTestBootstrap.areVirtualFoldersEnabled())
{
// "use the force" and enable virtual folders
@@ -180,23 +208,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
logger.info("Virtual folders are spring-enabled.");
}
// Get the required services
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry");
transactionService = serviceRegistry.getTransactionService();
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
retryingTransactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper");
this.authenticationComponent.setSystemUserAsCurrentUser();
permissionService = (PermissionService) ctx.getBean("PermissionService");
contentService = ctx.getBean("contentService",
ContentService.class);
environment = ctx.getBean("actualEnvironment",
ActualEnvironment.class);
fileAndFolderService = serviceRegistry.getFileFolderService();
Repository repository = ctx.getBean("repositoryHelper",
Repository.class);
// start the transaction
txn = transactionService.getUserTransaction();
@@ -207,12 +219,6 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
testRootFolder = fileAndFolderService.create(root,
TEST_ROOT_FOLDER_NAME,
ContentModel.TYPE_FOLDER);
nodeService = ctx.getBean("nodeService",
NodeService.class);
typeAndAspectsFormProcessor = ctx.getBean("typeAndAspectsFormProcessor",
TypeAndAspectsFormProcessor.class);
constraints = ctx.getBean("systemTemplateLocations",
SystemTemplateLocationsConstraint.class);
virtualFolder1NodeRef = createVirtualizedFolder(testRootFolder.getNodeRef(),
VIRTUAL_FOLDER_1_NAME,