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-2333. Rename ClassificationAuthority to ClassificationAgency. +review RM

Browse Source 
This addresses parts of RM-2341, RM-2342, RM-2343 and RM-2344. It replaces authority with agency in the content model
, the services and their APIs, the UI layer and the rm-automation tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@107108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2015-06-25 13:24:38 +00:00
parent 9f8d6f1a4a
commit 5a88c1d5c8
16 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationService.java
View File

@@ -45,7 +45,7 @@ public interface ContentClassificationService
* Classify a piece of content.
*
* @param classificationLevelId The security clearance needed to access the content.
* @param classificationAuthority The name of the authority responsible for the classification of this content.
* @param classificationAgency The name of the agency responsible for the classification of this content.
* @param classificationReasonIds A non-empty set of ids of reasons for classifying the content in this way.
* @param content The node to classify.
* @throws LevelIdNotFound If the supplied level id is not found.
@@ -53,7 +53,7 @@ public interface ContentClassificationService
* @throws InvalidNodeRefException If the node could not be found.
* @throws InvalidNode If the supplied node is not a content node.
*/
void classifyContent(String classificationLevelId, String classificationAuthority, Set<String> classificationReasonIds, NodeRef content)
void classifyContent(String classificationLevelId, String classificationAgency, Set<String> classificationReasonIds, NodeRef content)
throws LevelIdNotFound, ReasonIdNotFound, InvalidNodeRefException, InvalidNode;
/**

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

@@ -78,11 +78,11 @@ public class ContentClassificationServiceImpl extends ServiceBaseImpl implements
};
@Override
public void classifyContent(String classificationLevelId, String classificationAuthority,
public void classifyContent(String classificationLevelId, String classificationAgency,
Set<String> classificationReasonIds, final NodeRef content)
{
checkNotBlank("classificationLevelId", classificationLevelId);
checkNotBlank("classificationAuthority", classificationAuthority);
checkNotBlank("classificationAgency", classificationAgency);
mandatory("classificationReasonIds", classificationReasonIds);
mandatory("content", content);
@@ -114,8 +114,8 @@ public class ContentClassificationServiceImpl extends ServiceBaseImpl implements
// Current classification id
properties.put(PROP_CURRENT_CLASSIFICATION, classificationLevelId);
// Classification authority
properties.put(PROP_CLASSIFICATION_AUTHORITY, classificationAuthority);
// Classification agency
properties.put(PROP_CLASSIFICATION_AGENCY, classificationAgency);
// Classification reason ids
HashSet<String> classificationReasons = new HashSet<>();

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/model/ClassifiedContentModel.java
View File

@@ -44,7 +44,7 @@ public interface ClassifiedContentModel
QName ASPECT_CLASSIFIED = QName.createQName(CLF_URI, "classified");
QName PROP_INITIAL_CLASSIFICATION = QName.createQName(CLF_URI, "initialClassification");
QName PROP_CURRENT_CLASSIFICATION = QName.createQName(CLF_URI, "currentClassification");
QName PROP_CLASSIFICATION_AUTHORITY = QName.createQName(CLF_URI, "classificationAuthority");
QName PROP_CLASSIFICATION_AGENCY = QName.createQName(CLF_URI, "classificationAgency");
QName PROP_CLASSIFICATION_REASONS = QName.createQName(CLF_URI, "classificationReasons");
/** Security Clearance aspect. */

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPost.java
View File

@@ -47,7 +47,7 @@ public class ClassifyContentPost extends AbstractRmWebScript
{
/** Constants */
public static final String CLASSIFICATION_LEVEL_ID = "classificationLevelId";
public static final String CLASSIFICATION_AUTHORITY = "classificationAuthority";
public static final String CLASSIFICATION_AGENCY = "classificationAgency";
public static final String CLASSIFICATION_REASONS = "classificationReasons";
/** The service responsible for classifying content. */
@@ -73,13 +73,13 @@ public class ClassifyContentPost extends AbstractRmWebScript
{
JSONObject jsonObject = getRequestContentAsJsonObject(req);
String classificationLevelId = getStringValueFromJSONObject(jsonObject, CLASSIFICATION_LEVEL_ID);
String classificationAuthority = getStringValueFromJSONObject(jsonObject, CLASSIFICATION_AUTHORITY);
String classificationAgency = getStringValueFromJSONObject(jsonObject, CLASSIFICATION_AGENCY);
Set<String> classificationReasonIds = getClassificationReasonIds(jsonObject);
NodeRef document = parseRequestForNodeRef(req);
contentClassificationService.classifyContent(classificationLevelId, classificationAuthority, classificationReasonIds, document);
contentClassificationService.classifyContent(classificationLevelId, classificationAgency, classificationReasonIds, document);
Map<String, Object> model = new HashMap<String, Object>(1);
Map<String, Object> model = new HashMap<>(1);
model.put(SUCCESS, true);
return model;