2006-11-01 Atsushi Enomoto <atsushi@ximian.com>
authorAtsushi Eno <atsushieno@gmail.com>
Wed, 1 Nov 2006 20:02:15 +0000 (20:02 -0000)
committerAtsushi Eno <atsushieno@gmail.com>
Wed, 1 Nov 2006 20:02:15 +0000 (20:02 -0000)
* Makefile : Now it supports (and expects) cyclic build. You need
  another System.XML iteration in mcs/class/Makefile.
* System.Xml.dll.sources : moved extension classes, added config and
  XmlSchemaEnumerator.cs and removed IXmlSerializerImplementation.cs.

svn path=/branches/atsushi/mcs/; revision=67234

mcs/class/System.XML/ChangeLog
mcs/class/System.XML/Makefile
mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtension.cs [deleted file]
mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtensionCollection.cs [deleted file]
mcs/class/System.XML/System.Xml.dll.sources

index a42d76906f50770620896fcb278ad6b6b57d39ed..6a01d0b8ebecf5ea281a14c352a9b33fee884671 100644 (file)
@@ -1,3 +1,10 @@
+2006-11-01  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Makefile : Now it supports (and expects) cyclic build. You need
+         another System.XML iteration in mcs/class/Makefile.
+       * System.Xml.dll.sources : moved extension classes, added config and
+         XmlSchemaEnumerator.cs and removed IXmlSerializerImplementation.cs.
+
 2006-10-30  Wade Berrier  <wberrier@novell.com>
 
        * Makefile: remove README, Mono.System.XML.csproj, 
index 9b4fe9d8b56583e72eaf26b77c51fa8831b74f0c..2288ccffd5056af23bfce1445a5ae45dba561d91 100644 (file)
@@ -33,6 +33,20 @@ LIB_MCS_FLAGS += \
 endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
 
+ifeq (2.0, $(FRAMEWORK_VERSION))
+# Happens on net_2_0_bootstrap and net_2_0 profiles
+CONFIGURATION_DEP := System.Configuration.dll
+CONFIGURATION_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(CONFIGURATION_DEP))
+CYCLIC_DEPS += $(CONFIGURATION_DEP)
+CYCLIC_DEP_FILES += $(CONFIGURATION_DEP_FILE)
+TEST_MCS_FLAGS += -r:System.Configuration
+endif
+
+ifdef CONFIGURATION_DEP_FILE
+LIB_MCS_FLAGS += -define:CONFIGURATION_DEP -r:$(CONFIGURATION_DEP)
+$(the_lib): $(CONFIGURATION_DEP_FILE)
+endif
+
 nist_dom_files = \
        ChangeLog ITest.cs readme.txt util.cs \
        fundamental/ChangeLog \
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtension.cs b/mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtension.cs
deleted file mode 100644 (file)
index d3bb32f..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// 
-// System.Xml.Serialization.SchemaImporterExtension.cs 
-//
-// Author:
-//   Lluis Sanchez Gual (lluis@novell.com)
-//
-// Copyright (C) Novell, Inc., 2004
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml.Schema;
-
-namespace System.Xml.Serialization.Advanced
-{
-       public abstract class SchemaImporterExtension
-       {
-               protected SchemaImporterExtension ()
-               {
-               }
-
-               [MonoTODO]
-               public virtual string ImportAnyElement (
-                       XmlSchemaAny any, 
-                       bool mixed, 
-                       XmlSchemas schemas, 
-                       XmlSchemaImporter importer, 
-                       CodeCompileUnit codeCompileUnit, 
-                       CodeNamespace codeNamespace, 
-                       CodeGenerationOptions options, 
-                       CodeDomProvider codeProvider
-               )
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public virtual CodeExpression ImportDefaultValue (string value, string type)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public virtual string ImportSchemaType (
-                       XmlSchemaType type, 
-                       XmlSchemaObject context, 
-                       XmlSchemas schemas, 
-                       XmlSchemaImporter importer, 
-                       CodeCompileUnit codeCompileUnit, 
-                       CodeNamespace codeNamespace, 
-                       CodeGenerationOptions options, 
-                       CodeDomProvider codeProvider
-               )
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public virtual string ImportSchemaType (
-                       string name, 
-                       string ns, 
-                       XmlSchemaObject context, 
-                       XmlSchemas schemas, 
-                       XmlSchemaImporter importer, 
-                       CodeCompileUnit codeCompileUnit, 
-                       CodeNamespace codeNamespace, 
-                       CodeGenerationOptions options, 
-                       CodeDomProvider codeProvider
-               )
-               {
-                       throw new NotImplementedException ();
-               }
-       }
-}
-
-#endif
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtensionCollection.cs b/mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtensionCollection.cs
deleted file mode 100644 (file)
index 8b85f87..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-// 
-// System.Xml.Serialization.SchemaImporterExtensionCollection.cs 
-//
-// Author:
-//   Lluis Sanchez Gual (lluis@novell.com)
-//
-// Copyright (C) Novell, Inc., 2004
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_2_0
-
-using System;
-using System.Collections;
-
-namespace System.Xml.Serialization.Advanced
-{
-       public class SchemaImporterExtensionCollection : CollectionBase
-       {
-               public SchemaImporterExtensionCollection ()
-               {
-               }
-
-               [MonoTODO]
-               public int Add (SchemaImporterExtension extension)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public int Add (string name, Type type)
-               {
-                       throw new NotImplementedException ();
-               }
-       
-               [MonoTODO]
-               public new void Clear()
-               {
-                       throw new NotImplementedException ();
-               }
-       
-               [MonoTODO]
-               public bool Contains (SchemaImporterExtension extension)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public void CopyTo (SchemaImporterExtension[] array, int index)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public int IndexOf (SchemaImporterExtension extension)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public void Insert (int index, SchemaImporterExtension extension)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public void Remove (SchemaImporterExtension extension)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public void Remove (string name)
-               {
-                       throw new NotImplementedException ();
-               }
-               
-               [MonoTODO]
-               public SchemaImporterExtension this [int index] 
-               {
-                       get { throw new NotImplementedException (); }
-                       set { throw new NotImplementedException (); }
-               }
-       }
-}
-
-#endif
index cf0a1b357bb8589dc9d0ff8650ea62ae583d073f..7dbf790634acf7c347f22b5e9755c50e52088f58 100644 (file)
@@ -279,7 +279,6 @@ System.Xml.Schema/XmlSchemaReader.cs
 System.Xml.Schema/XmlSchemaValidationFlags.cs
 System.Xml.Schema/XmlTypeCode.cs
 System.Xml.Schema/XmlValueGetter.cs
