inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-1095: Fixed circular dependency issues

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@57939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-11-15 17:41:57 +00:00
parent cd1f4f9cc6
commit 62bfe1d4e7
8 changed files with 51 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
View File

@@ -12,9 +12,8 @@
<property name="freezeService" ref="FreezeService" /> <property name="freezeService" ref="FreezeService" />
<property name="recordService" ref="RecordService" /> <property name="recordService" ref="RecordService" />
<property name="filePlanService" ref="FilePlanService" /> <property name="filePlanService" ref="FilePlanService" />
<!-- FIXME --> <property name="dispositionService" ref="DispositionService" />
<property name="dispositionService" ref="dispositionService" /> <property name="recordFolderService" ref="RecordFolderService" />
<property name="recordFolderService" ref="recordFolderService" />
</bean> </bean>
<bean id="capabilityCondition.frozen" <bean id="capabilityCondition.frozen"

3
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
View File

@@ -137,8 +137,7 @@
<property name="recordService" ref="recordService"/> <property name="recordService" ref="recordService"/>
<property name="parameterProcessorComponent" ref="parameterProcessorComponent"/> <property name="parameterProcessorComponent" ref="parameterProcessorComponent"/>
<property name="modelSecurityService" ref="modelSecurityService" /> <property name="modelSecurityService" ref="modelSecurityService" />
<!-- FIXME --> <property name="recordFolderService" ref="RecordFolderService" />
<property name="recordFolderService" ref="recordFolderService" />
</bean> </bean>
<bean id="rmProxyAction" <bean id="rmProxyAction"

1
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
View File

@@ -91,7 +91,6 @@
<property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/> <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
<property name="vitalRecordService" ref="VitalRecordService"/> <property name="vitalRecordService" ref="VitalRecordService"/>
<property name="nodeService" ref="nodeService"/> <property name="nodeService" ref="nodeService"/>
<!-- FIXME -->
<property name="recordService" ref="recordService"/> <property name="recordService" ref="recordService"/>
<property name="recordFolderService" ref="RecordFolderService"/> <property name="recordFolderService" ref="RecordFolderService"/>
</bean> </bean>

42
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -184,9 +184,8 @@
<property name="behaviourFilter" ref="policyBehaviourFilter" /> <property name="behaviourFilter" ref="policyBehaviourFilter" />
<property name="policyComponent" ref="policyComponent" /> <property name="policyComponent" ref="policyComponent" />
<property name="filePlanService" ref="FilePlanService" /> <property name="filePlanService" ref="FilePlanService" />
<!-- FIXME --> <property name="recordFolderService" ref="RecordFolderService"/>
<!-- <property name="recordFolderService" ref="RecordFolderService"/> --> <property name="recordService" ref="RecordService"/>
<property name="recordService" ref="recordService"/>
<property name="dispositionSelectionStrategy"> <property name="dispositionSelectionStrategy">
<ref local="org_alfresco_module_rm_dispositionSelectionStrategy" /> <ref local="org_alfresco_module_rm_dispositionSelectionStrategy" />
</property> </property>
@@ -196,8 +195,12 @@
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService</value> <value>org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService</value>
</property> </property>
<property name="target"> <property name="targetSource">
<ref bean="dispositionService"/> <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
<property name="targetBeanName">
<idref bean="dispositionService"/>
</property>
</bean>
</property> </property>
<property name="interceptorNames"> <property name="interceptorNames">
<list> <list>
@@ -975,9 +978,8 @@
<bean id="freezeService" class="org.alfresco.module.org_alfresco_module_rm.freeze.FreezeServiceImpl" init-method="init"> <bean id="freezeService" class="org.alfresco.module.org_alfresco_module_rm.freeze.FreezeServiceImpl" init-method="init">
<property name="policyComponent" ref="policyComponent" /> <property name="policyComponent" ref="policyComponent" />
<property name="nodeService" ref="nodeService" /> <property name="nodeService" ref="nodeService" />
<property name="dictionaryService" ref="dictionaryService" /> <property name="dictionaryService" ref="DictionaryService" />
<!-- FIXME --> <property name="recordService" ref="RecordService" />
<property name="recordService" ref="recordService" />
<property name="filePlanService" ref="FilePlanService" /> <property name="filePlanService" ref="FilePlanService" />
<property name="permissionService" ref="PermissionService" /> <property name="permissionService" ref="PermissionService" />
<property name="filePlanRoleService" ref="FilePlanRoleService" /> <property name="filePlanRoleService" ref="FilePlanRoleService" />
@@ -1130,9 +1132,8 @@
<property name="policyComponent" ref="policyComponent" /> <property name="policyComponent" ref="policyComponent" />
<property name="dispositionService" ref="DispositionService" /> <property name="dispositionService" ref="DispositionService" />
<property name="dictionaryService" ref="DictionaryService" /> <property name="dictionaryService" ref="DictionaryService" />
<!-- FIXME --> <property name="filePlanService" ref="FilePlanService" />
<!-- <property name="filePlanService" ref="FilePlanService" /> --> <property name="recordService" ref="RecordService" />
<!-- <property name="recordService" ref="RecordService" /> -->
</bean> </bean>
<bean id="RecordFolderService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="RecordFolderService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -1180,6 +1181,7 @@
org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.isRecordFolderClosed=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.isRecordFolderClosed=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.createRecordFolder=RM.Write.0 org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.createRecordFolder=RM.Write.0
org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.getRecordFolders=RM.Read.0,AFTER_RM.FilterNode org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.getRecordFolders=RM.Read.0,AFTER_RM.FilterNode
org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.initialiseRecordFolder=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.*=RM_DENY org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService.*=RM_DENY
]]> ]]>
</value> </value>
@@ -1195,24 +1197,26 @@
<property name="permissionService" ref="ExtendedPermissionService"/> <property name="permissionService" ref="ExtendedPermissionService"/>
<property name="extendedSecurityService" ref="ExtendedSecurityService" /> <property name="extendedSecurityService" ref="ExtendedSecurityService" />
<property name="policyComponent" ref="policyComponent" /> <property name="policyComponent" ref="policyComponent" />
<!-- FIXME --> <property name="dispositionService" ref="DispositionService" />
<!-- <property name="dispositionService" ref="DispositionService" /> -->
<property name="filePlanService" ref="FilePlanService" /> <property name="filePlanService" ref="FilePlanService" />
<property name="ownableService" ref="OwnableService" /> <property name="ownableService" ref="OwnableService" />
<property name="notificationHelper" ref="recordsManagementNotificationHelper"/> <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
<property name="capabilityService" ref="CapabilityService" /> <property name="capabilityService" ref="CapabilityService" />
<property name="ruleService" ref="RuleService" /> <property name="ruleService" ref="RuleService" />
<property name="fileFolderService" ref="FileFolderService" /> <property name="fileFolderService" ref="FileFolderService" />
<!-- FIXME --> <property name="recordFolderService" ref="RecordFolderService" />
<!-- <property name="recordFolderService" ref="RecordFolderService" /> -->
</bean> </bean>
<bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.module.org_alfresco_module_rm.record.RecordService</value> <value>org.alfresco.module.org_alfresco_module_rm.record.RecordService</value>
</property> </property>
<property name="target"> <property name="targetSource">
<ref bean="recordService"/> <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
<property name="targetBeanName">
<idref bean="recordService"/>
</property>
</bean>
</property> </property>
<property name="interceptorNames"> <property name="interceptorNames">
<list> <list>
@@ -1255,6 +1259,7 @@
org.alfresco.module.org_alfresco_module_rm.record.RecordService.hideRecord=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.record.RecordService.hideRecord=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.record.RecordService.isPropertyEditable=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.record.RecordService.isPropertyEditable=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.record.RecordService.isMetadataStub=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.record.RecordService.isMetadataStub=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.record.RecordService.getRecords=RM.Read.0,AFTER_RM.FilterNode
org.alfresco.module.org_alfresco_module_rm.record.RecordService.*=RM_DENY org.alfresco.module.org_alfresco_module_rm.record.RecordService.*=RM_DENY
]]> ]]>
</value> </value>
@@ -1545,8 +1550,7 @@
<property name="filePlanRoleService" ref="FilePlanRoleService"/> <property name="filePlanRoleService" ref="FilePlanRoleService"/>
<property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour"/> <property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour"/>
<property name="dispositionService" ref="DispositionService"/> <property name="dispositionService" ref="DispositionService"/>
<!-- FIXME --> <property name="recordFolderService" ref="RecordFolderService"/>
<property name="recordFolderService" ref="recordFolderService"/>
</bean> </bean>
<bean id="DataSetService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="DataSetService" class="org.springframework.aop.framework.ProxyFactoryBean">

6
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
View File

@@ -14,16 +14,14 @@
<bean id="jsonConversionComponent.baseEvaluator" <bean id="jsonConversionComponent.baseEvaluator"
abstract="true"> abstract="true">
<property name="jsonConversionComponent" ref="jsonConversionComponent"/> <property name="jsonConversionComponent" ref="jsonConversionComponent"/>
<!-- FIXME --> <property name="recordService" ref="RecordService"/>
<property name="recordService" ref="recordService"/>
<property name="nodeService" ref="NodeService"/> <property name="nodeService" ref="NodeService"/>
<property name="namespaceService" ref="NamespaceService"/> <property name="namespaceService" ref="NamespaceService"/>
<property name="capabilityService" ref="CapabilityService"/> <property name="capabilityService" ref="CapabilityService"/>
<property name="freezeService" ref="FreezeService"/> <property name="freezeService" ref="FreezeService"/>
<property name="filePlanService" ref="FilePlanService" /> <property name="filePlanService" ref="FilePlanService" />
<property name="dispositionService" ref="DispositionService" /> <property name="dispositionService" ref="DispositionService" />
<!-- FIXME --> <property name="recordFolderService" ref="RecordFolderService" />
<property name="recordFolderService" ref="recordFolderService" />
</bean> </bean>
<bean id="jsonConversionComponent.baseIndicator" <bean id="jsonConversionComponent.baseIndicator"

