projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5c86dd6)
2008-06-06 Atsushi Enomoto <atsushi@ximian.com>
authorAtsushi Eno <atsushieno@gmail.com>
Fri, 6 Jun 2008 14:40:51 +0000 (14:40 -0000)
committerAtsushi Eno <atsushieno@gmail.com>
Fri, 6 Jun 2008 14:40:51 +0000 (14:40 -0000)
* importNamespaceTest.xsd, xsdimporttest.xml, importedNamespace.xsd:
  ugh, I did a couple of broken patch -i operations.

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

mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog patch | blob | history
mcs/class/System.XML/Test/XmlFiles/xsd/importNamespaceTest.xsd patch | blob | history
mcs/class/System.XML/Test/XmlFiles/xsd/importedNamespace.xsd patch | blob | history
mcs/class/System.XML/Test/XmlFiles/xsd/xsdimporttest.xml patch | blob | history

diff --git a/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog b/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
index 5ef02f4df1ce89130d50c6fc5f6d81769e26efc1..2dbc129723dec42a7c240ce1708699ec9326710a 100644 (file)
--- a/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
+++ b/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-06  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * importNamespaceTest.xsd, xsdimporttest.xml, importedNamespace.xsd:
+         ugh, I did a couple of broken patch -i operations.
+
 2008-06-06  Atsushi Enomoto  <atsushi@ximian.com>
 
        * importNamespaceTest.xsd, xsdimporttest.xml, importedNamespace.xsd:
diff --git a/mcs/class/System.XML/Test/XmlFiles/xsd/importNamespaceTest.xsd b/mcs/class/System.XML/Test/XmlFiles/xsd/importNamespaceTest.xsd
index ab5c1e2da632308fd83ab99fb130b97b5b65a891..fc5fb32569a978a3b6622f090e4f136d8a3a26a4 100644 (file)
--- a/mcs/class/System.XML/Test/XmlFiles/xsd/importNamespaceTest.xsd
+++ b/mcs/class/System.XML/Test/XmlFiles/xsd/importNamespaceTest.xsd
@@ -19,87 +19,3 @@
                </xs:complexType>
        </xs:element>
 </xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importNamespaceTest.xsd"
-                  targetNamespace="http://tempuri.org/importNamespaceTest.xsd"
-                  xmlns:objects="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-
-       <xs:import namespace="http://tempuri.org/importedNamespace.xsd" />
-
-       <xs:element name="root">
-               <xs:complexType>
-                       <xs:sequence>
-                               <xs:element name="feisty">
-                                       <xs:complexType>
-                                               <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
-                                       </xs:complexType>
-                               </xs:element>
-                       </xs:sequence>
-               </xs:complexType>
-       </xs:element>
-</xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importNamespaceTest.xsd"
-                  targetNamespace="http://tempuri.org/importNamespaceTest.xsd"
-                  xmlns:objects="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-
-       <xs:import namespace="http://tempuri.org/importedNamespace.xsd" />
-
-       <xs:element name="root">
-               <xs:complexType>
-                       <xs:sequence>
-                               <xs:element name="feisty">
-                                       <xs:complexType>
-                                               <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
-                                       </xs:complexType>
-                               </xs:element>
-                       </xs:sequence>
-               </xs:complexType>
-       </xs:element>
-</xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importNamespaceTest.xsd"
-                  targetNamespace="http://tempuri.org/importNamespaceTest.xsd"
-                  xmlns:objects="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-
-       <xs:import namespace="http://tempuri.org/importedNamespace.xsd" />
-
-       <xs:element name="root">
-               <xs:complexType>
-                       <xs:sequence>
-                               <xs:element name="feisty">
-                                       <xs:complexType>
-                                               <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
-                                       </xs:complexType>
-                               </xs:element>
-                       </xs:sequence>
-               </xs:complexType>
-       </xs:element>
-</xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importNamespaceTest.xsd"
-                  targetNamespace="http://tempuri.org/importNamespaceTest.xsd"
-                  xmlns:objects="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-
-       <xs:import namespace="http://tempuri.org/importedNamespace.xsd" />
-
-       <xs:element name="root">
-               <xs:complexType>
-                       <xs:sequence>
-                               <xs:element name="feisty">
-                                       <xs:complexType>
-                                               <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
-                                       </xs:complexType>
-                               </xs:element>
-                       </xs:sequence>
-               </xs:complexType>
-       </xs:element>
-</xs:schema>
diff --git a/mcs/class/System.XML/Test/XmlFiles/xsd/importedNamespace.xsd b/mcs/class/System.XML/Test/XmlFiles/xsd/importedNamespace.xsd
index 5c6f0aa22f2d8b45bb079925a54a88e0dde47cce..f343b7f56c5830c1b03116150a65903a9b480078 100644 (file)
--- a/mcs/class/System.XML/Test/XmlFiles/xsd/importedNamespace.xsd
+++ b/mcs/class/System.XML/Test/XmlFiles/xsd/importedNamespace.xsd
@@ -9,47 +9,3 @@
         </xs:sequence>   
         </xs:group>
 </xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importedNamespace.xsd"
