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
This commit is contained in:
Tom Page
2015-10-14 15:47:27 +00:00
parent c1fa9a7fc2
commit e16f9ebdf8
14 changed files with 45 additions and 45 deletions

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Top Secret rm.caveat.classification.mark.ts.label=Top Secret
rm.classification.secret=Secret rm.caveat.classification.mark.s.label=Secret
rm.classification.confidential=Confidential rm.caveat.classification.mark.c.label=Confidential
rm.classification.unclassified=Unclassified rm.classification.unclassified=Unclassified
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Streng geheim rm.caveat.classification.mark.ts.label=Streng geheim
rm.classification.secret=Geheim rm.caveat.classification.mark.s.label=Geheim
rm.classification.confidential=Vertraulich rm.caveat.classification.mark.c.label=Vertraulich
rm.classification.unclassified=Nicht klassifiziert rm.classification.unclassified=Nicht klassifiziert
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Alto secreto rm.caveat.classification.mark.ts.label=Alto secreto
rm.classification.secret=Secreto rm.caveat.classification.mark.s.label=Secreto
rm.classification.confidential=Confidencial rm.caveat.classification.mark.c.label=Confidencial
rm.classification.unclassified=Sin clasificar rm.classification.unclassified=Sin clasificar
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Top secret rm.caveat.classification.mark.ts.label=Top secret
rm.classification.secret=Secret rm.caveat.classification.mark.s.label=Secret
rm.classification.confidential=Confidentiel rm.caveat.classification.mark.c.label=Confidentiel
rm.classification.unclassified=Non class\u00e9 rm.classification.unclassified=Non class\u00e9
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Segretissimo rm.caveat.classification.mark.ts.label=Segretissimo
rm.classification.secret=Segreto rm.caveat.classification.mark.s.label=Segreto
rm.classification.confidential=Riservato rm.caveat.classification.mark.c.label=Riservato
rm.classification.unclassified=Non classificato rm.classification.unclassified=Non classificato
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=\u6700\u9ad8\u6a5f\u5bc6 rm.caveat.classification.mark.ts.label=\u6700\u9ad8\u6a5f\u5bc6
rm.classification.secret=\u95a2\u4fc2\u8005\u5916\u79d8 rm.caveat.classification.mark.s.label=\u95a2\u4fc2\u8005\u5916\u79d8
rm.classification.confidential=\u6a5f\u5bc6 rm.caveat.classification.mark.c.label=\u6a5f\u5bc6
rm.classification.unclassified=\u672a\u5206\u985e rm.classification.unclassified=\u672a\u5206\u985e
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Topp hemmelig rm.caveat.classification.mark.ts.label=Topp hemmelig
rm.classification.secret=Hemmelig rm.caveat.classification.mark.s.label=Hemmelig
rm.classification.confidential=Konfidensiell rm.caveat.classification.mark.c.label=Konfidensiell
rm.classification.unclassified=Uklassifisert rm.classification.unclassified=Uklassifisert
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Topgeheim rm.caveat.classification.mark.ts.label=Topgeheim
rm.classification.secret=Geheim rm.caveat.classification.mark.s.label=Geheim
rm.classification.confidential=Vertrouwelijk rm.caveat.classification.mark.c.label=Vertrouwelijk
rm.classification.unclassified=Niet-geclassificeerd rm.classification.unclassified=Niet-geclassificeerd
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=Absoluto sigilo rm.caveat.classification.mark.ts.label=Absoluto sigilo
rm.classification.secret=Sigilo rm.caveat.classification.mark.s.label=Sigilo
rm.classification.confidential=Confidencial rm.caveat.classification.mark.c.label=Confidencial
rm.classification.unclassified=N\u00e3o classificado rm.classification.unclassified=N\u00e3o classificado
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## 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.caveat.classification.mark.ts.label=\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.caveat.classification.mark.s.label=\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.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 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" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -1,7 +1,7 @@
## Default classification levels ## Default classification levels
rm.classification.topSecret=\u6700\u9ad8\u673a\u5bc6 rm.caveat.classification.mark.ts.label=\u6700\u9ad8\u673a\u5bc6
rm.classification.secret=\u79d8\u5bc6 rm.caveat.classification.mark.s.label=\u79d8\u5bc6
rm.classification.confidential=\u673a\u5bc6 rm.caveat.classification.mark.c.label=\u673a\u5bc6
rm.classification.unclassified=\u672a\u5206\u7c7b rm.classification.unclassified=\u672a\u5206\u7c7b
## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance" ## Most classifications are also security clearance levels, but the clearance corresponding to unclassified is "No Clearance"

