/hg/icedtea8-forest/jaxp: 47 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Jul 26 03:56:12 UTC 2016


changeset e2d9a2244f83 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=e2d9a2244f83
author: andrew
date: Mon Jul 25 06:02:52 2016 +0100

	Added tag icedtea-3.1.0pre04 for changeset 0de4d7e1996f


changeset ace7a6ce99c4 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=ace7a6ce99c4
author: asaha
date: Thu Mar 31 11:41:22 2016 -0700

	Added tag jdk8u92-b14 for changeset fb9f98ed6ef2


changeset 9216364d6c4e in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=9216364d6c4e
author: asaha
date: Mon Jan 11 13:59:57 2016 -0800

	Added tag jdk8u81-b00 for changeset cb072b12f5db


changeset 5e03b07a8400 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=5e03b07a8400
author: asaha
date: Tue Jan 26 08:37:10 2016 -0800

	Added tag jdk8u40-b33 for changeset b02301aeab79


changeset b8c51ec07015 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=b8c51ec07015
author: asaha
date: Tue Jan 26 10:28:27 2016 -0800

	Merge


changeset c583ac51e2c7 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=c583ac51e2c7
author: aefimov
date: Sat Jan 30 16:00:25 2016 +0300

	Merge


changeset 4c8fd0814bf0 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=4c8fd0814bf0
author: asaha
date: Sun Jan 31 10:08:52 2016 -0800

	Added tag jdk8u74-b31 for changeset c583ac51e2c7


changeset 497fa9669412 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=497fa9669412
author: asaha
date: Thu Feb 04 15:28:12 2016 -0800

	Merge


changeset 403f1fbf113a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=403f1fbf113a
author: asaha
date: Fri Feb 05 23:21:10 2016 -0800

	Merge


changeset 29d2bdf57b71 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=29d2bdf57b71
author: asaha
date: Thu Feb 18 09:50:33 2016 -0800

	Merge


changeset af0ed7710ff9 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=af0ed7710ff9
author: asaha
date: Thu Feb 18 10:05:26 2016 -0800

	Merge


changeset 384aece5736d in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=384aece5736d
author: asaha
date: Mon Feb 22 13:41:17 2016 -0800

	Merge


changeset 1a44e95d4b9b in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=1a44e95d4b9b
author: asaha
date: Mon Feb 22 14:07:33 2016 -0800

	Merge


changeset b03b69adc909 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=b03b69adc909
author: aefimov
date: Wed Feb 24 14:58:38 2016 +0300

	8148872: Complete name checking
	Reviewed-by: dfuchs, lancea, ahgross


changeset 7762a169069f in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=7762a169069f
author: asaha
date: Tue Feb 23 09:28:38 2016 -0800

	Added tag jdk8u74-b32 for changeset 4c8fd0814bf0


changeset a38aa8b2188a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a38aa8b2188a
author: asaha
date: Tue Mar 01 15:21:54 2016 -0800

	Merge


changeset 2bbdcad0c4c8 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2bbdcad0c4c8
author: asaha
date: Tue Mar 01 15:35:21 2016 -0800

	Merge


changeset a0ec63b10c5e in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a0ec63b10c5e
author: asaha
date: Wed Mar 02 12:37:19 2016 -0800

	Merge


changeset 3be4bec77aa7 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=3be4bec77aa7
author: asaha
date: Tue Mar 22 21:57:15 2016 -0700

	Merge


changeset a6e134f7e03a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a6e134f7e03a
author: asaha
date: Tue Mar 22 22:42:19 2016 -0700

	Merge


changeset 6bf2caa30f4a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=6bf2caa30f4a
author: asaha
date: Wed Mar 23 14:26:54 2016 -0700

	Added tag jdk8u101-b00 for changeset cb072b12f5db


changeset fb5e0a18ad7d in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=fb5e0a18ad7d
author: asaha
date: Wed Mar 23 14:52:31 2016 -0700

	Merge


