Merge pull request #498 from Unroll-Me/master
[mono.git] / mcs / class / System.Configuration / System.Configuration / Configuration.cs
index 8bf03f47d007151166f3dc181481a19d4de1349b..a3f8dc924f43c9c479e4b3fd578cc0e5025d0ddd 100644 (file)
 using System;
 using System.Collections;
 using System.Collections.Specialized;
+using System.Configuration.Internal;
+using System.ComponentModel;
 using System.Reflection;
 using System.Xml;
 using System.IO;
-using System.Configuration.Internal;
 
 namespace System.Configuration {
 
-       public sealed class Configuration
+       // For configuration document, use this XmlDocument instead of the standard one. This ignores xmlns attribute for MS.
+       internal class ConfigurationXmlDocument : XmlDocument
        {
+               public override XmlElement CreateElement (string prefix, string localName, string namespaceURI)
+               {
+                       if (namespaceURI == "http://schemas.microsoft.com/.NetConfiguration/v2.0")
+                               return base.CreateElement (String.Empty, localName, String.Empty);
+                       else
+                               return base.CreateElement (prefix, localName, namespaceURI);
+               }
+       }
+
+       public sealed class Configuration
+       {               
                Configuration parent;
                Hashtable elementData = new Hashtable ();
                string streamName;
@@ -53,19 +66,23 @@ namespace System.Configuration {
                string locationConfigPath;
                string locationSubPath;
 
+               internal static event ConfigurationSaveEventHandler SaveStart;
+               internal static event ConfigurationSaveEventHandler SaveEnd;
+               
                internal Configuration (Configuration parent, string locationSubPath)
                {
                        this.parent = parent;
                        this.system = parent.system;
                        this.rootGroup = parent.rootGroup;
                        this.locationSubPath = locationSubPath;
+                       this.configPath = parent.ConfigPath;
                }
                
                internal Configuration (InternalConfigurationSystem system, string locationSubPath)
                {
                        hasFile = true;
                        this.system = system;
-                       
+
                        system.InitForConfiguration (ref locationSubPath, out configPath, out locationConfigPath);
                        
                        Configuration parent = null;
@@ -81,18 +98,21 @@ namespace System.Configuration {
                
                internal Configuration FindLocationConfiguration (string relativePath, Configuration defaultConfiguration)
                {
-                       ConfigurationLocation loc = Locations.Find (relativePath);
-                       
                        Configuration parentConfig = defaultConfiguration;
-                       
-                       if (LocationConfigPath != null) {
+
+                       if (!String.IsNullOrEmpty (LocationConfigPath)) {
                                Configuration parentFile = GetParentWithFile ();
                                if (parentFile != null) {
-                                       string parentRelativePath = system.Host.GetConfigPathFromLocationSubPath (LocationConfigPath, relativePath);
+                                       string parentRelativePath = system.Host.GetConfigPathFromLocationSubPath (configPath, relativePath);
                                        parentConfig = parentFile.FindLocationConfiguration (parentRelativePath, defaultConfiguration);
                                }
                        }
 
+                       string relConfigPath = configPath.Substring (1) + "/";
+                       if (relativePath.StartsWith (relConfigPath, StringComparison.Ordinal))
+                               relativePath = relativePath.Substring (relConfigPath.Length);
+
+                       ConfigurationLocation loc = Locations.FindBest (relativePath);
                        if (loc == null)
                                return parentConfig;
                        
@@ -216,11 +236,11 @@ namespace System.Configuration {
                                        rootSectionGroup.Initialize (this, rootGroup);
                                }
                                return rootSectionGroup;
-                       }                        
+                       }
                }
 
                public ConfigurationSectionGroupCollection SectionGroups {
-                       get { return RootSectionGroup.SectionGroups; }                        
+                       get { return RootSectionGroup.SectionGroups; }
                }
 
                public ConfigurationSectionCollection Sections {
@@ -273,13 +293,15 @@ namespace System.Configuration {
                                sec.SectionInformation.SetParentSection (parentSection);
                        }
                        sec.SectionInformation.ConfigFilePath = FilePath;
+
+                       sec.ConfigContext = system.Host.CreateDeprecatedConfigContext(configPath);
                        
                        string xml = data as string;
                        sec.RawXml = xml;
                        sec.Reset (parentSection);
 
-                       if (xml != null && xml == data) {
-                               XmlTextReader r = new XmlTextReader (new StringReader (xml));
+                       if (xml != null) {
+                               XmlTextReader r = new ConfigXmlTextReader (new StringReader (xml), FilePath);
                                sec.DeserializeSection (r);
                                r.Close ();
 
@@ -316,7 +338,7 @@ namespace System.Configuration {
                internal void CreateSection (SectionGroupInfo group, string name, ConfigurationSection sec)
                {
                        if (group.HasChild (name))
-                               throw new ConfigurationException ("Cannot add a ConfigurationSection. A section or section group already exists with the name '" + name + "'");
+                               throw new ConfigurationErrorsException ("Cannot add a ConfigurationSection. A section or section group already exists with the name '" + name + "'");
                                
                        if (!HasFile && !sec.SectionInformation.AllowLocation)
                                throw new ConfigurationErrorsException ("The configuration section <" + name + "> cannot be defined inside a <location> element."); 
@@ -325,20 +347,21 @@ namespace System.Configuration {
                                object ctx = sec.SectionInformation.AllowExeDefinition != ConfigurationAllowExeDefinition.MachineToApplication ? (object) sec.SectionInformation.AllowExeDefinition : (object) sec.SectionInformation.AllowDefinition;
                                throw new ConfigurationErrorsException ("The section <" + name + "> can't be defined in this configuration file (the allowed definition context is '" + ctx + "').");
                        }
-                                               
+
                        if (sec.SectionInformation.Type == null)
                                sec.SectionInformation.Type = system.Host.GetConfigTypeName (sec.GetType ());
-                       
+
                        SectionInfo section = new SectionInfo (name, sec.SectionInformation);
                        section.StreamName = streamName;
                        section.ConfigHost = system.Host;
                        group.AddChild (section);
                        elementData [section] = sec;
+                       sec.Configuration = this;
                }
                
                internal void CreateSectionGroup (SectionGroupInfo parentGroup, string name, ConfigurationSectionGroup sec)
                {
-                       if (parentGroup.HasChild (name)) throw new ConfigurationException ("Cannot add a ConfigurationSectionGroup. A section or section group already exists with the name '" + name + "'");
+                       if (parentGroup.HasChild (name)) throw new ConfigurationErrorsException ("Cannot add a ConfigurationSectionGroup. A section or section group already exists with the name '" + name + "'");
                        if (sec.Type == null) sec.Type = system.Host.GetConfigTypeName (sec.GetType ());
                        sec.SetName (name);
 
@@ -368,16 +391,26 @@ namespace System.Configuration {
                
                public void Save (ConfigurationSaveMode mode, bool forceUpdateAll)
                {
+                       ConfigurationSaveEventHandler saveStart = SaveStart;
+                       ConfigurationSaveEventHandler saveEnd = SaveEnd;
+                       
                        object ctx = null;
+                       Exception saveEx = null;
                        Stream stream = system.Host.OpenStreamForWrite (streamName, null, ref ctx);
                        try {
+                               if (saveStart != null)
+                                       saveStart (this, new ConfigurationSaveEventArgs (streamName, true, null, ctx));
+                               
                                Save (stream, mode, forceUpdateAll);
                                system.Host.WriteCompleted (streamName, true, ctx);
-                       } catch (Exception) {
+                       } catch (Exception ex) {
+                               saveEx = ex;
                                system.Host.WriteCompleted (streamName, false, ctx);
                                throw;
                        } finally {
                                stream.Close ();
+                               if (saveEnd != null)
+                                       saveEnd (this, new ConfigurationSaveEventArgs (streamName, false, saveEx, ctx));
                        }
                }
                
@@ -433,6 +466,7 @@ namespace System.Configuration {
                                tw.WriteEndElement ();
                        }
                        finally {
+                               tw.Flush ();
                                tw.Close ();
                        }
                }
@@ -447,29 +481,22 @@ namespace System.Configuration {
                        if (String.IsNullOrEmpty (streamName))
                                return true;
 
-                       XmlTextReader reader = null;
                        Stream stream = null;
-                       
-                       // FIXME: we should remove this kind of hack that
-                       // hides the actual error
                        try {
                                stream = system.Host.OpenStreamForRead (streamName);
-                       } catch (Exception) {
+                               if (stream == null)
+                                       return false;
+                       } catch {
                                return false;
                        }
 
-                       try {
-                               reader = new XmlTextReader (stream);
+                       using (XmlTextReader reader = new ConfigXmlTextReader (stream, streamName)) {
                                ReadConfigFile (reader, streamName);
-                       } finally {
-                               if (reader != null)
-                                       reader.Close();
                        }
                        return true;
                }
 
-
-               void ReadConfigFile (XmlTextReader reader, string fileName)
+               void ReadConfigFile (XmlReader reader, string fileName)
                {
                        reader.MoveToContent ();
 
@@ -505,16 +532,17 @@ namespace System.Configuration {
                        
                        rootGroup.ReadRootData (reader, this, true);
                }
-               
-               internal void ReadData (XmlTextReader reader, bool allowOverride)
+
+               internal void ReadData (XmlReader reader, bool allowOverride)
                {
                        rootGroup.ReadData (this, reader, allowOverride);
                }
                
 
-               private void ThrowException (string text, XmlTextReader reader)
+               private void ThrowException (string text, XmlReader reader)
                {
-                       throw new ConfigurationException (text, streamName, reader.LineNumber);
+                       IXmlLineInfo li = reader as IXmlLineInfo;
+                       throw new ConfigurationErrorsException (text, streamName, li != null ? li.LineNumber : 0);
                }
        }
 }