-System.Xml.Serialization/IXmlSerializerImplementation.cs
 System.Xml.Serialization/IXmlTextParser.cs
 System.Xml.Serialization/CodeExporter.cs
 System.Xml.Serialization/CodeGenerationOptions.cs
@@ -290,8 +289,6 @@ System.Xml.Serialization/ImportContext.cs
 System.Xml.Serialization/MapCodeGenerator.cs
 System.Xml.Serialization/ReflectionHelper.cs
 System.Xml.Serialization/SchemaImporter.cs
-System.Xml.Serialization/SchemaImporterExtension.cs
-System.Xml.Serialization/SchemaImporterExtensionCollection.cs
 System.Xml.Serialization/SchemaTypes.cs
 System.Xml.Serialization/SerializationCodeGenerator.cs
 System.Xml.Serialization/SerializationCodeGeneratorConfiguration.cs
@@ -344,6 +341,7 @@ System.Xml.Serialization/XmlNodeEventArgs.cs
 System.Xml.Serialization/XmlReflectionImporter.cs
 System.Xml.Serialization/XmlReflectionMember.cs
 System.Xml.Serialization/XmlRootAttribute.cs
+System.Xml.Serialization/XmlSchemaEnumerator.cs
 System.Xml.Serialization/XmlSchemaExporter.cs
 System.Xml.Serialization/XmlSchemaImporter.cs
 System.Xml.Serialization/XmlSchemaProviderAttribute.cs
@@ -360,6 +358,7 @@ System.Xml.Serialization/XmlSerializationWriterInterpreter.cs
 System.Xml.Serialization/XmlSerializer.cs
 System.Xml.Serialization/XmlSerializerAssemblyAttribute.cs
 System.Xml.Serialization/XmlSerializerFactory.cs
+System.Xml.Serialization/XmlSerializerImplementation.cs
 System.Xml.Serialization/XmlSerializerNamespaces.cs
 System.Xml.Serialization/XmlSerializerVersionAttribute.cs
 System.Xml.Serialization/XmlTextAttribute.cs
@@ -372,5 +371,13 @@ System.Xml.Serialization/XmlTypeMapMemberNamespaces.cs
 System.Xml.Serialization/XmlTypeMapping.cs
 System.Xml.Serialization/XmlElementEventHandler.cs
 System.Xml.Serialization/XmlNodeEventHandler.cs
+System.Xml.Serialization.Advanced/SchemaImporterExtension.cs
+System.Xml.Serialization.Advanced/SchemaImporterExtensionCollection.cs
+System.Xml.Serialization.Configuration/DateTimeSerializationSection.cs
+System.Xml.Serialization.Configuration/SchemaImporterExtensionElement.cs
+System.Xml.Serialization.Configuration/SchemaImporterExtensionElementCollection.cs
+System.Xml.Serialization.Configuration/SchemaImporterExtensionsSection.cs
+System.Xml.Serialization.Configuration/SerializationSectionGroup.cs
+System.Xml.Serialization.Configuration/XmlSerializerSection.cs
 System.Xml/XQueryConvert.cs