changeset 29eddeae1f94 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=29eddeae1f94
author: asaha
date: Mon Mar 28 11:32:35 2016 -0700

	Added tag jdk8u101-b01 for changeset fb5e0a18ad7d


changeset 1e01dcda858a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=1e01dcda858a
author: asaha
date: Thu Mar 31 14:05:17 2016 -0700

	Merge


changeset a49d8c7db1e5 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a49d8c7db1e5
author: asaha
date: Mon Mar 21 14:59:10 2016 -0700

	Merge


changeset 84b2461211a4 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=84b2461211a4
author: asaha
date: Tue Mar 22 12:01:34 2016 -0700

	Added tag jdk8u77-b31 for changeset a49d8c7db1e5


changeset ac887193179b in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=ac887193179b
author: asaha
date: Thu Mar 31 14:28:03 2016 -0700

	Merge


changeset c7aeb4e55b0f in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=c7aeb4e55b0f
author: asaha
date: Mon Apr 04 12:36:00 2016 -0700

	Merge


changeset a1fdac41939a in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a1fdac41939a
author: asaha
date: Mon Apr 04 13:59:30 2016 -0700

	Added tag jdk8u101-b02 for changeset c7aeb4e55b0f


changeset edce55dd1642 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=edce55dd1642
author: asaha
date: Sun Apr 10 23:18:03 2016 -0700

	Added tag jdk8u92-b31 for changeset ac887193179b


changeset 2089aaa60f91 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2089aaa60f91
author: asaha
date: Sun Apr 10 23:35:09 2016 -0700

	Merge


changeset c678c1a31a55 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=c678c1a31a55
author: aefimov
date: Mon Apr 11 15:18:31 2016 +0300

	8149962: Better delineation of XML processing
	Reviewed-by: dfuchs, lancea, ahgross


changeset a6a032a5490f in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=a6a032a5490f
author: asaha
date: Mon Apr 11 12:23:47 2016 -0700

	Added tag jdk8u101-b03 for changeset c678c1a31a55


changeset 80f389596bfa in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=80f389596bfa
author: asaha
date: Mon Apr 18 10:54:07 2016 -0700

	Added tag jdk8u101-b04 for changeset a6a032a5490f


changeset 03f2bf9410ef in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=03f2bf9410ef
author: asaha
date: Mon Apr 25 10:52:38 2016 -0700

	Added tag jdk8u101-b05 for changeset 80f389596bfa


changeset 39e620ddf0bb in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=39e620ddf0bb
author: asaha
date: Mon May 02 14:25:17 2016 -0700

	Added tag jdk8u101-b06 for changeset 03f2bf9410ef


changeset 20b471597633 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=20b471597633
author: asaha
date: Mon May 09 10:44:48 2016 -0700

	Added tag jdk8u101-b07 for changeset 39e620ddf0bb


changeset 43909a503007 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=43909a503007
author: asaha
date: Mon May 16 10:31:41 2016 -0700

	Added tag jdk8u101-b08 for changeset 20b471597633


changeset 97939d061a0e in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=97939d061a0e
author: asaha
date: Thu May 19 03:50:36 2016 -0700

	8157077: 8u101 L10n resource file updates
	Summary: 8u101 L10n resource file updates
	Reviewed-by: coffeys
	Contributed-by: li.jiang at oracle.com


changeset 626b83d17d5d in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=626b83d17d5d
author: asaha
date: Mon May 23 17:32:40 2016 -0700

	Added tag jdk8u101-b09 for changeset 97939d061a0e


changeset 3a7dd48f7d32 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=3a7dd48f7d32
author: asaha
date: Fri May 20 11:27:18 2016 -0700

	Added tag jdk8u91-b15 for changeset 8b0bf55a041a


changeset 0066fe71b120 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=0066fe71b120
author: asaha
date: Thu May 26 13:47:34 2016 -0700

	Merge


