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

RM-1162: CLONE - Alfresco 4.2.1 could not start with RM module

Browse Source 
* see MNT-10259



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@60429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-01-23 01:47:00 +00:00
parent 0fee81f854
commit ec5ef73a1f
14 changed files with 73 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
View File

@@ -97,9 +97,6 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected QName ASPECT_CUSTOM_ASPECT = QName.createQName(URI, "customAspect");
protected QName ASPECT_RECORD_META_DATA = QName.createQName(URI, "recordMetaData");
/** site id's */
protected static final String COLLABORATION_SITE_ID = "collab-site-id";
/** Common test utils */
protected CommonRMTestUtils utils;
@@ -151,6 +148,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected DispositionSchedule dispositionSchedule;
protected NodeRef rmFolder;
protected NodeRef unfiledContainer;
protected String collabSiteId;
/** multi-hierarchy test data
*
@@ -428,9 +426,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
}
// delete the collaboration site (if required)
if (isCollaborationSiteTest() == true && siteService.getSite(COLLABORATION_SITE_ID) != null)
if (isCollaborationSiteTest() == true && siteService.getSite(collabSiteId) != null)
{
siteService.deleteSite(COLLABORATION_SITE_ID);
siteService.deleteSite(collabSiteId);
}
}
finally
@@ -709,9 +707,10 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected void setupCollaborationSiteTestDataImpl()
{
// create collaboration site
collaborationSite = siteService.createSite("preset", COLLABORATION_SITE_ID, "title", "description", SiteVisibility.PRIVATE);
collabSiteId = GUID.generate();
collaborationSite = siteService.createSite("preset", collabSiteId, "title", "description", SiteVisibility.PRIVATE);
documentLibrary = SiteServiceImpl.getSiteContainer(
COLLABORATION_SITE_ID,
collabSiteId,
SiteService.DOCUMENT_LIBRARY,
true,
siteService,
@@ -726,11 +725,11 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
dmConsumer = GUID.generate();
dmConsumerNodeRef = createPerson(dmConsumer);
siteService.setMembership(COLLABORATION_SITE_ID, dmConsumer, SiteModel.SITE_CONSUMER);
siteService.setMembership(collabSiteId, dmConsumer, SiteModel.SITE_CONSUMER);
dmCollaborator = GUID.generate();
dmCollaboratorNodeRef = createPerson(dmCollaborator);
siteService.setMembership(COLLABORATION_SITE_ID, dmCollaborator, SiteModel.SITE_COLLABORATOR);
siteService.setMembership(collabSiteId, dmCollaborator, SiteModel.SITE_COLLABORATOR);
}
/**

11
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java
View File

@@ -71,9 +71,6 @@ import org.springframework.context.ApplicationContext;
*/
public class BaseRMWebScriptTestCase extends BaseWebScriptTest
{
/** Collab site id */
protected static final String COLLAB_SITE_ID = "myCollabSite";
/** Common test utils */
protected CommonRMTestUtils utils;
@@ -121,6 +118,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
protected DispositionSchedule dispositionSchedule;
protected NodeRef recordFolder;
protected NodeRef recordFolder2;
protected String collabSiteId;
/**
* Indicates whether the test collaboration site should be created
@@ -219,7 +217,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
// Delete the collaboration site (if required)
if (isCollaborationSiteTest() == true)
{
siteService.deleteSite(COLLAB_SITE_ID);
siteService.deleteSite(collabSiteId);
}
}
@@ -325,9 +323,10 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
protected void setupCollaborationSiteTestDataImpl()
{
// create collaboration site
siteService.createSite("preset", COLLAB_SITE_ID, "title", "description", SiteVisibility.PRIVATE);
String collabSiteId = GUID.generate();
siteService.createSite("preset", collabSiteId, "title", "description", SiteVisibility.PRIVATE);
NodeRef documentLibrary = SiteServiceImpl.getSiteContainer(
COLLAB_SITE_ID,
collabSiteId,
SiteService.DOCUMENT_LIBRARY,
true,
siteService,