2007-04-18 Atsushi Enomoto <atsushi@ximian.com>

	* RdpPatterns.cs : inside elements, reset oneOrMore[Group] flags in
	  CheckConstraints().

	* RncTests.cs : added (my own) infocard rnc parsing test.

	* schemas-xmlsoap-or-ws-2005-05-identity.rnc : new test schema.

	* Makefile (EXTRA_DISTFILES) :
	  added schemas-xmlsoap-or-ws-2005-05-identity.rnc

svn path=/trunk/mcs/; revision=75890

diff --git a/mcs/class/Commons.Xml.Relaxng/ChangeLog b/mcs/class/Commons.Xml.Relaxng/ChangeLog
index 45ea55a0dbca0dede7de2661d912d26b956585d7..cb485ac8a9a1301fba9b2504abc878c5faaf72a5 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/ChangeLog
+++ b/mcs/class/Commons.Xml.Relaxng/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-18  Atsushi Enomoto <atsushi@ximian.com>
+
+       * Makefile (EXTRA_DISTFILES) :
+         added schemas-xmlsoap-or-ws-2005-05-identity.rnc
+
 2006-06-15  Raja R Harinath  <rharinath@novell.com>
 
        * Makefile (EXTRA_DISTFILES): Add Test/XmlFiles/nvdl.rng.

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
index 25244344f2749e52e059912119dc97336283b8b7..2ebb56b74935e78c677c8738bbddaccb7cd7f1ed 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-18  Atsushi Enomoto <atsushi@ximian.com>
+
+       * RdpPatterns.cs : inside elements, reset oneOrMore[Group] flags in
+         CheckConstraints().
+
 2006-02-02  Atsushi Enomoto <atsushi@ximian.com>
 
        * RdpPatterns.cs : After profiling in depth, finally I found the

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
index a729b8db56bc0f70d9a9fe8b0121478af1b7b579..63bc40ba3d7f776bd4a3284dd212eb16ca74528d 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
@@ -2125,7 +2125,7 @@ namespace Commons.Xml.Relaxng.Derivative
                        constraintsChecked = true;
                        if (attribute || list || dataExcept)
                                throw new RelaxngException ("Not allowed element occurence was specified in the pattern.");
-                       this.Children.CheckConstraints (false, oneOrMore, oneOrMoreGroup, oneOrMoreInterleave, false, false);
+                       this.Children.CheckConstraints (false, false, false, oneOrMoreInterleave, false, false);
                }
 
                internal override bool ContainsText()

diff --git a/mcs/class/Commons.Xml.Relaxng/Makefile b/mcs/class/Commons.Xml.Relaxng/Makefile
index 0fa3076359074833b32133e60ff50f5374bb0528..17204e6766a2bb6201f76ce62cfed02d57f91731 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Makefile
+++ b/mcs/class/Commons.Xml.Relaxng/Makefile
@@ -23,6 +23,7 @@ EXTRA_DISTFILES = \
        Test/XmlFiles/relaxng.rng       \
        Test/XmlFiles/relaxng.rnc       \
        Test/XmlFiles/atom.rnc          \
+       Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc        \
        Test/XmlFiles/nvdl.nvdl         \
        Test/XmlFiles/nvdl.rng          \
        $(wildcard Test/standalone_tests/*.cs) \

diff --git a/mcs/class/Commons.Xml.Relaxng/Test/ChangeLog b/mcs/class/Commons.Xml.Relaxng/Test/ChangeLog
index 66de804a1a02f29f557d5f7c1940836a23e2a59d..159f6ceff6da33e6ecb4ff68d2e76bc16e0786da 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Test/ChangeLog
+++ b/mcs/class/Commons.Xml.Relaxng/Test/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-18  Atsushi Enomoto <atsushi@ximian.com>
+
+       * RncTests.cs : added (my own) infocard rnc parsing test.
+
 2006-04-11  Atsushi Enomoto <atsushi@ximian.com>
 
        * NvdlValidatingReaderTests.cs : new file for NVDL test.

diff --git a/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs b/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs
index 4e2fc63fbb1b525377a9d160ea1e96d7dae593cb..5fde3d36bb7aadf5b932590e632673406c20ef3a 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs
@@ -46,6 +46,12 @@ namespace MonoTests.Commons.Xml.Relaxng
                        Compile ("Test/XmlFiles/atom.rnc");
                }
 
+               [Test]
+               public void TestInfocardRnc ()
+               {
+                       Compile ("Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc");
+               }
+
                [Test]
                // Make sure that it is not rejected by ambiguity between
                // foreign attribute and foreign element.

diff --git a/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/ChangeLog b/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/ChangeLog
index dff1b020356043e298bc2dedacf7830e127197a6..6e44b0f8113dae25b7d7a5318c66ff946316f1c7 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/ChangeLog
+++ b/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-18  Atsushi Enomoto <atsushi@ximian.com>
+
+       * schemas-xmlsoap-or-ws-2005-05-identity.rnc : new test schema.
+
 2006-04-11  Atsushi Enomoto <atsushi@ximian.com>
 
        * nvdl.nvdl, nvdl.rng : new file for nvdl validation.

diff --git a/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc b/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc
new file mode 100644 (file)
index 0000000..8fce71c
--- /dev/null
+++ b/mcs/class/Commons.Xml.Relaxng/Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc
@@ -0,0 +1,48 @@
+default namespace = "http://schemas.xmlsoap.org/ws/2005/05/identity"
+datatypes xs = "http://www.w3.org/2001/XMLSchema"
+namespace wst = "http://schemas.xmlsoap.org/ws/2005/02/trust"
+
+element  RoamingStore {
+  element  RoamingInformationCard {
+    element  InformationCardMetaData {
+      attribute  xml:lang { text },
+      element  InformationCardReference {
+        element  CardId { text },
+        element  CardVersion { text }
+      },
+      element  CardName { text },
+      element  CardImage {
+        attribute  MimeType { text },
+        xs:base64Binary
+      },
+      element  Issuer { xs:anyURI },
+      element  TimeIssued { xs:dateTime },
+      element  TimeExpires { xs:dateTime },
+      element  SupportedTokenTypeList {
+        element  wst:TokenType { xs:anyURI }+
+      },
+      element  SupportedClaimTypeList {
+        element  SupportedClaimType {
+          attribute  Uri { xs:anyURI },
+          element  DisplayTag { text },
+          element  Description { text }
+        }+
+      },
+      element  IsSelfIssued { xs:boolean },
+      element  HashSalt { xs:base64Binary },
+      element  TimeLastUpdated { xs:dateTime },
+      element  IssuerId { text },
+      element  IssuerName { text },
+      element  BackgroundColor { xs:int }
+    },
+    element  InformationCardPrivateData {
+      element  MasterKey { xs:base64Binary },
+      element  ClaimValueList {
+        element  ClaimValue {
+          attribute  Uri { xs:anyURI },
+          element  Value { text }
+        }+
+      }
+    }
+  }+
+}