Added notation elements to schema, not sure if this is correct.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@70 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/schemas/xmldsig-filter2.xsd b/schemas/xmldsig-filter2.xsd
index 8742adf..0526336 100644 (file)
--- a/schemas/xmldsig-filter2.xsd
+++ b/schemas/xmldsig-filter2.xsd
@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
-    [
-      <!ATTLIST schema
-        xmlns:xf CDATA #FIXED 'http://www.w3.org/2002/06/xmldsig-filter2'>
-      <!ENTITY xf 'http://www.w3.org/2002/06/xmldsig-filter2'>
-      <!ENTITY % p ''>
-      <!ENTITY % s ''>
-     ]>
-
-   <schema xmlns="http://www.w3.org/2001/XMLSchema"
-           xmlns:xf="http://www.w3.org/2002/06/xmldsig-filter2"
-           targetNamespace="http://www.w3.org/2002/06/xmldsig-filter2"
-           version="0.1" elementFormDefault="qualified">
-
-   <element name="XPath"
-            type="xf:XPathType"/>
-
-<complexType name="XPathType">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="Filter">
-           <simpleType>
-             <restriction base="NOTATION">
-               <enumeration value="intersect"/>
-               <enumeration value="subtract"/>
-               <enumeration value="union"/>
-             </restriction>
-           </simpleType>
-        </attribute>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-
-   </schema>
+<!DOCTYPE schema [
+    <!ATTLIST schema
+    xmlns:xf CDATA #FIXED "http://www.w3.org/2002/06/xmldsig-filter2"
+>
+    <!ENTITY xf 'http://www.w3.org/2002/06/xmldsig-filter2'>
+    <!ENTITY % p ''>
+    <!ENTITY % s ''>
+]>
+<schema targetNamespace="http://www.w3.org/2002/06/xmldsig-filter2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xf="http://www.w3.org/2002/06/xmldsig-filter2" elementFormDefault="qualified" version="0.1">
+    <notation name="intersect" public="intersect"/>
+    <notation name="subtract" public="subtract"/>
+    <notation name="union" public="union"/>
+    <element name="XPath" type="xf:XPathType"/>
+    <complexType name="XPathType">
+        <simpleContent>
+            <extension base="string">
+                <attribute name="Filter">
+                    <simpleType>
+                        <restriction base="NOTATION">
+                            <enumeration value="intersect"/>
+                            <enumeration value="subtract"/>
+                            <enumeration value="union"/>
+                        </restriction>
+                    </simpleType>
+                </attribute>
+            </extension>
+        </simpleContent>
+    </complexType>
+</schema>