8035469: Xerces Update: EncodingMap does not recognize Java-style encodings Cp1141-Cp1149
Reviewed-by: lancea, joehw
Contributed-by: david.x.li@oracle.com
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java Fri Feb 21 16:57:21 2014 +0400
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java Fri Feb 28 15:57:37 2014 -0800
@@ -3,11 +3,12 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -469,6 +470,7 @@
* @author TAMURA Kent, IBM
* @author Andy Clark, IBM
*
+ * @version $Id$
*/
public class EncodingMap {
@@ -907,16 +909,16 @@
fJava2IANAMap.put("CP918", "EBCDIC-CP-AR2");
fJava2IANAMap.put("CP924", "IBM00924");
fJava2IANAMap.put("CP1026", "IBM1026");
- fJava2IANAMap.put("Cp01140", "IBM01140");
- fJava2IANAMap.put("Cp01141", "IBM01141");
- fJava2IANAMap.put("Cp01142", "IBM01142");
- fJava2IANAMap.put("Cp01143", "IBM01143");
- fJava2IANAMap.put("Cp01144", "IBM01144");
- fJava2IANAMap.put("Cp01145", "IBM01145");
- fJava2IANAMap.put("Cp01146", "IBM01146");
- fJava2IANAMap.put("Cp01147", "IBM01147");
- fJava2IANAMap.put("Cp01148", "IBM01148");
- fJava2IANAMap.put("Cp01149", "IBM01149");
+ fJava2IANAMap.put("CP1140", "IBM01140");
+ fJava2IANAMap.put("CP1141", "IBM01141");
+ fJava2IANAMap.put("CP1142", "IBM01142");
+ fJava2IANAMap.put("CP1143", "IBM01143");
+ fJava2IANAMap.put("CP1144", "IBM01144");
+ fJava2IANAMap.put("CP1145", "IBM01145");
+ fJava2IANAMap.put("CP1146", "IBM01146");
+ fJava2IANAMap.put("CP1147", "IBM01147");
+ fJava2IANAMap.put("CP1148", "IBM01148");
+ fJava2IANAMap.put("CP1149", "IBM01149");
fJava2IANAMap.put("EUCJIS", "EUC-JP");
fJava2IANAMap.put("KS_C_5601-1987", "KS_C_5601-1987");
fJava2IANAMap.put("GB2312", "GB2312");