changeset 0878a0a5fdab in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=0878a0a5fdab
author: asaha
date: Tue May 31 09:24:38 2016 -0700

	Added tag jdk8u101-b10 for changeset 0066fe71b120


changeset ddcc10eeb9d3 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=ddcc10eeb9d3
author: asaha
date: Mon Jun 06 11:59:41 2016 -0700

	Added tag jdk8u101-b11 for changeset 0878a0a5fdab


changeset 8ee36eca2124 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=8ee36eca2124
author: asaha
date: Mon Jun 13 12:50:15 2016 -0700

	Added tag jdk8u101-b12 for changeset ddcc10eeb9d3


changeset 9368913c75fa in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=9368913c75fa
author: andrew
date: Mon Jul 25 06:38:22 2016 +0100

	Merge jdk8u101-b13


changeset 2acc40d95975 in /hg/icedtea8-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxp?cmd=changeset;node=2acc40d95975
author: andrew
date: Tue Jul 26 04:41:56 2016 +0100

	Added tag icedtea-3.1.0 for changeset 9368913c75fa


diffstat:

 .hgtags                                                                            |   33 +
 src/com/sun/org/apache/xalan/internal/XalanConstants.java                          |   15 +
 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java            |    2 +-
 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java                |    6 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java |    2 +-
 src/com/sun/org/apache/xerces/internal/impl/Constants.java                         |   17 +-
 src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java               |   71 +--
 src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java          |  154 +----
 src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java                |  192 +++----
 src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java        |   57 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java                 |  211 +++-----
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java    |  124 ++--
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java            |   38 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java                  |  237 ++++++--
 src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java          |   37 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                        |  244 ++++++---
 src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java                |   84 +--
 src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties  |    4 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties             |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties       |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties          |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties       |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties       |   11 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties |    2 +-
 src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java                 |   16 +-
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java               |    7 +-
 src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java              |    4 +-
 33 files changed, 814 insertions(+), 784 deletions(-)

diffs (truncated from 4113 to 500 lines):

diff -r 0de4d7e1996f -r 2acc40d95975 .hgtags
--- a/.hgtags	Thu Jul 14 04:02:31 2016 +0100
+++ b/.hgtags	Tue Jul 26 04:41:56 2016 +0100
@@ -394,6 +394,7 @@
 56f6ca79467d04eb95383102046836b6ac7d2811 jdk8u40-b27
 7e43d4e20a33b8b6bd06112e39d367b51de921a7 jdk8u40-b31
 8facbe662ec106f1aae271f5c59909e124938c40 jdk8u40-b32
+b02301aeab79b1ee7859aeeb994fa5ba31105734 jdk8u40-b33
 9286acc600a779acb8bcfab38e82d4f50704afe3 jdk8u45-b00
 9fded65e1d36e3388111955d50ebf8511dd0345e jdk8u45-b01
 62566a3dbe5982565ce3e468ee3980b7937a86cc jdk8u45-b02
@@ -556,10 +557,24 @@
 aa9485a887b7e983f9743c9c114de2055055300d jdk8u74-b01
 b3325c0526621f9ddf82738373cc8f8947dab195 jdk8u74-b02
 2b3d0e6f3cd179e2346679af2a8881bb6b20f968 jdk8u72-b31
