knoaman 2003/10/22 13:27:30
Modified: c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
c/src/xercesc/framework XMLValidityCodes.hpp
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/util/Platforms/Win32 Version.rc
Log:
Update error messages
Revision Changes Path
1.37 +1 -0 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- XMLErrList_EN_US.Xml 18 Sep 2003 18:34:08 -0000 1.36
+++ XMLErrList_EN_US.Xml 22 Oct 2003 20:27:29 -0000 1.37
@@ -423,6 +423,7 @@
<Message Id="IC_DuplicateKey" Text="Duplicate key value declared for
identity constraint of element '{0}'."/>
<Message Id="IC_KeyRefOutOfScope" Text="The keyref '{0}' refers to a
key/unique that is out of scope."/>
<Message Id="IC_KeyNotFound" Text="The key for identity constraint of
element '{0}' is not found."/>
+ <Message Id="NonWSContent" Text="Non-whitespace characters are not
allowed in schema elements other than 'appinfo' and 'documentation'."/>
</Error>
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XML4CErrors";>
1.8 +6 -5 xml-xerces/c/src/xercesc/framework/XMLValidityCodes.hpp
Index: XMLValidityCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLValidityCodes.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLValidityCodes.hpp 18 Sep 2003 19:36:29 -0000 1.7
+++ XMLValidityCodes.hpp 22 Oct 2003 20:27:29 -0000 1.8
@@ -122,11 +122,12 @@
, IC_DuplicateKey = 105
, IC_KeyRefOutOfScope = 106
, IC_KeyNotFound = 107
- , E_HighBounds = 108
- , W_LowBounds = 109
- , W_HighBounds = 110
- , F_LowBounds = 111
- , F_HighBounds = 112
+ , NonWSContent = 108
+ , E_HighBounds = 109
+ , W_LowBounds = 110
+ , W_HighBounds = 111
+ , F_LowBounds = 112
+ , F_HighBounds = 113
};
static bool isFatal(const XMLValid::Codes toCheck)
1.29 +1 -0 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- en_US.txt 18 Sep 2003 19:37:18 -0000 1.28
+++ en_US.txt 22 Oct 2003 20:27:29 -0000 1.29
@@ -421,6 +421,7 @@
"Duplicate key value declared for identity constraint of element
'{0}'. " ,
"The keyref '{0}' refers to a key/unique that is out of scope. " ,
"The key for identity constraint of element '{0}' is not found. " ,
+ "Non-whitespace characters are not allowed in schema elements other
than 'appinfo' and 'documentation'. " ,
"E_ End " ,
}
1.19 +4 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XercesMessages_en_US.hpp 18 Sep 2003 19:38:00 -0000 1.18
+++ XercesMessages_en_US.hpp 22 Oct 2003 20:27:29 -0000 1.19
@@ -891,10 +891,13 @@
0x0069,0x0071,0x0075,0x0065,0x0020,0x0074,0x0068,0x0061,0x0074,0x0020,0x0069,0x0073,0x0020,0x006F,0x0075,0x0074,0x0020,0x006F,0x0066,0x0020,0x0073,0x0063,0x006F,0x0070,0x0065,0x002E,0x00
}
, {
0x0054,0x0068,0x0065,0x0020,0x006B,0x0065,0x0079,0x0020,0x0066,0x006F,0x0072,0x0020,0x0069,0x0064,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0063,0x006F,0x006E,0x0073,0x0074,0x0072,0x0061,0x0069,0x006E,0x0074,0x0020,0x006F,0x0066,0x0020,
0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x002E,0x00
}
+ , {
0x004E,0x006F,0x006E,0x002D,0x0077,0x0068,0x0069,0x0074,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0063,0x0068,0x0061,0x0072,0x0061,0x0063,0x0074,0x0065,0x0072,0x0073,0x0020,0x0061,0x0072,0x0065,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,
+
0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0069,0x006E,0x0020,0x0073,0x0063,0x0068,0x0065,0x006D,0x0061,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0073,0x0020,0x006F,0x0074,0x0068,0x0065,0x0072,0x0020,0x0074,0x0068,0x0061,
+
0x006E,0x0020,0x0027,0x0061,0x0070,0x0070,0x0069,0x006E,0x0066,0x006F,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x006F,0x0063,0x0075,0x006D,0x0065,0x006E,0x0074,0x0061,0x0074,0x0069,0x006F,0x006E,0x0027,0x002E,0x00
}
, { 0x0045,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLValidityArraySize = 113;
+const unsigned int gXMLValidityArraySize = 114;
const XMLCh gXMLExceptArray[][128] =
{
1.18 +1 -0
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Index: XercesMessages_en_US.Msg
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XercesMessages_en_US.Msg 18 Sep 2003 19:41:20 -0000 1.17
+++ XercesMessages_en_US.Msg 22 Oct 2003 20:27:29 -0000 1.18
@@ -410,6 +410,7 @@
105 Duplicate key value declared for identity constraint of element '{0}'.
106 The keyref '{0}' refers to a key/unique that is out of scope.
107 The key for identity constraint of element '{0}' is not found.
+108 Non-whitespace characters are not allowed in schema elements other than
'appinfo' and 'documentation'.
$set 3
1.44 +1 -0 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Version.rc 18 Sep 2003 19:48:25 -0000 1.43
+++ Version.rc 22 Oct 2003 20:27:30 -0000 1.44
@@ -512,6 +512,7 @@
16489
L"\x0044\x0075\x0070\x006C\x0069\x0063\x0061\x0074\x0065\x0020\x006B\x0065\x0079\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x0020\x0066\x006F\x0072\x0020\x0069\x0064\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0063\x006F\x006E\x0073\x0074\x0072\x0061\x0069\x006E\x0074\x0020\x006F\x0066\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x002E\x00"
16490
L"\x0054\x0068\x0065\x0020\x006B\x0065\x0079\x0072\x0065\x0066\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0072\x0065\x0066\x0065\x0072\x0073\x0020\x0074\x006F\x0020\x0061\x0020\x006B\x0065\x0079\x002F\x0075\x006E\x0069\x0071\x0075\x0065\x0020\x0074\x0068\x0061\x0074\x0020\x0069\x0073\x0020\x006F\x0075\x0074\x0020\x006F\x0066\x0020\x0073\x0063\x006F\x0070\x0065\x002E\x00"
16491
L"\x0054\x0068\x0065\x0020\x006B\x0065\x0079\x0020\x0066\x006F\x0072\x0020\x0069\x0064\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0063\x006F\x006E\x0073\x0074\x0072\x0061\x0069\x006E\x0074\x0020\x006F\x0066\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x0075\x006E\x0064\x002E\x00"
+ 16492
L"\x004E\x006F\x006E\x002D\x0077\x0068\x0069\x0074\x0065\x0073\x0070\x0061\x0063\x0065\x0020\x0063\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x0073\x0020\x0061\x0072\x0065\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0069\x006E\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0073\x0020\x006F\x0074\x0068\x0065\x0072\x0020\x0074\x0068\x0061\x006E\x0020\x0027\x0061\x0070\x0070\x0069\x006E\x0066\x006F\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x006F\x0063\x0075\x006D\x0065\x006E\x0074\x0061\x0074\x0069\x006F\x006E\x0027\x002E\x00"
END
STRINGTABLE DISCARDABLE
BEGIN
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
