RM-2586 Refactor the classification loader to use the caveat config.

Remove the old classification level configuration files.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-10-14 15:47:25 +00:00
parent a24c57aed8
commit c1fa9a7fc2
30 changed files with 164 additions and 207 deletions

View File

@@ -61,8 +61,6 @@ rm.record.contributors.group.name=RECORD_CONTRIBUTORS
#
# Classified records
#
# The location of the classification levels configuration file (relative to the classpath).
rm.classification.levelsFile=/alfresco/module/org_alfresco_module_rm/classification/rm-classification-levels.json
# The location of the classification reasons configuration file (relative to the classpath).
rm.classification.reasonsFile=/alfresco/module/org_alfresco_module_rm/classification/rm-classification-reasons.json
# The location of the exemption categories configuration file (relative to the classpath).

View File

@@ -1,14 +0,0 @@
[
{
"name" : "TS",
"displayLabel" : "rm.classification.topSecret"
},
{
"name" : "S",
"displayLabel" : "rm.classification.secret"
},
{
"name" : "C",
"displayLabel" : "rm.classification.confidential"
}
]

View File

@@ -39,12 +39,12 @@
</list>
</property>
</bean>
<!-- Classification Permission Pre Processor -->
<bean id="classificationPermissionPreProcessor"
class="org.alfresco.module.org_alfresco_module_rm.classification.permission.ClassificationPermissionPreProcessor"
<bean id="classificationPermissionPreProcessor"
class="org.alfresco.module.org_alfresco_module_rm.classification.permission.ClassificationPermissionPreProcessor"
parent="parentPermissionPreProcessor">
<property name="contentClassificationService" ref="contentClassificationService" />
<property name="contentClassificationService" ref="contentClassificationService" />
<property name="transactionalResourceHelper" ref="rm.transactionalResourceHelper" />
<property name="classificationServiceBootstrap" ref="classificationServiceBootstrap"/>
<property name="authenticationUtil" ref="rm.authenticationUtil" />
@@ -53,7 +53,6 @@
<!-- Classification service DAO -->
<bean id="classificationServiceDAO" class="org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceDAO">
<property name="levelConfigLocation" value="${rm.classification.levelsFile}" />
<property name="reasonConfigLocation" value="${rm.classification.reasonsFile}" />
<property name="exemptionCategoryConfigLocation" value="${rm.classification.exemptionCategoriesFile}" />
</bean>
@@ -123,6 +122,7 @@
<constructor-arg ref="TransactionService"/>
<constructor-arg ref="attributeService"/>
<constructor-arg ref="classificationServiceDAO"/>
<property name="caveatDAO" ref="caveatDAO" />
</bean>
<bean name="classifiedRenditionAssoc" parent="mr.baseReferralAssoc">

View File

@@ -270,12 +270,12 @@
<!-- Import the Metadata Referral Services -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/metadata-referral-context.xml"/>
<!-- Import the Classified Content Services -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/classified-content-context.xml"/>
<!-- Import the Caveat Services -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/caveat-context.xml"/>
<!-- Import the Classified Content Services -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/classified-content-context.xml"/>
<!-- Import the Content Services -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/content-context.xml"/>