View File

@@ -46,9 +46,9 @@ public class ClassificationLevelsTest extends BaseRMTestCase
{ {
List<ClassificationLevel> levels = classificationSchemeService.getClassificationLevels(); List<ClassificationLevel> levels = classificationSchemeService.getClassificationLevels();
List<ClassificationLevel> expectedLevels = Arrays.asList( List<ClassificationLevel> expectedLevels = Arrays.asList(
new ClassificationLevel("TS", "rm.caveat.classification.mark.ts.label"), new ClassificationLevel("TS", "rm.caveat.classification.mark.ts.label.label"),
new ClassificationLevel("S", "rm.caveat.classification.mark.s.label"), new ClassificationLevel("S", "rm.caveat.classification.mark.s.label.label"),
new ClassificationLevel("C", "rm.caveat.classification.mark.c.label"), new ClassificationLevel("C", "rm.caveat.classification.mark.c.label.label"),
ClassificationLevelManager.UNCLASSIFIED); ClassificationLevelManager.UNCLASSIFIED);
assertEquals(levels, expectedLevels); assertEquals(levels, expectedLevels);
} }

View File

@@ -50,9 +50,9 @@ import org.mockito.MockitoAnnotations;
*/ */
public class ClassificationSchemeServiceImplUnitTest public class ClassificationSchemeServiceImplUnitTest
{ {
private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.classification.topSecret", private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.caveat.classification.mark.ts.label",
"Secret", "rm.classification.secret", "Secret", "rm.caveat.classification.mark.s.label",
"Confidential", "rm.classification.confidential", "Confidential", "rm.caveat.classification.mark.c.label",
"No Clearance", "rm.classification.noClearance"); "No Clearance", "rm.classification.noClearance");
/** /**
@@ -99,12 +99,12 @@ public class ClassificationSchemeServiceImplUnitTest
*/ */
@Test public void restrictList_filter() @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<ClassificationLevel> actual = classificationSchemeServiceImpl.restrictList(DEFAULT_CLASSIFICATION_LEVELS, targetLevel); List<ClassificationLevel> actual = classificationSchemeServiceImpl.restrictList(DEFAULT_CLASSIFICATION_LEVELS, targetLevel);
List<ClassificationLevel> expected = asLevelList("Secret", "rm.classification.secret", List<ClassificationLevel> expected = asLevelList("Secret", "rm.caveat.classification.mark.s.label",
"Confidential", "rm.classification.confidential", "Confidential", "rm.caveat.classification.mark.c.label",
"No Clearance", "rm.classification.noClearance"); "No Clearance", "rm.classification.noClearance");
assertEquals(expected, actual); assertEquals(expected, actual);
// Check that the returned list can't be modified. // Check that the returned list can't be modified.

View File

@@ -60,9 +60,9 @@ import org.mockito.MockitoAnnotations;
public class ClassificationServiceBootstrapUnitTest implements ClassifiedContentModel public class ClassificationServiceBootstrapUnitTest implements ClassifiedContentModel
{ {
private static final List<ClassificationLevel> DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS = private static final List<ClassificationLevel> DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS =
asLevelList("TS", "rm.classification.topSecret", asLevelList("TS", "rm.caveat.classification.mark.ts.label",
"S", "rm.classification.secret", "S", "rm.caveat.classification.mark.s.label",
"C", "rm.classification.confidential"); "C", "rm.caveat.classification.mark.c.label");
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS =
union(DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS, union(DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS,