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

* Code refactored (FreezeService & RecordService)

Browse Source 
* Test class for RecordService added

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@43608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2012-11-14 14:29:26 +00:00
parent 24db12b7df
commit 80afd72288
16 changed files with 597 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
<property name="recordsManagementService" ref="recordsManagementService" />
<property name="permissionService" ref="PermissionService" />
<property name="nodeService" ref="NodeService" />
<property name="freezeService" ref="freezeService" />
<property name="freezeService" ref="FreezeService" />
</bean>
<bean id="capabilityCondition.frozen"

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

@@ -399,7 +399,7 @@
<bean id="freeze" class="org.alfresco.module.org_alfresco_module_rm.action.impl.FreezeAction" parent="rmAction" depends-on="rmExtendRetentionPeriodOrFreezeCapability">
<property name="capability" ref="rmExtendRetentionPeriodOrFreezeCapability" />
<property name="freezeService" ref="freezeService" />
<property name="freezeService" ref="FreezeService" />
</bean>
<!-- Unfreeze record -->
@@ -427,7 +427,7 @@
<bean id="unfreeze" class="org.alfresco.module.org_alfresco_module_rm.action.impl.UnfreezeAction" parent="rmAction" depends-on="rmUnfreezeCapability">
<property name="capability" ref="rmUnfreezeCapability" />
<property name="freezeService" ref="freezeService" />
<property name="freezeService" ref="FreezeService" />
</bean>
<!-- Relinquish Hold Action-->
@@ -445,7 +445,7 @@
<bean id="relinquishHold" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RelinquishHoldAction" parent="rmAction" depends-on="rmUnfreezeCapability">
<property name="capability" ref="rmUnfreezeCapability" />
<property name="freezeService" ref="freezeService" />
<property name="freezeService" ref="FreezeService" />
</bean>
<!-- Edit hold reason -->
@@ -473,7 +473,7 @@
<bean id="editHoldReason" class="org.alfresco.module.org_alfresco_module_rm.action.impl.EditHoldReasonAction" parent="rmAction" depends-on="rmViewUpdateReasonsForFreezeCapability">
<property name="capability" ref="rmViewUpdateReasonsForFreezeCapability" />
<property name="freezeService" ref="freezeService" />
<property name="freezeService" ref="FreezeService" />
</bean>
<!-- Edit review as of date -->

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

@@ -725,6 +725,64 @@
<property name="dictionaryService" ref="dictionaryService" />
</bean>
<bean id="FreezeService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService</value>
</property>
<property name="target">
<ref bean="freezeService"/>
</property>
<property name="interceptorNames">
<list>
<idref local="FreezeService_transaction"/>
<idref bean="exceptionTranslator"/>
<idref local="FreezeService_security"/>
</list>
</property>
</bean>
<bean id="FreezeService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<bean id="FreezeService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager">
<ref bean="authenticationManager"/>
</property>
<property name="accessDecisionManager">
<ref bean="accessDecisionManager"/>
</property>
<property name="afterInvocationManager">
<ref bean="afterInvocationManager"/>
</property>
<property name="objectDefinitionSource">
<value>
<![CDATA[
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isHold=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isFrozen=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getFrozen=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.freeze=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.unFreeze=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.relinquish=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getReason=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.updateReason=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getHolds=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.hasFrozenChildren=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getFreezeDate=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getFreezeInitiator=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.*=RM_DENY
]]>
</value>
</property>
</bean>
<!-- Records Management Audit Service -->
<bean id="recordsManagementAuditService" class="org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditServiceImpl" init-method="init">
@@ -798,9 +856,8 @@
<!-- Record Service -->
<bean id="recordService" class="org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl" init-method="init">
<property name="recordsManagementService" ref="RecordsManagementService"/>
<property name="nodeService" ref="NodeService"/>
<property name="policyComponent" ref="policyComponent"/>
<!--<property name="policyComponent" ref="policyComponent"/>-->
<property name="dictionaryService" ref="DictionaryService"/>
<property name="identifierService" ref="recordsManagementIdentifierService"/>
<property name="permissionService" ref="PermissionService"/>

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

@@ -17,7 +17,7 @@
<property name="nodeService" ref="NodeService"/>
<property name="namespaceService" ref="NamespaceService"/>
<property name="capabilityService" ref="CapabilityService"/>
<property name="freezeService" ref="freezeService"/>
<property name="freezeService" ref="FreezeService"/>
</bean>
<bean id="jsonConversionComponent.baseIndicator"

84
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java
View File

@@ -114,16 +114,6 @@ public interface RecordsManagementService
*/
boolean isRecord(NodeRef nodeRef);
/**
* Indicates whether the given node is a hold (container) or not.
*
* @param nodeRef node reference
* @return boolean true if hold, false otherwise
*
* @since 2.0
*/
boolean isHold(NodeRef nodeRef);
/**
* Indicates whether the given node is a transfer (container) or not.
*
@@ -144,36 +134,6 @@ public interface RecordsManagementService
*/
boolean isMetadataStub(NodeRef nodeRef);
/**
* Indicates whether the item is frozen or not.
*
* @param nodeRef node reference
* @return boolean true if record is frozen, false otherwise
*
* @since 2.0
*
* @deprecated As of 2.1, replaced by {@link FreezeService#isFrozen(NodeRef)}
*/
@Deprecated
boolean isFrozen(NodeRef nodeRef);
/**
* Indicates whether the item has frozen children or not.
*
* NOTE: this only checks the immediate children and does not check the frozen
* state of the node being passed
*
* @param nodeRef node reference
* @return boolean true if record folder has frozen children, false otherwise
*
* @since 2.0
*
* @deprecated As of 2.1, replaced by {@link FreezeService#hasFrozenChildren(NodeRef)}
*/
@Deprecated
boolean hasFrozenChildren(NodeRef nodeRef);
/**
* Indicates whether the item is cutoff or not.
*
@@ -489,8 +449,50 @@ public interface RecordsManagementService
* @param nodeRef node reference (record)
* @return boolean true if record is declared, false otherwise
*
* @deprecated As of 2.1, replaced by {@link RecordsService#isDeclared()}
* @deprecated As of 2.1, replaced by {@link RecordService#isDeclared(NodeRef)}
*/
@Deprecated
boolean isRecordDeclared(NodeRef nodeRef);
/**
* Indicates whether the given node is a hold (container) or not.
*
* @param nodeRef node reference
* @return boolean true if hold, false otherwise
*
* @since 2.0
*
* @deprecated As of 2.1, replaced by {@link FreezeService#isHold(NodeRef)}
*/
@Deprecated
boolean isHold(NodeRef nodeRef);
/**
* Indicates whether the item is frozen or not.
*
* @param nodeRef node reference
* @return boolean true if record is frozen, false otherwise
*
* @since 2.0
*
* @deprecated As of 2.1, replaced by {@link FreezeService#isFrozen(NodeRef)}
*/
@Deprecated
boolean isFrozen(NodeRef nodeRef);
/**
* Indicates whether the item has frozen children or not.
*
* NOTE: this only checks the immediate children and does not check the frozen
* state of the node being passed
*
* @param nodeRef node reference
* @return boolean true if record folder has frozen children, false otherwise
*
* @since 2.0
*
* @deprecated As of 2.1, replaced by {@link FreezeService#hasFrozenChildren(NodeRef)}
*/
@Deprecated
boolean hasFrozenChildren(NodeRef nodeRef);
}

70
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
View File

@@ -604,14 +604,6 @@ public class RecordsManagementServiceImpl implements RecordsManagementService,
return this.nodeService.hasAspect(nodeRef, ASPECT_RECORD);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isHold(org.alfresco.service.cmr.repository.NodeRef)
*/
public boolean isHold(NodeRef nodeRef)
{
return instanceOf(nodeRef, TYPE_HOLD);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isTransfer(org.alfresco.service.cmr.repository.NodeRef)
*/
@@ -629,38 +621,6 @@ public class RecordsManagementServiceImpl implements RecordsManagementService,
return nodeService.hasAspect(nodeRef, ASPECT_GHOSTED);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isFrozen(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean isFrozen(NodeRef nodeRef)
{
return nodeService.hasAspect(nodeRef, ASPECT_FROZEN);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#hasFrozenChildren(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean hasFrozenChildren(NodeRef nodeRef)
{
boolean result = false;
if (isFilePlanComponent(nodeRef) == true)
{
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef assoc : assocs)
{
if (isFrozen(assoc.getChildRef()) == true)
{
result = true;
break;
}
}
}
return result;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isCutoff(org.alfresco.service.cmr.repository.NodeRef)
*/
@@ -1270,4 +1230,34 @@ public class RecordsManagementServiceImpl implements RecordsManagementService,
{
return serviceRegistry.getRecordService().isDeclared(nodeRef);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isHold(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
@Deprecated
public boolean isHold(NodeRef nodeRef)
{
return serviceRegistry.getFreezeService().isHold(nodeRef);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isFrozen(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
@Deprecated
public boolean isFrozen(NodeRef nodeRef)
{
return serviceRegistry.getFreezeService().isFrozen(nodeRef);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#hasFrozenChildren(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
@Deprecated
public boolean hasFrozenChildren(NodeRef nodeRef)
{
return serviceRegistry.getFreezeService().hasFrozenChildren(nodeRef);
}
}

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
View File

@@ -23,6 +23,7 @@ import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditSe
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
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.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.service.NotAuditable;
@@ -47,6 +48,7 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
static final QName RECORDS_MANAGEMENT_AUDIT_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RecordsManagementAuditService");
static final QName CAPABILITY_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "CapabilityService");
static final QName RECORD_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RecordService");
static final QName FREEZE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "FreezeService");
/**
* @return records management service
@@ -101,4 +103,10 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
*/
@NotAuditable
CapabilityService getCapabilityService();
/**
* @return freeze service
*/
@NotAuditable
FreezeService getFreezeService();
}

17
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
View File

@@ -23,6 +23,7 @@ import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditSe
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
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.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.repo.service.ServiceDescriptorRegistry;
@@ -38,6 +39,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementActionService()
*/
@Override
public RecordsManagementActionService getRecordsManagementActionService()
{
return (RecordsManagementActionService)getService(RECORDS_MANAGEMENT_ACTION_SERVICE);
@@ -46,6 +48,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementAdminService()
*/
@Override
public RecordsManagementAdminService getRecordsManagementAdminService()
{
return (RecordsManagementAdminService)getService(RECORDS_MANAGEMENT_ADMIN_SERVICE);
@@ -54,6 +57,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementEventService()
*/
@Override
public RecordsManagementEventService getRecordsManagementEventService()
{
return (RecordsManagementEventService)getService(RECORDS_MANAGEMENT_EVENT_SERVICE);
@@ -62,6 +66,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementService()
*/
@Override
public RecordsManagementService getRecordsManagementService()
{
return (RecordsManagementService)getService(RECORDS_MANAGEMENT_SERVICE);
@@ -70,6 +75,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordService()
*/
@Override
public RecordService getRecordService()
{
return (RecordService)getService(RECORD_SERVICE);
@@ -78,6 +84,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementSecurityService()
*/
@Override
public RecordsManagementSecurityService getRecordsManagementSecurityService()
{
return (RecordsManagementSecurityService)getService(RECORDS_MANAGEMENT_SECURITY_SERVICE);
@@ -86,6 +93,7 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getRecordsManagementAuditService()
*/
@Override
public RecordsManagementAuditService getRecordsManagementAuditService()
{
return (RecordsManagementAuditService)getService(RECORDS_MANAGEMENT_AUDIT_SERVICE);
@@ -108,4 +116,13 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
{
return (CapabilityService)getService(CAPABILITY_SERVICE);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getFreezeService()
*/
@Override
public FreezeService getFreezeService()
{
return (FreezeService)getService(FREEZE_SERVICE);
}
}

10
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
View File

@@ -185,7 +185,15 @@ public class FreezeServiceImpl implements FreezeService,
{
ParameterCheck.mandatory("nodeRef", nodeRef);
return dictionaryService.isSubClass(nodeService.getType(nodeRef), TYPE_HOLD);
QName type = nodeService.getType(nodeRef);
if (nodeService.exists(nodeRef) && (TYPE_HOLD.equals(type)) || dictionaryService.isSubClass(type, TYPE_HOLD))
{
return true;
}
else
{
return false;
}
}
/**

25
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
View File

@@ -33,7 +33,7 @@ import org.alfresco.service.namespace.QName;
public interface RecordService
{
/**
* Get a list of all the record meta-data aspects
* Gets a list of all the record meta-data aspects
*
* @return {@link Set}<{@link QName}> list of record meta-data aspects
*/
@@ -42,29 +42,36 @@ public interface RecordService
/**
* Indicates whether the record is declared
*
* @param nodeRef node reference (record)
* @param nodeRef node reference of the record for which the check would be performed
* @return boolean true if record is declared, false otherwise
*/
boolean isDeclared(NodeRef nodeRef);
/**
* Create a new record from an existing document.
* Creates a new record from an existing document.
*
* @param filePlan
* @param document
* @param filePlan The filePlan in which the record should be placed
* @param document The document from which the record will be created
*/
void createRecordFromDocument(NodeRef filePlan, NodeRef document);
/**
* Gets the unfiled record container for the given file plan
*
* @param filePlan The filePlan for which the unfiled record container should be retrieved
* @return NodeRef The nodeRef of the container object
*/
public NodeRef getUnfiledRecordContainer(NodeRef filePlan);
// TODO boolean isRecordFiled(NodeRef record);
// TODO boolean isRecordClassified(NodeRef record);
// NodeRef getNewRecordContainer(NodeRef filePlan);
// TODO NodeRef getNewRecordContainer(NodeRef filePlan);
//NodeRef createRecord(NodeRef filePlan, NodeRef document);
// TODO NodeRef createRecord(NodeRef filePlan, NodeRef document);
// TODO NodeRef createAndFileRecord(NodeRef recordFolder, NodeRef document);
// TODO void fileRecord(NodeRef recordFolder, NodeRef record);
public NodeRef getUnfiledRecordContainer(NodeRef filePlan);
}

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

@@ -25,11 +25,9 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
import org.alfresco.module.org_alfresco_module_rm.identifier.IdentifierService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.service.cmr.dictionary.AspectDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -38,6 +36,7 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.ParameterCheck;
/**
* Record service implementation
@@ -53,14 +52,11 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
/** Indentiy service */
private IdentifierService identifierService;
/** Records management service */
private RecordsManagementService recordsManagementService;
/** Dictionary service */
private DictionaryService dictionaryService;
/** Policy component */
private PolicyComponent policyComponent;
// /** Policy component */
// private PolicyComponent policyComponent;
/** Permission service */
private PermissionService permissionService;
@@ -81,20 +77,15 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
this.identifierService = identifierService;
}
public void setRecordsManagementService(RecordsManagementService recordsManagementService)
{
this.recordsManagementService = recordsManagementService;
}
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
public void setPolicyComponent(PolicyComponent policyComponent)
{
this.policyComponent = policyComponent;
}
// public void setPolicyComponent(PolicyComponent policyComponent)
// {
// this.policyComponent = policyComponent;
// }
public void setPermissionService(PermissionService permissionService)
{
@@ -108,11 +99,11 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
public void init()
{
// policyComponent.bindAssociationBehaviour(
// QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateChildAssociation"),
// TYPE_UNFILED_RECORD_CONTAINER,
// ContentModel.ASSOC_CONTAINS,
// new JavaBehaviour(this, "onCreateNewRecord", NotificationFrequency.TRANSACTION_COMMIT));
// policyComponent.bindAssociationBehaviour(
// QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateChildAssociation"),
// TYPE_UNFILED_RECORD_CONTAINER,
// ContentModel.ASSOC_CONTAINS,
// new JavaBehaviour(this, "onCreateNewRecord", NotificationFrequency.TRANSACTION_COMMIT));
}
// public void onCreateNewRecord(final ChildAssociationRef childAssocRef, boolean bNew)
@@ -136,7 +127,6 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
// throw new AlfrescoRuntimeException("Only content can be created as a record.");
// }
// }
//
// return null;
// }
// });
@@ -145,6 +135,7 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
/**
* @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#getRecordMetaDataAspects()
*/
@Override
public Set<QName> getRecordMetaDataAspects()
{
if (recordMetaDataAspects == null)
@@ -170,31 +161,36 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
/**
* @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#isDeclared(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean isDeclared(NodeRef record)
{
ParameterCheck.mandatory("record", record);
return (nodeService.hasAspect(record, ASPECT_DECLARED_RECORD));
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#createRecordFromDocument(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public void createRecordFromDocument(NodeRef filePlan, NodeRef document)
{
ParameterCheck.mandatory("filePlan", filePlan);
ParameterCheck.mandatory("document", document);
// skip everything if the document is already a record
if (nodeService.hasAspect(document, ASPECT_RECORD) == false)
{
// get the documents readers
Long aclId = nodeService.getNodeAclId(document);
Set<String> readers = permissionService.getReaders(aclId);
// get the documents primary parent assoc
ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(document);
/// get the new record container for the file plan
// get the new record container for the file plan
NodeRef newRecordContainer = getUnfiledRecordContainer(filePlan);
if (newRecordContainer == null)
{
throw new AlfrescoRuntimeException("Unable to create record, because new record container could not be found.");
}
// get the documents primary parent assoc
ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(document);
// move the document into the file plan
nodeService.moveNode(document, newRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
@@ -204,14 +200,40 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
// make the document a record
makeRecord(document);
// get the documents readers
Long aclId = nodeService.getNodeAclId(document);
Set<String> readers = permissionService.getReaders(aclId);
// set the readers
recordsManagementSecurityService.setExtendedReaders(document, readers);
}
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#getUnfiledRecordContainer(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public NodeRef getUnfiledRecordContainer(NodeRef filePlan)
{
ParameterCheck.mandatory("filePlan", filePlan);
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(filePlan, ASSOC_UNFILED_RECORDS, RegexQNamePattern.MATCH_ALL);
if (assocs.size() != 1)
{
throw new AlfrescoRuntimeException("Error getting the unfiled container, because the container cannot be indentified.");
}
return assocs.get(0).getChildRef();
}
/**
* Helper Methods
*/
/**
* Creates a record from the given document
*
* @param document
* @param document the document from which a record will be created
*/
private void makeRecord(NodeRef document)
{
@@ -220,20 +242,4 @@ public class RecordServiceImpl implements RecordService, RecordsManagementModel
String recordId = identifierService.generateIdentifier(ASPECT_RECORD, nodeService.getPrimaryParent(document).getParentRef());
nodeService.setProperty(document, PROP_IDENTIFIER, recordId);
}
/**
*
* @param filePlan
* @return
*/
public NodeRef getUnfiledRecordContainer(NodeRef filePlan)
{
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(filePlan, ASSOC_UNFILED_RECORDS, RegexQNamePattern.MATCH_ALL);
if (assocs.size() != 1)
{
throw new AlfrescoRuntimeException("Error getting the unfiled container, because the container cannot be indentified.");
}
return assocs.get(0).getChildRef();
}
}

15
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java
View File

@@ -15,24 +15,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class DataSetServiceImplTest extends BaseRMTestCase
{
/** Data Set Service */
private DataSetService dataSetService;
/** Id of the test data set*/
private static final String DATA_SET_ID = "testExampleData";
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices()
*/
@Override
protected void initServices()
{
super.initServices();
// Get Data Set Service
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
}
/**
* @see DataSetService#getDataSets()
*/

22
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java
View File

@@ -10,8 +10,6 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -21,12 +19,6 @@ import org.alfresco.service.namespace.QName;
public class FreezeServiceImplTest extends BaseRMTestCase
{
/** Data Set Service */
private DataSetService dataSetService;
/** Freeze Service */
private FreezeService freezeService;
/** Id of the test data set*/
private static final String DATA_SET_ID = "testExampleData";
@@ -42,20 +34,6 @@ public class FreezeServiceImplTest extends BaseRMTestCase
/** Fourth Record */
private NodeRef recordFour;
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices()
*/
@Override
protected void initServices()
{
super.initServices();
// Get Data Set Service
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
// Get Freeze Service
freezeService = (FreezeService) applicationContext.getBean("freezeService");
}
public void testFreezeService() throws Exception
{
doTestInTransaction(new Test<NodeRef>()

102
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java Normal file
View File

@@ -0,0 +1,102 @@
package org.alfresco.module.org_alfresco_module_rm.test.service;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.namespace.QName;
public class RecordServiceImplTest extends BaseRMTestCase
{
/**
* @see RecordService#getRecordMetaDataAspects()
*/
public void testGetRecordMetaDataAspects() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
Set<QName> aspects = recordService.getRecordMetaDataAspects();
assertNotNull(aspects);
assertEquals(5, aspects.size());
assertTrue(aspects.containsAll(getAspectList()));
return null;
}
/**
* Helper method for getting a list of record meta data aspects
*
* @return Record meta data aspects as list
*/
private List<QName> getAspectList()
{
QName[] aspects = new QName[]
{
DOD5015Model.ASPECT_DIGITAL_PHOTOGRAPH_RECORD,
DOD5015Model.ASPECT_PDF_RECORD,
DOD5015Model.ASPECT_WEB_RECORD,
DOD5015Model.ASPECT_SCANNED_RECORD,
ASPECT_RECORD_META_DATA
};
return Arrays.asList(aspects);
}
});
}
/**
* @see RecordService#isDeclared(org.alfresco.service.cmr.repository.NodeRef)
*/
public void testIsDeclared() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// FIXME
return null;
}
});
}
/**
* @see RecordService#createRecordFromDocument(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
*/
public void testCreateRecordFromDocument() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// FIXME
return null;
}
});
}
/**
* @see RecordService#getUnfiledRecordContainer(org.alfresco.service.cmr.repository.NodeRef)
*/
public void testGetUnfiledRecordContainer() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// FIXME
return null;
}
});
}
}

