diff --git a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
index 4034675a649fefc43ed9111e1334a52d709023d3..886108a77911e21bea0c5ed099e6a8288f2088b3 100644
--- a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
+++ b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
@@ -831,7 +831,7 @@
<Message Id="XSer_GrammarPool_Empty" Text="Grammar Pool is empty"/>
<Message Id="XSer_GrammarPool_NotEmpty" Text="Grammar Pool is NOT empty"/>
<Message Id="XSer_StringPool_NotEmpty" Text="String Pool is NOT empty"/>
- <Message Id="XSer_BinaryData_Version_NotSupported" Text="Binary Data Version '{0}','{1}','{2}' not supported "/>
+ <Message Id="XSer_Storer_NewerThan_Loader" Text="Storer Level '{0}' is newer than Loader Level'{1}' "/>
</FatalError>
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XMLDOMMsg">
diff --git a/src/xercesc/internal/XMLGrammarPoolImpl.cpp b/src/xercesc/internal/XMLGrammarPoolImpl.cpp
index d7b31d73061211541757457d1a73f41ea81ae334..a15e5b4fb09198576ac6c4bb012bf0dd4821b5d4 100644
--- a/src/xercesc/internal/XMLGrammarPoolImpl.cpp
+++ b/src/xercesc/internal/XMLGrammarPoolImpl.cpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.25 2004/11/09 03:09:21 peiyongz
+ * Storer_NewerThan_Loader
+ *
* Revision 1.24 2004/11/08 03:57:22 peiyongz
* read/write Storer level
*
@@ -111,7 +114,6 @@
#include <xercesc/validators/schema/XMLSchemaDescriptionImpl.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
#include <xercesc/util/SynchronizedStringPool.hpp>
-#include <xercesc/util/XMLUni.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -381,7 +383,6 @@ void XMLGrammarPoolImpl::deserializeGrammars(BinInputStream* const binIn)
{
ThrowXMLwithMemMgr(XSerializationException, XMLExcepts::XSer_GrammarPool_NotEmpty, memMgr);
}
-
try
{
@@ -398,15 +399,13 @@ void XMLGrammarPoolImpl::deserializeGrammars(BinInputStream* const binIn)
{
XMLCh StorerLevelChar[5];
XMLCh LoaderLevelChar[5];
- XMLCh DummyChar[2] = {chNull};
XMLString::binToText(StorerLevel, StorerLevelChar, 4, 10, memMgr);
XMLString::binToText(XERCES_GRAMMAR_SERIALIZATION_LEVEL, LoaderLevelChar, 4, 10, memMgr);
- ThrowXMLwithMemMgr3(XSerializationException
- , XMLExcepts::XSer_BinaryData_Version_NotSupported
+ ThrowXMLwithMemMgr2(XSerializationException
+ , XMLExcepts::XSer_Storer_NewerThan_Loader
, StorerLevelChar
, LoaderLevelChar
- , DummyChar
, memMgr);
}
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt b/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
index 49f976b1f72f213079218ff346711d6eee41321d..6205648b82cbe30b6d545d38817ca1061a3e4633 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
@@ -832,7 +832,7 @@ en_US {
"Grammar Pool is empty " ,
"Grammar Pool is NOT empty " ,
"String Pool is NOT empty " ,
- "Binary Data Version '{0}','{1}','{2}' not supported " ,
+ "Storer Level '{0}' is newer than Loader Level'{1}' " ,
"F_ End " ,
}
diff --git a/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp b/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
index be02f503f62155d23e70d19cbb1c9f149b39f782..2f614bc9f3817e1a524a8f6a388daa3d3d13c174 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
@@ -1650,8 +1650,8 @@ const XMLCh gXMLExceptArray[][128] =
, { 0x0047,0x0072,0x0061,0x006D,0x006D,0x0061,0x0072,0x0020,0x0050,0x006F,0x006F,0x006C,0x0020,0x0069,0x0073,0x0020,0x0065,0x006D,0x0070,0x0074,0x0079,0x00 }
, { 0x0047,0x0072,0x0061,0x006D,0x006D,0x0061,0x0072,0x0020,0x0050,0x006F,0x006F,0x006C,0x0020,0x0069,0x0073,0x0020,0x004E,0x004F,0x0054,0x0020,0x0065,0x006D,0x0070,0x0074,0x0079,0x00 }
, { 0x0053,0x0074,0x0072,0x0069,0x006E,0x0067,0x0020,0x0050,0x006F,0x006F,0x006C,0x0020,0x0069,0x0073,0x0020,0x004E,0x004F,0x0054,0x0020,0x0065,0x006D,0x0070,0x0074,0x0079,0x00 }
- , { 0x0042,0x0069,0x006E,0x0061,0x0072,0x0079,0x0020,0x0044,0x0061,0x0074,0x0061,0x0020,0x0056,0x0065,0x0072,0x0073,0x0069,0x006F,0x006E,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x002C,0x0027,0x007B,0x0031,0x007D,0x0027,0x002C,0x0027,0x007B,0x0032,
- 0x007D,0x0027,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x0020,0x00 }
+ , { 0x0053,0x0074,0x006F,0x0072,0x0065,0x0072,0x0020,0x004C,0x0065,0x0076,0x0065,0x006C,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x0065,0x0077,0x0065,0x0072,0x0020,0x0074,0x0068,0x0061,0x006E,0x0020,0x004C,0x006F,
+ 0x0061,0x0064,0x0065,0x0072,0x0020,0x004C,0x0065,0x0076,0x0065,0x006C,0x0027,0x007B,0x0031,0x007D,0x0027,0x0020,0x00 }
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
index 1a5768bae72e86bcd6abd27de83bd41433da2592..909154fa7463a8e7af724509348181c25ae4dff0 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
@@ -815,7 +815,7 @@ $set 3
397 Grammar Pool is empty
398 Grammar Pool is NOT empty
399 String Pool is NOT empty
-400 Binary Data Version '{0}','{1}','{2}' not supported
+400 Storer Level '{0}' is newer than Loader Level'{1}'
$set 4
diff --git a/src/xercesc/util/Platforms/Win32/Version.rc b/src/xercesc/util/Platforms/Win32/Version.rc
index 4fc40ba4b9615dd2fc630b4adec2ef3979c66edc..9578ffadc0933a18b75773fb4e3ad6b5e7ab57cc 100644
--- a/src/xercesc/util/Platforms/Win32/Version.rc
+++ b/src/xercesc/util/Platforms/Win32/Version.rc
@@ -917,7 +917,7 @@ BEGIN
8589 L"\x0047\x0072\x0061\x006D\x006D\x0061\x0072\x0020\x0050\x006F\x006F\x006C\x0020\x0069\x0073\x0020\x0065\x006D\x0070\x0074\x0079\x00"
8590 L"\x0047\x0072\x0061\x006D\x006D\x0061\x0072\x0020\x0050\x006F\x006F\x006C\x0020\x0069\x0073\x0020\x004E\x004F\x0054\x0020\x0065\x006D\x0070\x0074\x0079\x00"
8591 L"\x0053\x0074\x0072\x0069\x006E\x0067\x0020\x0050\x006F\x006F\x006C\x0020\x0069\x0073\x0020\x004E\x004F\x0054\x0020\x0065\x006D\x0070\x0074\x0079\x00"
- 8592 L"\x0042\x0069\x006E\x0061\x0072\x0079\x0020\x0044\x0061\x0074\x0061\x0020\x0056\x0065\x0072\x0073\x0069\x006F\x006E\x0020\x0027\x007B\x0030\x007D\x0027\x002C\x0027\x007B\x0031\x007D\x0027\x002C\x0027\x007B\x0032\x007D\x0027\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x0020\x00"
+ 8592 L"\x0053\x0074\x006F\x0072\x0065\x0072\x0020\x004C\x0065\x0076\x0065\x006C\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x0065\x0077\x0065\x0072\x0020\x0074\x0068\x0061\x006E\x0020\x004C\x006F\x0061\x0064\x0065\x0072\x0020\x004C\x0065\x0076\x0065\x006C\x0027\x007B\x0031\x007D\x0027\x0020\x00"
END
STRINGTABLE DISCARDABLE
BEGIN
@@ -946,7 +946,6 @@ BEGIN
24600 L"\x0055\x006E\x0072\x0065\x0063\x006F\x0067\x006E\x0069\x007A\x0065\x0064\x0020\x004E\x006F\x0064\x0065\x0020\x0054\x0079\x0070\x0065\x00"
END
-
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/xercesc/util/XMLExceptMsgs.hpp b/src/xercesc/util/XMLExceptMsgs.hpp
index b3efe9a59ae9d586348751091235a615eb520bc8..5b9efe7da8d95e31b6201431d23f793afe75f7f2 100644
--- a/src/xercesc/util/XMLExceptMsgs.hpp
+++ b/src/xercesc/util/XMLExceptMsgs.hpp
@@ -413,7 +413,7 @@ public :
, XSer_GrammarPool_Empty = 397
, XSer_GrammarPool_NotEmpty = 398
, XSer_StringPool_NotEmpty = 399
- , XSer_BinaryData_Version_NotSupported = 400
+ , XSer_Storer_NewerThan_Loader = 400
, F_HighBounds = 401
, E_LowBounds = 402
, E_HighBounds = 403