From e16f9ebdf833b7d675fd3b324b348f6b2981b880 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 14 Oct 2015 15:47:27 +0000 Subject: [PATCH] RM-2586 Replace classification I18N properties with caveat ones. Need to check with Gloria that this is the right way to change the key. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../messages/classified-content.properties | 6 +++--- .../messages/classified-content_de.properties | 6 +++--- .../messages/classified-content_es.properties | 6 +++--- .../messages/classified-content_fr.properties | 6 +++--- .../messages/classified-content_it.properties | 6 +++--- .../messages/classified-content_ja.properties | 6 +++--- .../messages/classified-content_nb.properties | 6 +++--- .../messages/classified-content_nl.properties | 6 +++--- .../messages/classified-content_pt_BR.properties | 6 +++--- .../messages/classified-content_ru.properties | 6 +++--- .../messages/classified-content_zh_CN.properties | 6 +++--- .../classification/ClassificationLevelsTest.java | 6 +++--- .../ClassificationSchemeServiceImplUnitTest.java | 12 ++++++------ .../ClassificationServiceBootstrapUnitTest.java | 6 +++--- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content.properties index 223652fcb8..e82a6a61b0 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Top Secret -rm.classification.secret=Secret -rm.classification.confidential=Confidential +rm.caveat.classification.mark.ts.label=Top Secret +rm.caveat.classification.mark.s.label=Secret +rm.caveat.classification.mark.c.label=Confidential rm.classification.unclassified=Unclassified ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_de.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_de.properties index 83af1a5de6..7e0c3e4572 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_de.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_de.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Streng geheim -rm.classification.secret=Geheim -rm.classification.confidential=Vertraulich +rm.caveat.classification.mark.ts.label=Streng geheim +rm.caveat.classification.mark.s.label=Geheim +rm.caveat.classification.mark.c.label=Vertraulich rm.classification.unclassified=Nicht klassifiziert ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_es.properties index ddc7b0a4fe..17a8843a02 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_es.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_es.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Alto secreto -rm.classification.secret=Secreto -rm.classification.confidential=Confidencial +rm.caveat.classification.mark.ts.label=Alto secreto +rm.caveat.classification.mark.s.label=Secreto +rm.caveat.classification.mark.c.label=Confidencial rm.classification.unclassified=Sin clasificar ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_fr.properties index a66aa7e94d..244404a5ef 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_fr.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_fr.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Top secret -rm.classification.secret=Secret -rm.classification.confidential=Confidentiel +rm.caveat.classification.mark.ts.label=Top secret +rm.caveat.classification.mark.s.label=Secret +rm.caveat.classification.mark.c.label=Confidentiel rm.classification.unclassified=Non class\u00e9 ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_it.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_it.properties index b857eb5c4c..7abef1a005 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_it.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_it.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Segretissimo -rm.classification.secret=Segreto -rm.classification.confidential=Riservato +rm.caveat.classification.mark.ts.label=Segretissimo +rm.caveat.classification.mark.s.label=Segreto +rm.caveat.classification.mark.c.label=Riservato rm.classification.unclassified=Non classificato ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ja.properties index 2183365f2d..fd04fc0041 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ja.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ja.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=\u6700\u9ad8\u6a5f\u5bc6 -rm.classification.secret=\u95a2\u4fc2\u8005\u5916\u79d8 -rm.classification.confidential=\u6a5f\u5bc6 +rm.caveat.classification.mark.ts.label=\u6700\u9ad8\u6a5f\u5bc6 +rm.caveat.classification.mark.s.label=\u95a2\u4fc2\u8005\u5916\u79d8 +rm.caveat.classification.mark.c.label=\u6a5f\u5bc6 rm.classification.unclassified=\u672a\u5206\u985e ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nb.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nb.properties index c38c6ade25..2d41cd59a4 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nb.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nb.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Topp hemmelig -rm.classification.secret=Hemmelig -rm.classification.confidential=Konfidensiell +rm.caveat.classification.mark.ts.label=Topp hemmelig +rm.caveat.classification.mark.s.label=Hemmelig +rm.caveat.classification.mark.c.label=Konfidensiell rm.classification.unclassified=Uklassifisert ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nl.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nl.properties index 66c15f347c..e945942035 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nl.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_nl.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Topgeheim -rm.classification.secret=Geheim -rm.classification.confidential=Vertrouwelijk +rm.caveat.classification.mark.ts.label=Topgeheim +rm.caveat.classification.mark.s.label=Geheim +rm.caveat.classification.mark.c.label=Vertrouwelijk rm.classification.unclassified=Niet-geclassificeerd ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_pt_BR.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_pt_BR.properties index ccb05b52a5..94c35b093e 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_pt_BR.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_pt_BR.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=Absoluto sigilo -rm.classification.secret=Sigilo -rm.classification.confidential=Confidencial +rm.caveat.classification.mark.ts.label=Absoluto sigilo +rm.caveat.classification.mark.s.label=Sigilo +rm.caveat.classification.mark.c.label=Confidencial rm.classification.unclassified=N\u00e3o classificado ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ru.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ru.properties index 0a174ab14e..279353b08d 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ru.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_ru.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=\u0421\u043e\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u043e \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u043e -rm.classification.secret=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u043e -rm.classification.confidential=\u041a\u043e\u043d\u0444\u0438\u0434\u0435\u043d\u0446\u0438\u0430\u043b\u044c\u043d\u043e +rm.caveat.classification.mark.ts.label=\u0421\u043e\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u043e \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u043e +rm.caveat.classification.mark.s.label=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u043e +rm.caveat.classification.mark.c.label=\u041a\u043e\u043d\u0444\u0438\u0434\u0435\u043d\u0446\u0438\u0430\u043b\u044c\u043d\u043e rm.classification.unclassified=\u041d\u0435 \u0437\u0430\u0441\u0435\u043a\u0440\u0435\u0447\u0435\u043d\u043e ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_zh_CN.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_zh_CN.properties index 5c571e23b8..c54fb3122f 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_zh_CN.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/classified-content_zh_CN.properties @@ -1,7 +1,7 @@ ## Default classification levels -rm.classification.topSecret=\u6700\u9ad8\u673a\u5bc6 -rm.classification.secret=\u79d8\u5bc6 -rm.classification.confidential=\u673a\u5bc6 +rm.caveat.classification.mark.ts.label=\u6700\u9ad8\u673a\u5bc6 +rm.caveat.classification.mark.s.label=\u79d8\u5bc6 +rm.caveat.classification.mark.c.label=\u673a\u5bc6 rm.classification.unclassified=\u672a\u5206\u7c7b ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java index e5367159a7..5566b209c0 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java @@ -46,9 +46,9 @@ public class ClassificationLevelsTest extends BaseRMTestCase { List levels = classificationSchemeService.getClassificationLevels(); List expectedLevels = Arrays.asList( - new ClassificationLevel("TS", "rm.caveat.classification.mark.ts.label"), - new ClassificationLevel("S", "rm.caveat.classification.mark.s.label"), - new ClassificationLevel("C", "rm.caveat.classification.mark.c.label"), + new ClassificationLevel("TS", "rm.caveat.classification.mark.ts.label.label"), + new ClassificationLevel("S", "rm.caveat.classification.mark.s.label.label"), + new ClassificationLevel("C", "rm.caveat.classification.mark.c.label.label"), ClassificationLevelManager.UNCLASSIFIED); assertEquals(levels, expectedLevels); } diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImplUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImplUnitTest.java index 2283fedfb0..207d0c74f2 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImplUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImplUnitTest.java @@ -50,9 +50,9 @@ import org.mockito.MockitoAnnotations; */ public class ClassificationSchemeServiceImplUnitTest { - private static final List DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.classification.topSecret", - "Secret", "rm.classification.secret", - "Confidential", "rm.classification.confidential", + private static final List DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.caveat.classification.mark.ts.label", + "Secret", "rm.caveat.classification.mark.s.label", + "Confidential", "rm.caveat.classification.mark.c.label", "No Clearance", "rm.classification.noClearance"); /** @@ -99,12 +99,12 @@ public class ClassificationSchemeServiceImplUnitTest */ @Test public void restrictList_filter() { - ClassificationLevel targetLevel = new ClassificationLevel("Secret", "rm.classification.secret"); + ClassificationLevel targetLevel = new ClassificationLevel("Secret", "rm.caveat.classification.mark.s.label"); List actual = classificationSchemeServiceImpl.restrictList(DEFAULT_CLASSIFICATION_LEVELS, targetLevel); - List expected = asLevelList("Secret", "rm.classification.secret", - "Confidential", "rm.classification.confidential", + List expected = asLevelList("Secret", "rm.caveat.classification.mark.s.label", + "Confidential", "rm.caveat.classification.mark.c.label", "No Clearance", "rm.classification.noClearance"); assertEquals(expected, actual); // Check that the returned list can't be modified. diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java index f75da87eaa..2367b7c3a6 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java @@ -60,9 +60,9 @@ import org.mockito.MockitoAnnotations; public class ClassificationServiceBootstrapUnitTest implements ClassifiedContentModel { private static final List DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS = - asLevelList("TS", "rm.classification.topSecret", - "S", "rm.classification.secret", - "C", "rm.classification.confidential"); + asLevelList("TS", "rm.caveat.classification.mark.ts.label", + "S", "rm.caveat.classification.mark.s.label", + "C", "rm.caveat.classification.mark.c.label"); @SuppressWarnings("unchecked") private static final List DEFAULT_CLASSIFICATION_LEVELS = union(DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS,