2006-07-24 Atsushi Enomoto <[email protected]>

	In class/System.XML:
	* System.Xml.dll.sources : added XmlMappingAccess.

	* XmlMappingAccess.cs : new type in 2.0 RTM.
	* XmlCodeExporter.cs, SoapCodeExporter.cs,
	  MapCodeGenerator.cs,
	  XmlSchemaImporter.cs, SoapSchemaImporter.cs, SchemaImporter.cs,
	  SchemaImporterExtension.cs, SchemaImporterExtensionCollection.cs,
	  XmlMemberMapping.cs, XmlSerializationReader.cs :
	  several 2.0 API fixes from betas to RTM.

	In class/System.Web.Services:
	* ProtocolImporter.cs, ServiceDescriptionImporter.cs :
	  some 2.0 API fixes from betas to RTM.

	In tools/wsdl:
	* MonoWSDL2.cs : 2.0 API fixes from beta2 to RTM.


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

mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog

@@ -1,3 +1,8 @@
+2006-07-24  Atsushi Enomoto  <[email protected]>
+
+	* ProtocolImporter.cs, ServiceDescriptionImporter.cs :
+	  some 2.0 API fixes from betas to RTM.
+
 2006-06-08  Chris Toshok  <[email protected]>
 
 	* ExtensionManager.cs: remove the CONFIGURATION_2_0 from ifdefs.

mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs

@@ -185,7 +185,7 @@ namespace System.Web.Services.Description {
 			get { return descriptionImporter.CodeGenerationOptions; }
 		}
 		
-		internal ICodeGenerator CodeGenerator {
+		internal CodeDomProvider CodeGenerator {
 			get { return descriptionImporter.CodeGenerator; }
 		}
 

mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs

@@ -54,7 +54,7 @@ namespace System.Web.Services.Description {
 		
 #if NET_2_0
 		CodeGenerationOptions options;
-		ICodeGenerator codeGenerator;
+		CodeDomProvider codeGenerator;
 		ImportContext context;
 #endif
 
@@ -104,7 +104,7 @@ namespace System.Web.Services.Description {
 		}
 		
 		[System.Runtime.InteropServices.ComVisible(false)]
-		public ICodeGenerator CodeGenerator {
+		public CodeDomProvider CodeGenerator {
 			get { return codeGenerator; }
 			set { codeGenerator = value; }
 		}
@@ -174,7 +174,7 @@ namespace System.Web.Services.Description {
 			WebReferenceCollection webReferences, 
 			CodeGenerationOptions options, 
 			ServiceDescriptionImportStyle style, 
-			ICodeGenerator codeGenerator)
+			CodeDomProvider codeGenerator)
 		{
 			CodeCompileUnit codeCompileUnit = new CodeCompileUnit ();
 			return GenerateWebReferences (webReferences, options, style, codeGenerator, codeCompileUnit, false);
@@ -185,7 +185,7 @@ namespace System.Web.Services.Description {
 			WebReferenceCollection webReferences, 
 			CodeGenerationOptions options, 
 			ServiceDescriptionImportStyle style, 
-			ICodeGenerator codeGenerator, 
+			CodeDomProvider codeGenerator, 
 			CodeCompileUnit codeCompileUnit, 
 			bool verbose)
 		{

mcs/class/System.XML/ChangeLog

@@ -1,3 +1,7 @@
+2006-07-24  Atsushi Enomoto  <[email protected]>
+
+	* System.Xml.dll.sources : added XmlMappingAccess.
+
 2006-05-16  Vladimir Krasnov  <[email protected]>
 
 	* run-W3C-tests.bat: skip nunit build if already done

mcs/class/System.XML/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,13 @@
+2006-07-24  Atsushi Enomoto  <[email protected]>
+
+	* XmlMappingAccess.cs : new type in 2.0 RTM.
+	* XmlCodeExporter.cs, SoapCodeExporter.cs,
+	  MapCodeGenerator.cs,
+	  XmlSchemaImporter.cs, SoapSchemaImporter.cs, SchemaImporter.cs,
+	  SchemaImporterExtension.cs, SchemaImporterExtensionCollection.cs,
+	  XmlMemberMapping.cs, XmlSerializationReader.cs :
+	  several 2.0 API fixes from betas to RTM.
+
 2006-06-07  Lluis Sanchez Gual  <[email protected]>
 
 	* XmlTypeMapMember.cs: Added GlobalIndex property.

mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs

@@ -48,7 +48,7 @@ namespace System.Xml.Serialization {
 		CodeAttributeDeclarationCollection includeMetadata;
 		XmlTypeMapping exportedAnyType = null;
 		protected bool includeArrayTypes;
-		ICodeGenerator codeGen;
+		CodeDomProvider codeProvider;
 		CodeGenerationOptions options;
 
 		Hashtable exportedMaps = new Hashtable ();
@@ -61,11 +61,11 @@ namespace System.Xml.Serialization {
 			this.options = options;
 		}
 
-		public MapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, ICodeGenerator codeGen, CodeGenerationOptions options, Hashtable mappings)
+		public MapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, CodeDomProvider codeProvider, CodeGenerationOptions options, Hashtable mappings)
 		{
 			this.codeCompileUnit = codeCompileUnit;
 			this.codeNamespace = codeNamespace;
-			this.codeGen = codeGen;
+			this.codeProvider = codeProvider;
 			this.options = options;
 //			this.mappings = mappings;
 		}
@@ -158,7 +158,7 @@ namespace System.Xml.Serialization {
 			codeClass.Attributes = MemberAttributes.Public;
 
 #if NET_2_0
-			codeClass.IsPartial = CodeGenerator.Supports(GeneratorSupport.PartialTypes);
+			codeClass.IsPartial = CodeProvider.Supports(GeneratorSupport.PartialTypes);
 			AddClassAttributes (codeClass);
 #endif
 
@@ -625,12 +625,12 @@ namespace System.Xml.Serialization {
 		#region Private Properties
 
 #if NET_2_0
-		private ICodeGenerator CodeGenerator {
+		private CodeDomProvider CodeProvider {
 			get {
-				if (codeGen == null) {
-					codeGen = new CSharpCodeProvider ().CreateGenerator ();
+				if (codeProvider == null) {
+					codeProvider = new CSharpCodeProvider ();
 				}
-				return codeGen;
+				return codeProvider;
 			}
 		}
 #endif

mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs

@@ -31,6 +31,7 @@
 #if NET_2_0
 
 using System;
+using System.Xml.Serialization.Advanced;
 
 namespace System.Xml.Serialization 
 {

mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtension.cs

@@ -37,7 +37,7 @@ using System.Collections;
 using System.Collections.Specialized;
 using System.Xml.Schema;
 
-namespace System.Xml.Serialization 
+namespace System.Xml.Serialization.Advanced
 {
 	public abstract class SchemaImporterExtension
 	{
@@ -51,10 +51,10 @@ namespace System.Xml.Serialization
 			bool mixed, 
 			XmlSchemas schemas, 
 			XmlSchemaImporter importer, 
+			CodeCompileUnit codeCompileUnit, 
 			CodeNamespace codeNamespace, 
-			StringCollection referencedAssemblies, 
 			CodeGenerationOptions options, 
-			ICodeGenerator codeGenerator
+			CodeDomProvider codeProvider
 		)
 		{
 			throw new NotImplementedException ();
@@ -72,10 +72,10 @@ namespace System.Xml.Serialization
 			XmlSchemaObject context, 
 			XmlSchemas schemas, 
 			XmlSchemaImporter importer, 
+			CodeCompileUnit codeCompileUnit, 
 			CodeNamespace codeNamespace, 
-			StringCollection referencedAssemblies, 
 			CodeGenerationOptions options, 
-			ICodeGenerator codeGenerator
+			CodeDomProvider codeProvider
 		)
 		{
 			throw new NotImplementedException ();
@@ -88,10 +88,10 @@ namespace System.Xml.Serialization
 			XmlSchemaObject context, 
 			XmlSchemas schemas, 
 			XmlSchemaImporter importer, 
+			CodeCompileUnit codeCompileUnit, 
 			CodeNamespace codeNamespace, 
-			StringCollection referencedAssemblies, 
 			CodeGenerationOptions options, 
-			ICodeGenerator codeGenerator
+			CodeDomProvider codeProvider
 		)
 		{
 			throw new NotImplementedException ();

mcs/class/System.XML/System.Xml.Serialization/SchemaImporterExtensionCollection.cs

@@ -33,7 +33,7 @@
 using System;
 using System.Collections;
 
-namespace System.Xml.Serialization 
+namespace System.Xml.Serialization.Advanced
 {
 	public class SchemaImporterExtensionCollection : CollectionBase
 	{

mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs

@@ -80,11 +80,11 @@ namespace System.Xml.Serialization
 		[MonoTODO ("mappings?")]
 		public SoapCodeExporter (CodeNamespace codeNamespace, 
 								CodeCompileUnit codeCompileUnit, 
-								ICodeGenerator codeGen, 
+								CodeDomProvider codeProvider, 
 								CodeGenerationOptions options, 
 								Hashtable mappings)
 		{
-			codeGenerator = new SoapMapCodeGenerator (codeNamespace, codeCompileUnit, codeGen, options, mappings);
+			codeGenerator = new SoapMapCodeGenerator (codeNamespace, codeCompileUnit, codeProvider, options, mappings);
 		}
 
 #endif
@@ -144,8 +144,8 @@ namespace System.Xml.Serialization
 			includeArrayTypes = true;
 		}
 
-		public SoapMapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, ICodeGenerator codeGen, CodeGenerationOptions options, Hashtable mappings)
-		: base (codeNamespace, codeCompileUnit, codeGen, options, mappings)
+		public SoapMapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, CodeDomProvider codeProvider, CodeGenerationOptions options, Hashtable mappings)
+		: base (codeNamespace, codeCompileUnit, codeProvider, options, mappings)
 		{
 		}
 

mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs

@@ -75,9 +75,9 @@ namespace System.Xml.Serialization
 		}
 		
 		public SoapSchemaImporter (XmlSchemas schemas,CodeGenerationOptions options, 
-									ICodeGenerator codeGenerator, ImportContext context)
+									CodeDomProvider codeProvider, ImportContext context)
 		{
-			_importer = new XmlSchemaImporter (schemas, options, codeGenerator, context);
+			_importer = new XmlSchemaImporter (schemas, options, codeProvider, context);
 			_importer.UseEncodedFormat = true;
 		}
 

mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs

@@ -87,11 +87,11 @@ namespace System.Xml.Serialization
 		[MonoTODO ("mappings?")]
 		public XmlCodeExporter (CodeNamespace codeNamespace, 
 								CodeCompileUnit codeCompileUnit, 
-								ICodeGenerator codeGen, 
+								CodeDomProvider codeProvider, 
 								CodeGenerationOptions options, 
 								Hashtable mappings)
 		{
-			codeGenerator = new XmlMapCodeGenerator (codeNamespace, codeCompileUnit, codeGen, options, mappings);
+			codeGenerator = new XmlMapCodeGenerator (codeNamespace, codeCompileUnit, codeProvider, options, mappings);
 		}
 #endif
 
@@ -189,8 +189,8 @@ namespace System.Xml.Serialization
 		{
 		}
 
-		public XmlMapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, ICodeGenerator codeGen, CodeGenerationOptions options, Hashtable mappings)
-		: base (codeNamespace, codeCompileUnit, codeGen, options, mappings)
+		public XmlMapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, CodeDomProvider codeProvider, CodeGenerationOptions options, Hashtable mappings)
+		: base (codeNamespace, codeCompileUnit, codeProvider, options, mappings)
 		{
 		}
 		

mcs/class/System.XML/System.Xml.Serialization/XmlMappingAccess.cs

@@ -0,0 +1,46 @@
+//
+// XmlMappingAccess.cs
+//
+// Author:
+//   Atsushi Enomoto
+//
+// Copyright (C) 2006 Atsushi Enomoto
+//
+
+//
+// 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.Xml.Schema;
+
+namespace System.Xml.Serialization
+{
+	public enum XmlMappingAccess
+	{
+		None,
+		Read,
+		Write
+	}
+}
+
+#endif

mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs

@@ -124,13 +124,13 @@ namespace System.Xml.Serialization
 		
 #if NET_2_0
 		[MonoTODO]
-		public bool IsNullable
+		public string XsdElementName
 		{
 			get { throw new NotImplementedException (); }
 		}
 		
 		[MonoTODO]
-		public string GetTypeName (System.CodeDom.Compiler.ICodeGenerator codeGenerator)
+		public string GenerateTypeName (System.CodeDom.Compiler.CodeDomProvider codeProvider)
 		{
 			throw new NotImplementedException ();
 		}

mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs

@@ -30,6 +30,7 @@
 //
 
 using System.Xml;
+using System.CodeDom.Compiler;
 using System.Xml.Schema;
 using System.Collections;
 
@@ -91,7 +92,7 @@ namespace System.Xml.Serialization
 		
 #if NET_2_0
 		[MonoTODO]
-		public XmlSchemaImporter (XmlSchemas schemas, CodeGenerationOptions options, System.CodeDom.Compiler.ICodeGenerator codeGenerator, ImportContext context)
+		public XmlSchemaImporter (XmlSchemas schemas, CodeGenerationOptions options, CodeDomProvider codeProvider, ImportContext context)
 		{
 			this.schemas = schemas;
 			this.options = options;

mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs

@@ -1069,7 +1069,7 @@ namespace System.Xml.Serialization
 		}
 				
 		[MonoTODO]
-		protected Exception CreateBadDeriveationException (
+		protected Exception CreateBadDerivationException (
 			string xsdDerived, 
 			string nsDerived, 
 			string xsdBase, 

mcs/class/System.XML/System.Xml.dll.sources

@@ -338,6 +338,7 @@ System.Xml.Serialization/XmlIncludeAttribute.cs
 System.Xml.Serialization/XmlMemberMapping.cs
 System.Xml.Serialization/XmlMembersMapping.cs
 System.Xml.Serialization/XmlMapping.cs
+System.Xml.Serialization/XmlMappingAccess.cs
 System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
 System.Xml.Serialization/XmlNodeEventArgs.cs
 System.Xml.Serialization/XmlReflectionImporter.cs

mcs/tools/wsdl/ChangeLog

@@ -1,3 +1,7 @@
+2006-07-24  Atsushi Enomoto  <[email protected]>
+
+	* MonoWSDL2.cs : 2.0 API fixes from beta2 to RTM.
+
 2005-07-11  Raja R Harinath  <[email protected]>
 
 	* Makefile (PROGRAM): Make profile-specific.

mcs/tools/wsdl/MonoWSDL2.cs

@@ -174,10 +174,9 @@ namespace Mono.WebServices
 			bool hasWarnings = false;
 			
 			CodeDomProvider provider = GetProvider();
-			ICodeGenerator generator = provider.CreateGenerator();
 				
 			StringCollection validationWarnings;
-			validationWarnings = ServiceDescriptionImporter.GenerateWebReferences (references, options, style, generator, codeUnit, verbose);
+			validationWarnings = ServiceDescriptionImporter.GenerateWebReferences (references, options, style, provider, codeUnit, verbose);
 			
 			for (int n=0; n<references.Count; n++)
 			{
@@ -249,7 +248,7 @@ namespace Mono.WebServices
 				StreamWriter writer = new StreamWriter(filename);
 				
 				CodeGeneratorOptions compilerOptions = new CodeGeneratorOptions();
-				generator.GenerateCodeFromCompileUnit (codeUnit, writer, compilerOptions);
+				provider.GenerateCodeFromCompileUnit (codeUnit, writer, compilerOptions);
 				writer.Close();
 			}