+aeecbaa27f807ce0656a108cd0e81669724b8d1b jdk8u73-b00
+9009a8b2b55256764dd304902b04a3dea2597684 jdk8u73-b01
+7a021985ef009c3a88a206d6f295f17e382f98b9 jdk8u73-b02
+2e7b89c7f79794b872e73708fdaa3ed9331ec45d jdk8u74-b00
+aa9485a887b7e983f9743c9c114de2055055300d jdk8u74-b01
+b3325c0526621f9ddf82738373cc8f8947dab195 jdk8u74-b02
+c583ac51e2c78d6c59786b447986baf7b961518d jdk8u74-b31
+4c8fd0814bf0bcbc9666a29e1daa35c64c7bb57a jdk8u74-b32
+8cc52edbb741c42e09f4b132ca0a759d3de6f848 jdk8u77-b00
+8f0ed89698a28138065b6b941769650627636745 jdk8u77-b01
+27f1130320a55b6b89024cb8baa93c8767c516d2 jdk8u77-b02
+1c71899e85662239085fab94ad5c26441e7a80cd jdk8u77-b03
+a49d8c7db1e5b3ab84561069bd4ae63579139878 jdk8u77-b31
 eca165c0654ac2e1926b50655e5ed5e9b73ca674 jdk8u75-b00
 06cdf5dc679e0fef7c8e37c5c712b2c5891c1444 jdk8u75-b01
 26c297e9f11b78b55cdefd22849ae4fe55042a5b jdk8u75-b02
 2a292503c55704cb7f898fa195d76682c0ea6a72 jdk8u75-b03
+cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u101-b00
 cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u75-b04
 40ccc40d58450eb4518348f6b34885c5a711675a jdk8u75-b05
 e77acebebfdc2f84b1217be3a6a2eb4c205afda5 jdk8u75-b06
@@ -578,6 +593,7 @@
 6b0d1f04c4808aaab32771e0892ac83e66714ecb jdk8u91-b00
 817898d53814da42f567995c921f3ea90016dccc jdk8u91-b13
 f6bda5729ff86e9691cd51f04261c3942974cecc jdk8u91-b14
+8b0bf55a041ae5657b1ae9e74e68258e8d36dda4 jdk8u91-b15
 acbcb6682c9b3e66f9cc61a6a62e8cb5f24c75d3 jdk8u76-b00
 b3c914ad842d61818e0c5850409f77478b13acc6 jdk8u76-b01
 7711933ec18462ece8a1b9a9527ec873c520b1ab jdk8u76-b02
@@ -596,3 +612,20 @@
 4a6f560bdbe166a2ff0855221dd5fbe9a19e562b icedtea-3.1.0pre01
 6ee6f8ac74894acb6ad4b821c2ec393a5ef34108 icedtea-3.1.0pre02
 5c97913ea9f75839624308aac8e960444909f2c8 icedtea-3.1.0pre03
+0de4d7e1996f4c7d3cd5af3d92ddb70762e9b6a7 icedtea-3.1.0pre04
+fb9f98ed6ef2505a424864f0a9468e59298fede6 jdk8u92-b14
+ac887193179bae82fd1cdf4d8c463457163a6535 jdk8u92-b31
+cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u81-b00
+fb5e0a18ad7d49134616879d1a500b1356e12fd4 jdk8u101-b01
+c7aeb4e55b0f7de8c5bd2a6e41dc5c54c4239271 jdk8u101-b02
+c678c1a31a553ebe7a8fd3888acc282dbd975e3b jdk8u101-b03
+a6a032a5490f4000bdfb25a2f604b22bcdf95ecf jdk8u101-b04
+80f389596bfaa22d4d2282b8417b98a53241f2aa jdk8u101-b05
+03f2bf9410ef2aad8d8a5ab0432ae0dbdf8bfd62 jdk8u101-b06
+39e620ddf0bb8c6a6d6f0588c71d5f43d8bcc987 jdk8u101-b07
+20b4715976338d4307c2d70e205ce88f31fbd7e7 jdk8u101-b08
+97939d061a0e492c6c2b464df44373165ecc15d2 jdk8u101-b09
+0066fe71b1203e103f7e1a2354bd94f65fdf38fd jdk8u101-b10
+0878a0a5fdabeec872e878f4737d96edee8b1393 jdk8u101-b11
+ddcc10eeb9d3367eb4b3fa0cd4d118e6dbc8850e jdk8u101-b12
+9368913c75fa32e0cf33c542ed72e0146d84401d icedtea-3.1.0
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xalan/internal/XalanConstants.java
--- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Tue Jul 26 04:41:56 2016 +0100
@@ -81,6 +81,14 @@
      */
     public static final String JDK_GENERAL_ENTITY_SIZE_LIMIT =
             ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+
+    /**
+     * JDK node count limit in entities that limits the total number of nodes
+     * in all of entity references.
+     */
+    public static final String JDK_ENTITY_REPLACEMENT_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "entityReplacementLimit";
+
     /**
      * JDK maximum parameter entity size limit
      */
@@ -137,6 +145,13 @@
      * JDK maximum general entity size limit
      */
     public static final String SP_GENERAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+
+    /**
+     * JDK node count limit in entities that limits the total number of nodes
+     * in all of entity references.
+     */
+    public static final String SP_ENTITY_REPLACEMENT_LIMIT = "jdk.xml.entityReplacementLimit";
+
     /**
      * JDK maximum parameter entity size limit
      */
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java	Tue Jul 26 04:41:56 2016 +0100
@@ -1265,7 +1265,7 @@
       "\u627E\u4E0D\u5230\u5341\u9032\u4F4D\u683C\u5F0F\u7684\u5BA3\u544A: {0}"},
 
     { WG_OLD_XSLT_NS,
-     "\u907A\u6F0F\u6216\u4E0D\u6B63\u78BA\u7684 XSLT \u547D\u540D\u7A7A\u9593\u3002 "},
+     "\u907A\u6F0F\u6216\u4E0D\u6B63\u78BA\u7684 XSLT \u547D\u540D\u7A7A\u9593\u3002"},
 
     { WG_ONE_DEFAULT_XSLDECIMALFORMAT_ALLOWED,
       "\u53EA\u5141\u8A31\u4E00\u500B\u9810\u8A2D\u7684 xsl:decimal-format \u5BA3\u544A\u3002"},
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
--- a/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java	Tue Jul 26 04:41:56 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,9 @@
         MAX_ELEMENT_DEPTH_LIMIT("MaxElementDepthLimit", XalanConstants.JDK_MAX_ELEMENT_DEPTH,
                 XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0),
         MAX_NAME_LIMIT("MaxXMLNameLimit", XalanConstants.JDK_XML_NAME_LIMIT,
-                XalanConstants.SP_XML_NAME_LIMIT, 1000, 1000);
+                XalanConstants.SP_XML_NAME_LIMIT, 1000, 1000),
+        ENTITY_REPLACEMENT_LIMIT("EntityReplacementLimit", XalanConstants.JDK_ENTITY_REPLACEMENT_LIMIT,
+                XalanConstants.SP_ENTITY_REPLACEMENT_LIMIT, 0, 3000000);
 
         final String key;
         final String apiProperty;
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java	Tue Jul 26 04:41:56 2016 +0100
@@ -682,7 +682,7 @@
          * documentation.
          */
         {ErrorMsg.COMPILE_USAGE_STR,
-        "\u6982\u8981\n   java com.sun.org.apache.xalan.internal.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n\u9078\u9805\n   -o <output>    \u6307\u6D3E\u540D\u7A31 <output> \u81F3\u7522\u751F\u7684\n                  translet\u3002\u6839\u64DA\u9810\u8A2D\uFF0Ctranslet \u540D\u7A31\n                  \u884D\u751F\u81EA <stylesheet> \u540D\u7A31\u3002  \u82E5\u7DE8\u8B6F\n                  \u591A\u500B\u6A23\u5F0F\u8868\uFF0C\u5C07\u5FFD\u7565\u6B64\u9078\u9805\u3002\n   -d <directory> \u6307\u5B9A translet \u7684\u76EE\u7684\u5730\u76EE\u9304\n   -j <jarfile>   \u5C01\u88DD translet \u985E\u5225\u6210\u70BA jar \u6A94\u6848\uFF0C\n                  \u540D\u7A31\u6307\u5B9A\u70BA <jarfile>\n   -p <package>   \u6307\u5B9A\u6240\u6709\u7522\u751F\u7684 translet \u985E\u5225\u7684\u5957\u88DD\u7A0B\u5F0F\n                  \u540D\u7A31\u524D\u7F6E\u78BC\u3002\n   -n             \u555F\u7528\u6A23\u677F\u5167\u5D4C (\u9810\u8A2D\u884C\u70BA\u4E00\u822C\u800C\u8A00\n                  \u8F03\u4F73)\u3002\n   -x             \u958B\u555F\u984D\u5916\u7684\u9664\u932F\u8A0A\u606F\u8F38\u51FA\n   -u             \u89E3\u8B6F <stylesheet> \u5F15\u6578\u70BA URL\n   -i             \u5F37\u5236\u7DE8\u8B6F\u5668\u5F9E stdin \u8B80\u53D6\u6A23\u5F0F\u8868\n   -v             \u5217\u5370\u7DE8\u8B6F\u5668\u7248\u672C\n   -h             \u5217\u5370\u6B64\u7528\u6CD5\u6558\u8FF0\n"},
+        "\u6982\u8981\n   java com.sun.org.apache.xalan.internal.xsltc.cmdline.Compile [-o <output>]\n      [-d <directory>] [-j <jarfile>] [-p <package>]\n      [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\n\u9078\u9805\n   -o <output>    \u6307\u6D3E\u540D\u7A31 <output> \u81F3\u7522\u751F\u7684\n                  translet\u3002\u6839\u64DA\u9810\u8A2D\uFF0Ctranslet \u540D\u7A31\n                  \u884D\u751F\u81EA <stylesheet> \u540D\u7A31\u3002\u82E5\u7DE8\u8B6F\n                  \u591A\u500B\u6A23\u5F0F\u8868\uFF0C\u5C07\u5FFD\u7565\u6B64\u9078\u9805\u3002\n   -d <directory> \u6307\u5B9A translet \u7684\u76EE\u7684\u5730\u76EE\u9304\n   -j <jarfile>   \u5C01\u88DD translet \u985E\u5225\u6210\u70BA jar \u6A94\u6848\uFF0C\n                  \u540D\u7A31\u6307\u5B9A\u70BA <jarfile>\n   -p <package>   \u6307\u5B9A\u6240\u6709\u7522\u751F\u7684 translet \u985E\u5225\u7684\u5957\u88DD\u7A0B\u5F0F\n                  \u540D\u7A31\u524D\u7F6E\u78BC\u3002\n   -n             \u555F\u7528\u6A23\u677F\u5167\u5D4C (\u9810\u8A2D\u884C\u70BA\u4E00\u822C\u800C\u8A00\n                  \u8F03\u4F73)\u3002\n   -x             \u958B\u555F\u984D\u5916\u7684\u9664\u932F\u8A0A\u606F\u8F38\u51FA\n   -u             \u89E3\u8B6F <stylesheet> \u5F15\u6578\u70BA URL\n   -i             \u5F37\u5236\u7DE8\u8B6F\u5668\u5F9E stdin \u8B80\u53D6\u6A23\u5F0F\u8868\n   -v             \u5217\u5370\u7DE8\u8B6F\u5668\u7248\u672C\n   -h             \u5217\u5370\u6B64\u7528\u6CD5\u6558\u8FF0\n"},
 
         /*
          * Note to translators:  This message contains usage information for a
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xerces/internal/impl/Constants.java
--- a/src/com/sun/org/apache/xerces/internal/impl/Constants.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/Constants.java	Tue Jul 26 04:41:56 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -242,6 +242,14 @@
      */
     public static final String JDK_GENERAL_ENTITY_SIZE_LIMIT =
             ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+