35
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
View File

@@ -19,16 +19,13 @@
package org.alfresco.module.org_alfresco_module_rm.test.service;
import java.util.List;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.springframework.util.CollectionUtils;
/**
@@ -579,40 +576,8 @@ public class RecordsManagementServiceImplTest extends BaseRMTestCase
/********** Record methods **********/
// TODO void testIsRecordFrozen()
/**
* @see RecordsManagementService#getRecordMetaDataAspects()
*/
public void testGetRecordMetaDataAspects()
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
Set<QName> aspects = rmService.getRecordMetaDataAspects();
assertNotNull(aspects);
assertEquals(5, aspects.size());
assertTrue(aspects.containsAll(
CollectionUtils.arrayToList(new QName[]
{
DOD5015Model.ASPECT_DIGITAL_PHOTOGRAPH_RECORD,
DOD5015Model.ASPECT_PDF_RECORD,
DOD5015Model.ASPECT_WEB_RECORD,
DOD5015Model.ASPECT_SCANNED_RECORD,
ASPECT_RECORD_META_DATA
})));
return null;
}
});
}
// TODO void testGetRecordFolders(NodeRef record);
// TODO void testIsRecordDeclared(NodeRef nodeRef);
/********** RM2 - Multi-hierarchy record taxonomy's **********/
/**

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

@@ -27,11 +27,14 @@ import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
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.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.RmSiteType;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService;
@@ -112,6 +115,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected RecordsManagementSecurityService securityService;
protected CapabilityService capabilityService;
protected VitalRecordService vitalRecordService;
protected DataSetService dataSetService;
protected FreezeService freezeService;
protected RecordService recordService;
/** test data */
protected StoreRef storeRef;
@@ -266,6 +272,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
securityService = (RecordsManagementSecurityService)this.applicationContext.getBean("RecordsManagementSecurityService");
capabilityService = (CapabilityService)this.applicationContext.getBean("CapabilityService");
vitalRecordService = (VitalRecordService)this.applicationContext.getBean("VitalRecordService");
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
freezeService = (FreezeService) applicationContext.getBean("FreezeService");
recordService = (RecordService) applicationContext.getBean("RecordService");
}
/**