-                  targetNamespace="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-        <xs:group name="objectList">
-        <xs:sequence>
-            <xs:element name="description" type="xs:string" minOccurs="0"/>
-        </xs:sequence>   
-        </xs:group>
-</xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importedNamespace.xsd"
-                  targetNamespace="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-        <xs:group name="objectList">
-        <xs:sequence>
-            <xs:element name="description" type="xs:string" minOccurs="0"/>
-        </xs:sequence>   
-        </xs:group>
-</xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importedNamespace.xsd"
-                  targetNamespace="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-        <xs:group name="objectList">
-        <xs:sequence>
-            <xs:element name="description" type="xs:string" minOccurs="0"/>
-        </xs:sequence>   
-        </xs:group>
-</xs:schema>
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns="http://tempuri.org/importedNamespace.xsd"
-                  targetNamespace="http://tempuri.org/importedNamespace.xsd"
-                  elementFormDefault="qualified">
-        <xs:group name="objectList">
-        <xs:sequence>
-            <xs:element name="description" type="xs:string" minOccurs="0"/>
-        </xs:sequence>   
-        </xs:group>
-</xs:schema>
diff --git a/mcs/class/System.XML/Test/XmlFiles/xsd/xsdimporttest.xml b/mcs/class/System.XML/Test/XmlFiles/xsd/xsdimporttest.xml
index 7015479169ab36608a00ad2a8609d77f8dc420ca..7ae36fa68ef2ac328264eb23086c8a8eb9ef6a7b 100644 (file)
--- a/mcs/class/System.XML/Test/XmlFiles/xsd/xsdimporttest.xml
+++ b/mcs/class/System.XML/Test/XmlFiles/xsd/xsdimporttest.xml
@@ -3,28 +3,3 @@
                xmlns:obj="http://tempuri.org/importedNamespace.xsd">
        <feisty/>
 </root>
-
-<?xml version="1.0" encoding="utf-8" ?>
-<root xmlns="http://tempuri.org/importNamespaceTest.xsd"
-               xmlns:obj="http://tempuri.org/importedNamespace.xsd">
-       <feisty/>
-</root>
-
-<?xml version="1.0" encoding="utf-8" ?>
-<root xmlns="http://tempuri.org/importNamespaceTest.xsd"
-               xmlns:obj="http://tempuri.org/importedNamespace.xsd">
-       <feisty/>
-</root>
-
-<?xml version="1.0" encoding="utf-8" ?>
-<root xmlns="http://tempuri.org/importNamespaceTest.xsd"
-               xmlns:obj="http://tempuri.org/importedNamespace.xsd">
-       <feisty/>
-</root>
-
-<?xml version="1.0" encoding="utf-8" ?>
-<root xmlns="http://tempuri.org/importNamespaceTest.xsd"
-               xmlns:obj="http://tempuri.org/importedNamespace.xsd">
-       <feisty/>
-</root>
-
my mono mirror. check out Moved to http://github.com/mono/mono