31
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -51,9 +51,6 @@ import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.ParameterCheck; import org.alfresco.util.ParameterCheck;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/** /**
* Disposition service implementation. * Disposition service implementation.
@@ -63,7 +60,6 @@ import org.springframework.context.ApplicationContextAware;
public class DispositionServiceImpl implements public class DispositionServiceImpl implements
DispositionService, DispositionService,
RecordsManagementModel, RecordsManagementModel,
ApplicationContextAware,
NodeServicePolicies.OnAddAspectPolicy NodeServicePolicies.OnAddAspectPolicy
{ {
/** Logger */ /** Logger */
@@ -87,12 +83,8 @@ public class DispositionServiceImpl implements
/** File plan service */ /** File plan service */
private FilePlanService filePlanService; private FilePlanService filePlanService;
/** Application context */
private ApplicationContext applicationContext;
/** Record Folder Service */ /** Record Folder Service */
// FIXME private RecordFolderService recordFolderService;
//private RecordFolderService recordFolderService;
/** Record Service */ /** Record Service */
private RecordService recordService; private RecordService recordService;
@@ -165,10 +157,10 @@ public class DispositionServiceImpl implements
/** /**
* @param recordFolderService record folder service * @param recordFolderService record folder service
*/ */
// public void setRecordFolderService(RecordFolderService recordFolderService) public void setRecordFolderService(RecordFolderService recordFolderService)
// { {
// this.recordFolderService = recordFolderService; this.recordFolderService = recordFolderService;
// } }
/** /**
* @param recordService record service * @param recordService record service
@@ -178,15 +170,6 @@ public class DispositionServiceImpl implements
this.recordService = recordService; this.recordService = recordService;
} }
/**
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.applicationContext = applicationContext;
}
/** /**
* Set the dispositionSelectionStrategy bean. * Set the dispositionSelectionStrategy bean.
* *
@@ -295,8 +278,6 @@ public class DispositionServiceImpl implements
if (serviceRegistry.getRecordService().isRecord(nodeRef) == true) if (serviceRegistry.getRecordService().isRecord(nodeRef) == true)
{ {
// Get the record folders for the record // Get the record folders for the record
// FIXME
RecordFolderService recordFolderService = (RecordFolderService)applicationContext.getBean("recordFolderService");
List<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef); List<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef);
// At this point, we may have disposition instruction objects from 1..n folders. // At this point, we may have disposition instruction objects from 1..n folders.
diNodeRef = dispositionSelectionStrategy.selectDispositionScheduleFrom(recordFolders); diNodeRef = dispositionSelectionStrategy.selectDispositionScheduleFrom(recordFolders);
@@ -469,8 +450,6 @@ public class DispositionServiceImpl implements
{ {
List<NodeRef> items = filePlanService.getAllContained(rmContainer); List<NodeRef> items = filePlanService.getAllContained(rmContainer);
List<NodeRef> result = new ArrayList<NodeRef>(items.size()); List<NodeRef> result = new ArrayList<NodeRef>(items.size());
// FIXME
RecordFolderService recordFolderService = (RecordFolderService)applicationContext.getBean("recordFolderService");
for (NodeRef item : items) for (NodeRef item : items)
{ {
if (recordFolderService.isRecordFolder(item) == true) if (recordFolderService.isRecordFolder(item) == true)

28
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -163,8 +163,7 @@ public class RecordServiceImpl implements RecordService,
private ExtendedSecurityService extendedSecurityService; private ExtendedSecurityService extendedSecurityService;
/** Disposition service */ /** Disposition service */
// FIXME private DispositionService dispositionService;
//private DispositionService dispositionService;
/** File plan service */ /** File plan service */
private FilePlanService filePlanService; private FilePlanService filePlanService;
@@ -188,8 +187,7 @@ public class RecordServiceImpl implements RecordService,
private FileFolderService fileFolderService; private FileFolderService fileFolderService;
/** Record folder service */ /** Record folder service */
// FIXME private RecordFolderService recordFolderService;
//private RecordFolderService recordFolderService;
/** List of available record meta-data aspects */ /** List of available record meta-data aspects */
private Set<QName> recordMetaDataAspects; private Set<QName> recordMetaDataAspects;
@@ -257,10 +255,10 @@ public class RecordServiceImpl implements RecordService,
/** /**
* @param dispositionService disposition service * @param dispositionService disposition service
*/ */
// public void setDispositionService(DispositionService dispositionService) public void setDispositionService(DispositionService dispositionService)
// { {
// this.dispositionService = dispositionService; this.dispositionService = dispositionService;
// } }
/** /**
* @param filePlanService file plan service * @param filePlanService file plan service
@@ -321,10 +319,10 @@ public class RecordServiceImpl implements RecordService,
/** /**
* @param recordFolderService record folder service * @param recordFolderService record folder service
*/ */
// public void setRecordFolderService(RecordFolderService recordFolderService) public void setRecordFolderService(RecordFolderService recordFolderService)
// { {
// this.recordFolderService = recordFolderService; this.recordFolderService = recordFolderService;
// } }
/** /**
* Init method * Init method
@@ -860,8 +858,6 @@ public class RecordServiceImpl implements RecordService,
if (childAssocRef != null) if (childAssocRef != null)
{ {
NodeRef parent = childAssocRef.getParentRef(); NodeRef parent = childAssocRef.getParentRef();
//FIXME
RecordFolderService recordFolderService = (RecordFolderService) applicationContext.getBean("RecordFolderService");
if (parent != null && recordFolderService.isRecordFolder(parent) == true) if (parent != null && recordFolderService.isRecordFolder(parent) == true)
{ {
result = true; result = true;
@@ -913,8 +909,6 @@ public class RecordServiceImpl implements RecordService,
// initialise disposition details // initialise disposition details
if (nodeService.hasAspect(record, ASPECT_DISPOSITION_LIFECYCLE) == false) if (nodeService.hasAspect(record, ASPECT_DISPOSITION_LIFECYCLE) == false)
{ {
//FIXME
DispositionService dispositionService = (DispositionService)applicationContext.getBean("DispositionService");
DispositionSchedule di = dispositionService.getDispositionSchedule(record); DispositionSchedule di = dispositionService.getDispositionSchedule(record);
if (di != null && di.isRecordLevelDisposition() == true) if (di != null && di.isRecordLevelDisposition() == true)
{ {
@@ -1295,8 +1289,6 @@ public class RecordServiceImpl implements RecordService,
ParameterCheck.mandatory("recordFolder", recordFolder); ParameterCheck.mandatory("recordFolder", recordFolder);
List<NodeRef> result = new ArrayList<NodeRef>(1); List<NodeRef> result = new ArrayList<NodeRef>(1);
//FIXME
RecordFolderService recordFolderService = (RecordFolderService) applicationContext.getBean("RecordFolderService");
if (recordFolderService.isRecordFolder(recordFolder) == true) if (recordFolderService.isRecordFolder(recordFolder) == true)
{ {
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(recordFolder, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(recordFolder, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);

39
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
View File

@@ -42,9 +42,6 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.ParameterCheck; import org.alfresco.util.ParameterCheck;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.extensions.surf.util.I18NUtil; import org.springframework.extensions.surf.util.I18NUtil;
/** /**
@@ -56,7 +53,6 @@ import org.springframework.extensions.surf.util.I18NUtil;
public class RecordFolderServiceImpl extends ServiceBaseImpl public class RecordFolderServiceImpl extends ServiceBaseImpl
implements RecordFolderService, implements RecordFolderService,
RecordsManagementModel, RecordsManagementModel,
ApplicationContextAware,
NodeServicePolicies.OnCreateChildAssociationPolicy NodeServicePolicies.OnCreateChildAssociationPolicy
{ {
/** I18N */ /** I18N */
@@ -65,9 +61,6 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl
private final static String MSG_PARENT_RECORD_FOLDER_TYPE = "rm.service.parent-record-folder-type"; private final static String MSG_PARENT_RECORD_FOLDER_TYPE = "rm.service.parent-record-folder-type";
private final static String MSG_RECORD_FOLDER_TYPE = "rm.service.record-folder-type"; private final static String MSG_RECORD_FOLDER_TYPE = "rm.service.record-folder-type";
/** Application context */
private ApplicationContext applicationContext;
/** Policy component */ /** Policy component */
private PolicyComponent policyComponent; private PolicyComponent policyComponent;
@@ -75,10 +68,10 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl
private DispositionService dispositionService; private DispositionService dispositionService;
/** Record Service */ /** Record Service */
// private RecordService recordService; private RecordService recordService;
/** File Plan Service */ /** File Plan Service */
// private FilePlanService filePlanService; private FilePlanService filePlanService;
/** Behaviours */ /** Behaviours */
private JavaBehaviour onCreateChildAssociation private JavaBehaviour onCreateChildAssociation
@@ -109,26 +102,17 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl
/** /**
* @param recordService record service * @param recordService record service
*/ */
// public void setRecordService(RecordService recordService) public void setRecordService(RecordService recordService)
// { {
// this.recordService = recordService; this.recordService = recordService;
// } }
/** /**
* @param filePlanService file plan service * @param filePlanService file plan service
*/ */
// public void setFilePlanService(FilePlanService filePlanService) public void setFilePlanService(FilePlanService filePlanService)
// {
// this.filePlanService = filePlanService;
// }
/**
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{ {
this.applicationContext = applicationContext; this.filePlanService = filePlanService;
} }
/** /**
@@ -230,9 +214,6 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl
boolean result = true; boolean result = true;
// Check that each record in the record folder in declared // Check that each record in the record folder in declared
// FIXME
RecordService recordService = (RecordService) applicationContext.getBean("recordService");
List<NodeRef> records = recordService.getRecords(nodeRef); List<NodeRef> records = recordService.getRecords(nodeRef);
for (NodeRef record : records) for (NodeRef record : records)
{ {
@@ -287,8 +268,6 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl
// "properties" is not mandatory // "properties" is not mandatory
// Check that we are not trying to create a record folder in a root container // Check that we are not trying to create a record folder in a root container
// FIXME
FilePlanService filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
if (filePlanService.isFilePlan(rmContainer) == true) if (filePlanService.isFilePlan(rmContainer) == true)
{ {
throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_PARENT_RECORD_FOLDER_ROOT)); throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_PARENT_RECORD_FOLDER_ROOT));
@@ -360,8 +339,6 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl
ParameterCheck.mandatory("record", record); ParameterCheck.mandatory("record", record);
List<NodeRef> result = new ArrayList<NodeRef>(1); List<NodeRef> result = new ArrayList<NodeRef>(1);
// FIXME
RecordService recordService = (RecordService) applicationContext.getBean("RecordService");
if (recordService.isRecord(record) == true) if (recordService.isRecord(record) == true)
{ {
List<ChildAssociationRef> assocs = this.nodeService.getParentAssocs(record, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> assocs = this.nodeService.getParentAssocs(record, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);