8208634: Add x-IBM-1129 charset
Reviewed-by: alanb, sherman
Contributed-by: enasser@in.ibm.com
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/charsetmapping/IBM1129.c2b Tue Aug 07 16:07:47 2018 -0700
@@ -0,0 +1,94 @@
+0x21 U+ff01
+0x22 U+ff02
+0x23 U+ff03
+0x24 U+ff04
+0x25 U+ff05
+0x26 U+ff06
+0x27 U+ff07
+0x28 U+ff08
+0x29 U+ff09
+0x2a U+ff0a
+0x2b U+ff0b
+0x2c U+ff0c
+0x2d U+ff0d
+0x2e U+ff0e
+0x2f U+ff0f
+0x30 U+ff10
+0x31 U+ff11
+0x32 U+ff12
+0x33 U+ff13
+0x34 U+ff14
+0x35 U+ff15
+0x36 U+ff16
+0x37 U+ff17
+0x38 U+ff18
+0x39 U+ff19
+0x3a U+ff1a
+0x3b U+ff1b
+0x3c U+ff1c
+0x3d U+ff1d
+0x3e U+ff1e
+0x3f U+ff1f
+0x40 U+ff20
+0x41 U+ff21
+0x42 U+ff22
+0x43 U+ff23
+0x44 U+ff24
+0x45 U+ff25
+0x46 U+ff26
+0x47 U+ff27
+0x48 U+ff28
+0x49 U+ff29
+0x4a U+ff2a
+0x4b U+ff2b
+0x4c U+ff2c
+0x4d U+ff2d
+0x4e U+ff2e
+0x4f U+ff2f
+0x50 U+ff30
+0x51 U+ff31
+0x52 U+ff32
+0x53 U+ff33
+0x54 U+ff34
+0x55 U+ff35
+0x56 U+ff36
+0x57 U+ff37
+0x58 U+ff38
+0x59 U+ff39
+0x5a U+ff3a
+0x5b U+ff3b
+0x5c U+ff3c
+0x5d U+ff3d
+0x5e U+ff3e
+0x5f U+ff3f
+0x60 U+ff40
+0x61 U+ff41
+0x62 U+ff42
+0x63 U+ff43
+0x64 U+ff44
+0x65 U+ff45
+0x66 U+ff46
+0x67 U+ff47
+0x68 U+ff48
+0x69 U+ff49
+0x6a U+ff4a
+0x6b U+ff4b
+0x6c U+ff4c
+0x6d U+ff4d
+0x6e U+ff4e
+0x6f U+ff4f
+0x70 U+ff50
+0x71 U+ff51
+0x72 U+ff52
+0x73 U+ff53
+0x74 U+ff54
+0x75 U+ff55
+0x76 U+ff56
+0x77 U+ff57
+0x78 U+ff58
+0x79 U+ff59
+0x7a U+ff5a
+0x7b U+ff5b
+0x7c U+ff5c
+0x7d U+ff5d
+0x7e U+ff5e
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/charsetmapping/IBM1129.map Tue Aug 07 16:07:47 2018 -0700
@@ -0,0 +1,256 @@
+0x00 U+0000
+0x01 U+0001
+0x02 U+0002
+0x03 U+0003
+0x04 U+0004
+0x05 U+0005
+0x06 U+0006
+0x07 U+0007
+0x08 U+0008
+0x09 U+0009
+0x0a U+000a
+0x0b U+000b
+0x0c U+000c
+0x0d U+000d
+0x0e U+000e
+0x0f U+000f
+0x10 U+0010
+0x11 U+0011
+0x12 U+0012
+0x13 U+0013
+0x14 U+0014
+0x15 U+0015
+0x16 U+0016
+0x17 U+0017
+0x18 U+0018
+0x19 U+0019
+0x1a U+001a
+0x1b U+001b
+0x1c U+001c
+0x1d U+001d
+0x1e U+001e
+0x1f U+001f
+0x20 U+0020
+0x21 U+0021
+0x22 U+0022
+0x23 U+0023
+0x24 U+0024
+0x25 U+0025
+0x26 U+0026
+0x27 U+0027
+0x28 U+0028
+0x29 U+0029
+0x2a U+002a
+0x2b U+002b
+0x2c U+002c
+0x2d U+002d
+0x2e U+002e
+0x2f U+002f
+0x30 U+0030
+0x31 U+0031
+0x32 U+0032
+0x33 U+0033
+0x34 U+0034
+0x35 U+0035
+0x36 U+0036
+0x37 U+0037
+0x38 U+0038
+0x39 U+0039
+0x3a U+003a
+0x3b U+003b
+0x3c U+003c
+0x3d U+003d
+0x3e U+003e
+0x3f U+003f
+0x40 U+0040
+0x41 U+0041
+0x42 U+0042
+0x43 U+0043
+0x44 U+0044
+0x45 U+0045
+0x46 U+0046
+0x47 U+0047
+0x48 U+0048
+0x49 U+0049
+0x4a U+004a
+0x4b U+004b
+0x4c U+004c
+0x4d U+004d
+0x4e U+004e
+0x4f U+004f
+0x50 U+0050
+0x51 U+0051
+0x52 U+0052
+0x53 U+0053
+0x54 U+0054
+0x55 U+0055
+0x56 U+0056
+0x57 U+0057
+0x58 U+0058
+0x59 U+0059
+0x5a U+005a
+0x5b U+005b
+0x5c U+005c
+0x5d U+005d
+0x5e U+005e
+0x5f U+005f
+0x60 U+0060
+0x61 U+0061
+0x62 U+0062
+0x63 U+0063
+0x64 U+0064
+0x65 U+0065
+0x66 U+0066
+0x67 U+0067
+0x68 U+0068
+0x69 U+0069
+0x6a U+006a
+0x6b U+006b
+0x6c U+006c
+0x6d U+006d
+0x6e U+006e
+0x6f U+006f
+0x70 U+0070
+0x71 U+0071
+0x72 U+0072
+0x73 U+0073
+0x74 U+0074
+0x75 U+0075
+0x76 U+0076
+0x77 U+0077
+0x78 U+0078
+0x79 U+0079
+0x7a U+007a
+0x7b U+007b
+0x7c U+007c
+0x7d U+007d
+0x7e U+007e
+0x7f U+007f
+0x80 U+0080
+0x81 U+0081
+0x82 U+0082
+0x83 U+0083
+0x84 U+0084
+0x85 U+0085
+0x86 U+0086
+0x87 U+0087
+0x88 U+0088
+0x89 U+0089
+0x8a U+008a
+0x8b U+008b
+0x8c U+008c
+0x8d U+008d
+0x8e U+008e
+0x8f U+008f
+0x90 U+0090
+0x91 U+0091
+0x92 U+0092
+0x93 U+0093
+0x94 U+0094
+0x95 U+0095
+0x96 U+0096
+0x97 U+0097
+0x98 U+0098
+0x99 U+0099
+0x9a U+009a
+0x9b U+009b
+0x9c U+009c
+0x9d U+009d
+0x9e U+009e
+0x9f U+009f
+0xa0 U+00a0
+0xa1 U+00a1
+0xa2 U+00a2
+0xa3 U+00a3
+0xa4 U+00a4
+0xa5 U+00a5
+0xa6 U+00a6
+0xa7 U+00a7
+0xa8 U+0153
+0xa9 U+00a9
+0xaa U+00aa
+0xab U+00ab
+0xac U+00ac
+0xad U+00ad
+0xae U+00ae
+0xaf U+00af
+0xb0 U+00b0
+0xb1 U+00b1
+0xb2 U+00b2
+0xb3 U+00b3
+0xb4 U+0178
+0xb5 U+00b5
+0xb6 U+00b6
+0xb7 U+00b7
+0xb8 U+0152
+0xb9 U+00b9
+0xba U+00ba
+0xbb U+00bb
+0xbc U+00bc
+0xbd U+00bd
+0xbe U+00be
+0xbf U+00bf
+0xc0 U+00c0
+0xc1 U+00c1
+0xc2 U+00c2
+0xc3 U+0102
+0xc4 U+00c4
+0xc5 U+00c5
+0xc6 U+00c6
+0xc7 U+00c7
+0xc8 U+00c8
+0xc9 U+00c9
+0xca U+00ca
+0xcb U+00cb
+0xcc U+0300
+0xcd U+00cd
+0xce U+00ce
+0xcf U+00cf
+0xd0 U+0110
+0xd1 U+00d1
+0xd2 U+0309
+0xd3 U+00d3
+0xd4 U+00d4
+0xd5 U+01a0
+0xd6 U+00d6
+0xd7 U+00d7
+0xd8 U+00d8
+0xd9 U+00d9
+0xda U+00da
+0xdb U+00db
+0xdc U+00dc
+0xdd U+01af
+0xde U+0303
+0xdf U+00df
+0xe0 U+00e0
+0xe1 U+00e1
+0xe2 U+00e2
+0xe3 U+0103
+0xe4 U+00e4
+0xe5 U+00e5
+0xe6 U+00e6
+0xe7 U+00e7
+0xe8 U+00e8
+0xe9 U+00e9
+0xea U+00ea
+0xeb U+00eb
+0xec U+0301
+0xed U+00ed
+0xee U+00ee
+0xef U+00ef
+0xf0 U+0111
+0xf1 U+00f1
+0xf2 U+0323
+0xf3 U+00f3
+0xf4 U+00f4
+0xf5 U+01a1
+0xf6 U+00f6
+0xf7 U+00f7
+0xf8 U+00f8
+0xf9 U+00f9
+0xfa U+00fa
+0xfb U+00fb
+0xfc U+00fc
+0xfd U+01b0
+0xfe U+20ab
+0xff U+00ff
--- a/make/data/charsetmapping/charsets Tue Aug 07 23:08:52 2018 +0200
+++ b/make/data/charsetmapping/charsets Tue Aug 07 16:07:47 2018 -0700
@@ -1241,6 +1241,16 @@
alias ibm-1124
alias 1124
+charset x-IBM1129 IBM1129
+ package sun.nio.cs.ext
+ type sbcs
+ hisname Cp1129
+ ascii false
+ alias cp1129 # JDK historical
+ alias ibm1129
+ alias ibm-1129
+ alias 1129
+
charset x-IBM1364 IBM1364
package sun.nio.cs.ext
type ebcdic
--- a/make/data/charsetmapping/stdcs-aix Tue Aug 07 23:08:52 2018 +0200
+++ b/make/data/charsetmapping/stdcs-aix Tue Aug 07 16:07:47 2018 -0700
@@ -19,6 +19,7 @@
IBM970
IBM1046
IBM1124
+IBM1129
IBM1383
ISO_8859_6
ISO_8859_8
--- a/make/nb_native/nbproject/configurations.xml Tue Aug 07 23:08:52 2018 +0200
+++ b/make/nb_native/nbproject/configurations.xml Tue Aug 07 16:07:47 2018 -0700
@@ -116,6 +116,7 @@
<in>IBM1122.map</in>
<in>IBM1123.map</in>
<in>IBM1124.map</in>
+ <in>IBM1129.map</in>
<in>IBM1140.map</in>
<in>IBM1141.map</in>
<in>IBM1142.map</in>
@@ -16285,6 +16286,11 @@
tool="3"
flavor2="0">
</item>
+ <item path="../../make/data/charsetmapping/IBM1129.map"
+ ex="false"
+ tool="3"
+ flavor2="0">
+ </item>
<item path="../../make/data/charsetmapping/IBM1140.map"
ex="false"
tool="3"
--- a/test/jdk/java/nio/charset/Charset/RegisteredCharsets.java Tue Aug 07 23:08:52 2018 +0200
+++ b/test/jdk/java/nio/charset/Charset/RegisteredCharsets.java Tue Aug 07 16:07:47 2018 -0700
@@ -138,6 +138,7 @@
"x-IBM1122",
"x-IBM1123",
"x-IBM1124",
+ "x-IBM1129",
"x-IBM1166",
"x-IBM875",
"x-IBM921",
@@ -878,6 +879,14 @@
"1124"
} );
+ aliasCheck("x-IBM1129" ,
+ new String[] {
+ "cp1129", // JDK historical
+ "ibm1129",
+ "ibm-1129",
+ "1129"
+ } );
+
aliasCheck("x-IBM1166" ,
new String[] {
"cp1166", // JDK historical
--- a/test/jdk/java/nio/charset/RemovingSunIO/SunioAlias.java Tue Aug 07 23:08:52 2018 +0200
+++ b/test/jdk/java/nio/charset/RemovingSunIO/SunioAlias.java Tue Aug 07 16:07:47 2018 -0700
@@ -676,6 +676,12 @@
aliasTable.put("1124", "Cp1124");
// MIBenum: ????
+ aliasTable.put("ibm1129", "Cp1129");
+ aliasTable.put("ibm-1129", "Cp1129");
+ aliasTable.put("cp1129", "Cp1129");
+ aliasTable.put("1129", "Cp1129");
+
+ // MIBenum: ????
aliasTable.put("ibm1166", "Cp1166");
aliasTable.put("ibm-1166", "Cp1166");
aliasTable.put("cp1166", "Cp1166");
--- a/test/jdk/sun/nio/cs/CheckHistoricalNames.java Tue Aug 07 23:08:52 2018 +0200
+++ b/test/jdk/sun/nio/cs/CheckHistoricalNames.java Tue Aug 07 16:07:47 2018 -0700
@@ -197,6 +197,7 @@
checkMappedName("IBM1122", "Cp1122");
checkMappedName("IBM1123", "Cp1123");
checkMappedName("IBM1124", "Cp1124");
+ checkMappedName("IBM1129", "Cp1129");
checkMappedName("IBM1166", "Cp1166");
checkMappedName("IBM01140", "Cp1140");
checkMappedName("IBM01141", "Cp1141");