diff --git a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
index 0150e28233705489da7fc2add0cbe571b00ab77d..ffc2472a0520fd963d62297920ab593e11d79215 100644
--- a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
+++ b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
@@ -296,6 +296,8 @@
<Message Id="BadSchemaLocation" Text="The schemaLocation attribute does not contain pairs of values."/>
<Message Id="NoGrammarResolver" Text="Internal error: don't have a GrammarResolver for TraverseSchema"/>
<Message Id="SchemaScanFatalError" Text="Fatal error encountered during schema scan"/>
+ <Message Id="IllegalRefInStandalone" Text="Reference to external entity declaration '{0}' is not allowed in a standalone document."/>
+ <Message Id="PEBetweenDecl" Text="Partial markup in parameter entity replacement text in a complete declaration."/>
</FatalError>
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XMLValidity">
@@ -378,7 +380,7 @@
<Message Id="GenericError" Text="Schema error during parsing"/>
<Message Id="ElementNotQualified" Text="Element '{0}' should be qualified"/>
<Message Id="ElementNotUnQualified" Text="Element '{0}' should be un-qualified"/>
- <Message Id="IllegalRefInStandalone" Text="Reference to external entity declaration '{0}' is not allowed in a standalone document."/>
+ <Message Id="VC_IllegalRefInStandalone" Text="Reference to external entity declaration '{0}' is not allowed in a standalone document."/>
<Message Id="NoDefAttForStandalone" Text="Attribute '{0}' for element '{1}' has a default value and must be specified in a standalone document."/>
<Message Id="NoAttNormForStandalone" Text="Attribute '{0}' must not be changed by normalization in a standalone document."/>
<Message Id="NoWSForStandalone" Text="White space must not occur between externally declared elements with element content in a standalone document."/>
diff --git a/src/xercesc/framework/XMLErrorCodes.hpp b/src/xercesc/framework/XMLErrorCodes.hpp
index 9ddc933d557791ca125e1e00ea68834fa3571abc..4dcd32ff813e6139699bb7977d4c15611f344461 100644
--- a/src/xercesc/framework/XMLErrorCodes.hpp
+++ b/src/xercesc/framework/XMLErrorCodes.hpp
@@ -303,7 +303,9 @@ public :
, BadSchemaLocation = 287
, NoGrammarResolver = 288
, SchemaScanFatalError = 289
- , F_HighBounds = 290
+ , IllegalRefInStandalone = 290
+ , PEBetweenDecl = 291
+ , F_HighBounds = 292
};
static bool isFatal(const XMLErrs::Codes toCheck)
diff --git a/src/xercesc/framework/XMLValidityCodes.hpp b/src/xercesc/framework/XMLValidityCodes.hpp
index 91f82581b3ec3c923dd85d43d25b16c491e949fd..ee3c47f931889d98fb11402bc6ad2889bc8fa31b 100644
--- a/src/xercesc/framework/XMLValidityCodes.hpp
+++ b/src/xercesc/framework/XMLValidityCodes.hpp
@@ -93,7 +93,7 @@ public :
, GenericError = 77
, ElementNotQualified = 78
, ElementNotUnQualified = 79
- , IllegalRefInStandalone = 80
+ , VC_IllegalRefInStandalone = 80
, NoDefAttForStandalone = 81
, NoAttNormForStandalone = 82
, NoWSForStandalone = 83
diff --git a/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp b/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
index 13fc1c4b253e98888558478d5e7c4b65faa669a7..03f2b55c5b6e5031e69c89daa820692586792e4a 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
@@ -622,10 +622,16 @@ const XMLCh gXMLErrArray[][128] =
0x0072,0x0052,0x0065,0x0073,0x006F,0x006C,0x0076,0x0065,0x0072,0x0020,0x0066,0x006F,0x0072,0x0020,0x0054,0x0072,0x0061,0x0076,0x0065,0x0072,0x0073,0x0065,0x0053,0x0063,0x0068,0x0065,0x006D,0x0061,0x00 }
, { 0x0046,0x0061,0x0074,0x0061,0x006C,0x0020,0x0065,0x0072,0x0072,0x006F,0x0072,0x0020,0x0065,0x006E,0x0063,0x006F,0x0075,0x006E,0x0074,0x0065,0x0072,0x0065,0x0064,0x0020,0x0064,0x0075,0x0072,0x0069,0x006E,0x0067,0x0020,0x0073,0x0063,0x0068,0x0065,
0x006D,0x0061,0x0020,0x0073,0x0063,0x0061,0x006E,0x00 }
+ , { 0x0052,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x0020,0x0074,0x006F,0x0020,0x0065,0x0078,0x0074,0x0065,0x0072,0x006E,0x0061,0x006C,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,
+ 0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0069,0x006E,0x0020,0x0061,0x0020,0x0073,0x0074,0x0061,
+ 0x006E,0x0064,0x0061,0x006C,0x006F,0x006E,0x0065,0x0020,0x0064,0x006F,0x0063,0x0075,0x006D,0x0065,0x006E,0x0074,0x002E,0x00 }
+ , { 0x0050,0x0061,0x0072,0x0074,0x0069,0x0061,0x006C,0x0020,0x006D,0x0061,0x0072,0x006B,0x0075,0x0070,0x0020,0x0069,0x006E,0x0020,0x0070,0x0061,0x0072,0x0061,0x006D,0x0065,0x0074,0x0065,0x0072,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,
+ 0x0072,0x0065,0x0070,0x006C,0x0061,0x0063,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0074,0x0065,0x0078,0x0074,0x0020,0x0069,0x006E,0x0020,0x0061,0x0020,0x0063,0x006F,0x006D,0x0070,0x006C,0x0065,0x0074,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,
+ 0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x002E,0x00 }
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLErrArraySize = 291;
+const unsigned int gXMLErrArraySize = 293;
const XMLCh gXMLValidityArray[][128] =
{
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_EN_US.Msg b/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_EN_US.Msg
index 37ae2c9184b8c79128a54e1bdd09e9a38894b292..d7124df167982e9f88bfecd220cb4bf9c49af600 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_EN_US.Msg
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_EN_US.Msg
@@ -284,6 +284,8 @@ $set 1
287 The schemaLocation attribute does not contain pairs of values.
288 Internal error: don't have a GrammarResolver for TraverseSchema
289 Fatal error encountered during schema scan
+290 Reference to external entity declaration '{0}' is not allowed in a standalone document.
+291 Partial markup in parameter entity replacement text in a complete declaration.
$set 2
diff --git a/src/xercesc/util/Platforms/Win32/Version.rc b/src/xercesc/util/Platforms/Win32/Version.rc
index 7e2414c0643fd900cb2403114a7a49ba48192032..d597bce620b5dbecc7454131d695aa8695be357f 100644
--- a/src/xercesc/util/Platforms/Win32/Version.rc
+++ b/src/xercesc/util/Platforms/Win32/Version.rc
@@ -386,6 +386,8 @@ BEGIN
287 L"\x0054\x0068\x0065\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x004C\x006F\x0063\x0061\x0074\x0069\x006F\x006E\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0064\x006F\x0065\x0073\x0020\x006E\x006F\x0074\x0020\x0063\x006F\x006E\x0074\x0061\x0069\x006E\x0020\x0070\x0061\x0069\x0072\x0073\x0020\x006F\x0066\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x002E\x00"
288 L"\x0049\x006E\x0074\x0065\x0072\x006E\x0061\x006C\x0020\x0065\x0072\x0072\x006F\x0072\x003A\x0020\x0064\x006F\x006E\x0027\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0061\x0020\x0047\x0072\x0061\x006D\x006D\x0061\x0072\x0052\x0065\x0073\x006F\x006C\x0076\x0065\x0072\x0020\x0066\x006F\x0072\x0020\x0054\x0072\x0061\x0076\x0065\x0072\x0073\x0065\x0053\x0063\x0068\x0065\x006D\x0061\x00"
289 L"\x0046\x0061\x0074\x0061\x006C\x0020\x0065\x0072\x0072\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0075\x006E\x0074\x0065\x0072\x0065\x0064\x0020\x0064\x0075\x0072\x0069\x006E\x0067\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x0020\x0073\x0063\x0061\x006E\x00"
+ 290 L"\x0052\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x0020\x0074\x006F\x0020\x0065\x0078\x0074\x0065\x0072\x006E\x0061\x006C\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0069\x006E\x0020\x0061\x0020\x0073\x0074\x0061\x006E\x0064\x0061\x006C\x006F\x006E\x0065\x0020\x0064\x006F\x0063\x0075\x006D\x0065\x006E\x0074\x002E\x00"
+ 291 L"\x0050\x0061\x0072\x0074\x0069\x0061\x006C\x0020\x006D\x0061\x0072\x006B\x0075\x0070\x0020\x0069\x006E\x0020\x0070\x0061\x0072\x0061\x006D\x0065\x0074\x0065\x0072\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0072\x0065\x0070\x006C\x0061\x0063\x0065\x006D\x0065\x006E\x0074\x0020\x0074\x0065\x0078\x0074\x0020\x0069\x006E\x0020\x0061\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0074\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x002E\x00"
END
STRINGTABLE DISCARDABLE
BEGIN