You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/07/30 12:54:39 UTC
svn commit: r560923 - in /xerces/c/branches/xerces-2.7/src/xercesc:
NLS/EN_US/ util/MsgLoaders/ICU/resources/ util/MsgLoaders/InMemory/
util/MsgLoaders/MsgCatalog/ util/Platforms/Win32/ validators/schema/
Author: amassari
Date: Mon Jul 30 03:54:28 2007
New Revision: 560923
URL: http://svn.apache.org/viewvc?view=rev&rev=560923
Log:
The GroupContentRestricted error is used for both 'sequence' and 'choice' models, so get the model at runtime (XERCESC-1724)
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml?view=diff&rev=560923&r1=560922&r2=560923
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml Mon Jul 30 03:54:28 2007
@@ -359,7 +359,7 @@
<Message Id="OrderIsAll" Text="{0} not allowed if the order is all."/>
<Message Id="DatatypeWithType" Text="Datatype qualifiers can only be used if you specify a type attribute."/>
<Message Id="DatatypeQualUnsupported" Text="The datatype qualifier {0} is not supported."/>
- <Message Id="GroupContentRestricted" Text="'{0}' is not allowed for the content of a 'choice' model group. Only element, group, choice, sequence and any are allowed."/>
+ <Message Id="GroupContentRestricted" Text="'{0}' is not allowed for the content of a '{1}' model group. Only element, group, choice, sequence and any are allowed."/>
<Message Id="UnknownBaseDatatype" Text="Unknown base type {0} for type {1}."/>
<Message Id="OneOfTypeRefArchRef" Text="Can only have one of type and ref attributes."/>
<Message Id="NoContentForRef" Text="A <{0}> declaration that has a ref attribute, cannot have child content."/>
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt?view=diff&rev=560923&r1=560922&r2=560923
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt Mon Jul 30 03:54:28 2007
@@ -357,7 +357,7 @@
"{0} not allowed if the order is all. " ,
"Datatype qualifiers can only be used if you specify a type attribute. " ,
"The datatype qualifier {0} is not supported. " ,
- "'{0}' is not allowed for the content of a 'choice' model group. Only element, group, choice, sequence and any are allowed. " ,
+ "'{0}' is not allowed for the content of a '{1}' model group. Only element, group, choice, sequence and any are allowed. " ,
"Unknown base type {0} for type {1}. " ,
"Can only have one of type and ref attributes. " ,
"A <{0}> declaration that has a ref attribute, cannot have child content. " ,
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp?view=diff&rev=560923&r1=560922&r2=560923
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp Mon Jul 30 03:54:28 2007
@@ -765,9 +765,9 @@
, { 0x0054,0x0068,0x0065,0x0020,0x0064,0x0061,0x0074,0x0061,0x0074,0x0079,0x0070,0x0065,0x0020,0x0071,0x0075,0x0061,0x006C,0x0069,0x0066,0x0069,0x0065,0x0072,0x0020,0x007B,0x0030,0x007D,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,
0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x002E,0x00 }
, { 0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0066,0x006F,0x0072,0x0020,0x0074,0x0068,0x0065,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,
- 0x0074,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x0027,0x0063,0x0068,0x006F,0x0069,0x0063,0x0065,0x0027,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x002E,0x0020,0x0020,0x004F,0x006E,0x006C,0x0079,0x0020,
- 0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x002C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x002C,0x0020,0x0063,0x0068,0x006F,0x0069,0x0063,0x0065,0x002C,0x0020,0x0073,0x0065,0x0071,0x0075,0x0065,0x006E,0x0063,0x0065,0x0020,0x0061,0x006E,
- 0x0064,0x0020,0x0061,0x006E,0x0079,0x0020,0x0061,0x0072,0x0065,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x002E,0x00 }
+ 0x0074,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x002E,0x0020,0x0020,0x004F,0x006E,0x006C,0x0079,0x0020,0x0065,0x006C,0x0065,
+ 0x006D,0x0065,0x006E,0x0074,0x002C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x002C,0x0020,0x0063,0x0068,0x006F,0x0069,0x0063,0x0065,0x002C,0x0020,0x0073,0x0065,0x0071,0x0075,0x0065,0x006E,0x0063,0x0065,0x0020,0x0061,0x006E,0x0064,0x0020,0x0061,
+ 0x006E,0x0079,0x0020,0x0061,0x0072,0x0065,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x002E,0x00 }
, { 0x0055,0x006E,0x006B,0x006E,0x006F,0x0077,0x006E,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x007B,0x0030,0x007D,0x0020,0x0066,0x006F,0x0072,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x007B,0x0031,0x007D,0x002E,
0x00 }
, { 0x0043,0x0061,0x006E,0x0020,0x006F,0x006E,0x006C,0x0079,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x006F,0x006E,0x0065,0x0020,0x006F,0x0066,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0061,0x006E,0x0064,0x0020,0x0072,0x0065,0x0066,0x0020,0x0061,
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg?view=diff&rev=560923&r1=560922&r2=560923
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg Mon Jul 30 03:54:28 2007
@@ -346,7 +346,7 @@
36 {0} not allowed if the order is all.
37 Datatype qualifiers can only be used if you specify a type attribute.
38 The datatype qualifier {0} is not supported.
-39 '{0}' is not allowed for the content of a 'choice' model group. Only element, group, choice, sequence and any are allowed.
+39 '{0}' is not allowed for the content of a '{1}' model group. Only element, group, choice, sequence and any are allowed.
40 Unknown base type {0} for type {1}.
41 Can only have one of type and ref attributes.
42 A <{0}> declaration that has a ref attribute, cannot have child content.
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc?view=diff&rev=560923&r1=560922&r2=560923
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc Mon Jul 30 03:54:28 2007
@@ -448,7 +448,7 @@
16420 L"\x007B\x0030\x007D\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0069\x0066\x0020\x0074\x0068\x0065\x0020\x006F\x0072\x0064\x0065\x0072\x0020\x0069\x0073\x0020\x0061\x006C\x006C\x002E\x00"
16421 L"\x0044\x0061\x0074\x0061\x0074\x0079\x0070\x0065\x0020\x0071\x0075\x0061\x006C\x0069\x0066\x0069\x0065\x0072\x0073\x0020\x0063\x0061\x006E\x0020\x006F\x006E\x006C\x0079\x0020\x0062\x0065\x0020\x0075\x0073\x0065\x0064\x0020\x0069\x0066\x0020\x0079\x006F\x0075\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0079\x0020\x0061\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x002E\x00"
16422 L"\x0054\x0068\x0065\x0020\x0064\x0061\x0074\x0061\x0074\x0079\x0070\x0065\x0020\x0071\x0075\x0061\x006C\x0069\x0066\x0069\x0065\x0072\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x002E\x00"
- 16423 L"\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0066\x006F\x0072\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0061\x0020\x0027\x0063\x0068\x006F\x0069\x0063\x0065\x0027\x0020\x006D\x006F\x0064\x0065\x006C\x0020\x0067\x0072\x006F\x0075\x0070\x002E\x0020\x0020\x004F\x006E\x006C\x0079\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x002C\x0020\x0067\x0072\x006F\x0075\x0070\x002C\x0020\x0063\x0068\x006F\x0069\x0063\x0065\x002C\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0020\x0061\x006E\x0064\x0020\x0061\x006E\x0079\x0020\x0061\x0072\x0065\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x002E\x00"
+ 16423 L"\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0066\x006F\x0072\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0061\x0020\x0027\x007B\x0031\x007D\x0027\x0020\x006D\x006F\x0064\x0065\x006C\x0020\x0067\x0072\x006F\x0075\x0070\x002E\x0020\x0020\x004F\x006E\x006C\x0079\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x002C\x0020\x0067\x0072\x006F\x0075\x0070\x002C\x0020\x0063\x0068\x006F\x0069\x0063\x0065\x002C\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0020\x0061\x006E\x0064\x0020\x0061\x006E\x0079\x0020\x0061\x0072\x0065\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x002E\x00"
16424 L"\x0055\x006E\x006B\x006E\x006F\x0077\x006E\x0020\x0062\x0061\x0073\x0065\x0020\x0074\x0079\x0070\x0065\x0020\x007B\x0030\x007D\x0020\x0066\x006F\x0072\x0020\x0074\x0079\x0070\x0065\x0020\x007B\x0031\x007D\x002E\x00"
16425 L"\x0043\x0061\x006E\x0020\x006F\x006E\x006C\x0079\x0020\x0068\x0061\x0076\x0065\x0020\x006F\x006E\x0065\x0020\x006F\x0066\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x006E\x0064\x0020\x0072\x0065\x0066\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0073\x002E\x00"
16426 L"\x0041\x0020\x003C\x007B\x0030\x007D\x003E\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0020\x0074\x0068\x0061\x0074\x0020\x0068\x0061\x0073\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x002C\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x002E\x00"
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp?view=diff&rev=560923&r1=560922&r2=560923
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp Mon Jul 30 03:54:28 2007
@@ -1069,7 +1069,9 @@
wasAny = true;
}
else {
- reportSchemaError(child, XMLUni::fgValidityDomain, XMLValid::GroupContentRestricted, childName);
+ reportSchemaError(child, XMLUni::fgValidityDomain, XMLValid::GroupContentRestricted,
+ childName,
+ ((ContentSpecNode::NodeTypes) modelGroupType) == ContentSpecNode::Choice?SchemaSymbols::fgELT_CHOICE:SchemaSymbols::fgELT_SEQUENCE);
}
if (seeParticle) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org