+    /**
+     * JDK node count limit in entities that limits the total number of nodes
+     * in all of entity references.
+     */
+    public static final String JDK_ENTITY_REPLACEMENT_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "entityReplacementLimit";
+
     /**
      * JDK maximum parameter entity size limit
      */
@@ -295,6 +303,13 @@
      * JDK maximum general entity size limit
      */
     public static final String SP_GENERAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+
+    /**
+     * JDK node count limit in entities that limits the total number of nodes
+     * in all of entity references.
+     */
+    public static final String SP_ENTITY_REPLACEMENT_LIMIT = "jdk.xml.entityReplacementLimit";
+
     /**
      * JDK maximum parameter entity size limit
      */
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java	Tue Jul 26 04:41:56 2016 +0100
@@ -1,62 +1,21 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  */
 /*
- * The Apache Software License, Version 1.1
+ * 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
  *
- * Copyright (c) 1999-2004 The Apache Software Foundation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache at apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.apache.org.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.sun.org.apache.xerces.internal.impl;
@@ -156,7 +115,7 @@
     protected boolean scanPubidLiteral(XMLString literal)
         throws IOException, XNIException
     {
-        int quote = fEntityScanner.scanChar();
+        int quote = fEntityScanner.scanChar(null);
         if (quote != '\'' && quote != '"') {
             reportFatalError("QuoteRequiredInPublicID", null);
             return false;
@@ -167,7 +126,7 @@
         boolean skipSpace = true;
         boolean dataok = true;
         while (true) {
-            int c = fEntityScanner.scanChar();
+            int c = fEntityScanner.scanChar(null);
             // REVISIT:  it could really only be \n or 0x20; all else is normalized, no?  - neilg
             if (c == ' ' || c == '\n' || c == '\r' || c == 0x85 || c == 0x2028) {
                 if (!skipSpace) {
diff -r 0de4d7e1996f -r 2acc40d95975 src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java	Thu Jul 14 04:02:31 2016 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java	Tue Jul 26 04:41:56 2016 +0100
@@ -1,74 +1,32 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  */
 /*
- * The Apache Software License, Version 1.1
+ * 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
  *
- * Copyright (c) 1999-2004 The Apache Software Foundation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache at apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.apache.org.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.sun.org.apache.xerces.internal.impl;
 
-import java.io.IOException;
-
 import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
 import com.sun.org.apache.xerces.internal.util.XML11Char;
 import com.sun.org.apache.xerces.internal.util.XMLChar;
 import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
 import com.sun.org.apache.xerces.internal.xni.XMLString;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
+import java.io.IOException;
 
 /**
  * This class is responsible for scanning XML document structure
@@ -135,7 +93,7 @@
             // happens when there is the character reference 
             // but scanContent doesn't do entity expansions...
             // is this *really* necessary???  - NG
-            fEntityScanner.scanChar();
+            fEntityScanner.scanChar(null);
             content.append((char)c);
             c = -1;
         }
@@ -144,7 +102,7 @@
         } */
 
         if (c == ']') {
-            content.append((char)fEntityScanner.scanChar());
+            content.append((char)fEntityScanner.scanChar(null));
             // remember where we are in case we get an endEntity before we
             // could flush the buffer out - this happens when we're parsing an
             // entity which ends with a ]
@@ -153,12 +111,12 @@
             // We work on a single character basis to handle cases such as:
             // ']]]>' which we might otherwise miss.
             //
-            if (fEntityScanner.skipChar(']')) {
+            if (fEntityScanner.skipChar(']', null)) {
                 content.append(']');
-                while (fEntityScanner.skipChar(']')) {
+                while (fEntityScanner.skipChar(']', null)) {
                     content.append(']');
                 }
-                if (fEntityScanner.skipChar('>')) {
+                if (fEntityScanner.skipChar('>', null)) {
                     reportFatalError("CDEndInContent", null);
                 }
             }
@@ -185,6 +143,7 @@
      * @param checkEntities true if undeclared entities should be reported as VC violation,
      *                      false if undeclared entities should be reported as WFC violation.
      * @param eleName The name of element to which this attribute belongs.
+     * @param isNSURI The flag indicating whether the content is a namespace URI
      *
      * @return true if the non-normalized and normalized value are the same
      *
@@ -194,7 +153,7 @@
     protected boolean scanAttributeValue(XMLString value,
                                       XMLString nonNormalizedValue,
                                       String atName,
-                                      boolean checkEntities,String eleName)
+                                      boolean checkEntities,String eleName, boolean isNSURI)
         throws IOException, XNIException
     {
         // quote
@@ -203,10 +162,10 @@
             reportFatalError("OpenQuoteExpected", new Object[]{eleName,atName});
         }
 
-        fEntityScanner.scanChar();
+        fEntityScanner.scanChar(NameType.ATTRIBUTE);
         int entityDepth = fEntityDepth;
 
-        int c = fEntityScanner.scanLiteral(quote, value);
+        int c = fEntityScanner.scanLiteral(quote, value, isNSURI);
         if (DEBUG_ATTR_NORMALIZATION) {
             System.out.println("** scanLiteral -> \""
                                + value.toString() + "\"");
@@ -216,7 +175,7 @@
         if (c == quote && (fromIndex = isUnchangedByNormalization(value)) == -1) {
             /** Both the non-normalized and normalized attribute values are equal. **/
             nonNormalizedValue.setValues(value);
-            int cquote = fEntityScanner.scanChar();
+            int cquote = fEntityScanner.scanChar(NameType.ATTRIBUTE);
             if (cquote != quote) {
                 reportFatalError("CloseQuoteExpected", new Object[]{eleName,atName});
             }
@@ -239,11 +198,11 @@
                                        + fStringBuffer.toString() + "\"");
                 }
                 if (c == '&') {
-                    fEntityScanner.skipChar('&');
+                    fEntityScanner.skipChar('&', NameType.REFERENCE);
                     if (entityDepth == fEntityDepth) {
                         fStringBuffer2.append('&');
                     }
-                    if (fEntityScanner.skipChar('#')) {
+                    if (fEntityScanner.skipChar('#', NameType.REFERENCE)) {
                         if (entityDepth == fEntityDepth) {
                             fStringBuffer2.append('#');
                         }
@@ -257,59 +216,22 @@
                         }
                     }
                     else {
-                        String entityName = fEntityScanner.scanName();
+                        String entityName = fEntityScanner.scanName(NameType.REFERENCE);
                         if (entityName == null) {
                             reportFatalError("NameRequiredInReference", null);
                         }
                         else if (entityDepth == fEntityDepth) {
                             fStringBuffer2.append(entityName);
                         }
-                        if (!fEntityScanner.skipChar(';')) {
+                        if (!fEntityScanner.skipChar(';', NameType.REFERENCE)) {
                             reportFatalError("SemicolonRequiredInReference",
                                              new Object []{entityName});
                         }
                         else if (entityDepth == fEntityDepth) {
                             fStringBuffer2.append(';');
                         }
-                        if (entityName == fAmpSymbol) {
-                            fStringBuffer.append('&');
-                            if (DEBUG_ATTR_NORMALIZATION) {
-                                System.out.println("** value5: \""
-                                                   + fStringBuffer.toString()
-                                                   + "\"");
-                            }
-                        }
-                        else if (entityName == fAposSymbol) {
-                            fStringBuffer.append('\'');
-                            if (DEBUG_ATTR_NORMALIZATION) {
-                                System.out.println("** value7: \""
-                                                   + fStringBuffer.toString()
-                                                   + "\"");
-                            }
-                        }
-                        else if (entityName == fLtSymbol) {
-                            fStringBuffer.append('<');
-                            if (DEBUG_ATTR_NORMALIZATION) {
-                                System.out.println("** value9: \""
-                                                   + fStringBuffer.toString()
-                                                   + "\"");
-                            }


More information about the distro-pkg-dev mailing list