RM: Adjust the way the unfiled container is modelled and created.

*  means search and other navigation paths work correctly
 *  will allow the navigation of the unfiled container via other UI's and API's much easier
 *  created the file plan service
 *  methods relating to the unfiled container now encapsulated in the file plan service
 *  TODO move many of the methods in the records management service into the file plan service .. with the ultimate aim of deprecating the catch-all records management service!
 * delt with fall out from changes
 * relates to RM-583

NOTE:  you will need to recreate any db's previously created on the 2.1 development branch ... any pre-2.1 will be fine and patch correctly.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@45823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-01-24 05:53:41 +00:00
parent 3b3569bb59
commit fcabe577a3
19 changed files with 532 additions and 400 deletions

View File

@@ -359,21 +359,4 @@ public class RecordServiceImplTest extends BaseRMTestCase
assertEquals(recordExpected,
dmPermissionService.hasPermission(dmDocument, permission));
}
/**
* @see RecordService#getUnfiledContainer(org.alfresco.service.cmr.repository.NodeRef)
*/
public void testGetUnfiledContainer() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
assertNotNull(recordService.getUnfiledContainer(filePlan));
return null;
}
});
}
}

View File

@@ -32,6 +32,7 @@ import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RmSiteType;
@@ -130,6 +131,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected DataSetService dataSetService;
protected FreezeService freezeService;
protected RecordService recordService;
protected FilePlanService filePlanService;
/** test data */
protected StoreRef storeRef;
@@ -347,6 +349,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
freezeService = (FreezeService) applicationContext.getBean("FreezeService");
recordService = (RecordService) applicationContext.getBean("RecordService");
filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
}
/**
@@ -427,7 +430,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
utils.declareRecord(recordDeclaredTwo);
// unfiled container
unfiledContainer = recordService.getUnfiledContainer(filePlan);
unfiledContainer = filePlanService.getUnfiledContainer(filePlan);
assertNotNull(unfiledContainer);
}
}