2010-01-09 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Configuration / System.Configuration / SectionInfo.cs

diff --git a/mcs/class/System.Configuration/System.Configuration/SectionInfo.cs b/mcs/class/System.Configuration/System.Configuration/SectionInfo.cs
index 63ede7f880a477a7384cb00b9cbe2f385914ca65..c9a99aff3b24a771e758dacf1272fc0ab872656a 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/SectionInfo.cs
+++ b/mcs/class/System.Configuration/System.Configuration/SectionInfo.cs
@@ -38,7 +38,8 @@ namespace System.Configuration
        internal class SectionInfo: ConfigInfo
        {
                bool allowLocation = true;
-               bool? requirePermission = true;
+               bool requirePermission = true;
+               bool restartOnExternalChanges;
                ConfigurationAllowDefinition allowDefinition = ConfigurationAllowDefinition.Everywhere;
                ConfigurationAllowExeDefinition allowExeDefinition = ConfigurationAllowExeDefinition.MachineToApplication;
 
@@ -54,6 +55,7 @@ namespace System.Configuration
                        this.allowDefinition = info.AllowDefinition;
                        this.allowExeDefinition = info.AllowExeDefinition;
                        this.requirePermission = info.RequirePermission;
+                       this.restartOnExternalChanges = info.RestartOnExternalChanges;
                }
                
                public override object CreateInstance ()
@@ -64,8 +66,8 @@ namespace System.Configuration
                                sec.SectionInformation.AllowLocation = allowLocation;
                                sec.SectionInformation.AllowDefinition = allowDefinition;
                                sec.SectionInformation.AllowExeDefinition = allowExeDefinition;
-                               if (requirePermission != null)
-                                       sec.SectionInformation.RequirePermission = requirePermission.Value;
+                               sec.SectionInformation.RequirePermission = requirePermission;
+                               sec.SectionInformation.RestartOnExternalChanges = restartOnExternalChanges;
                                sec.SectionInformation.SetName (Name);
                        }
                        return ob;
@@ -81,7 +83,7 @@ namespace System.Configuration
                        return StreamName == cfg.FileName;
                }
 
-               public override void ReadConfig (Configuration cfg, string streamName, XmlTextReader reader)
+               public override void ReadConfig (Configuration cfg, string streamName, XmlReader reader)
                {
                        StreamName = streamName;
                        ConfigHost = cfg.ConfigHost;
@@ -134,6 +136,14 @@ namespace System.Configuration
                                                requirePermission = reqPermValue;
                                                break;
 
+                                       case "restartOnExternalChanges":
+                                               string restart = reader.Value;
+                                               bool restartValue = (restart == "true");
+                                               if (!restartValue && restart != "false")
+                                                       ThrowException ("Invalid attribute value", reader);
+                                               restartOnExternalChanges = restartValue;
+                                               break;
+
                                        default:
                                                ThrowException (String.Format ("Unrecognized attribute: {0}", reader.Name), reader);
                                                break;
@@ -158,12 +168,12 @@ namespace System.Configuration
                                writer.WriteAttributeString ("allowDefinition", allowDefinition.ToString ());
                        if (allowExeDefinition != ConfigurationAllowExeDefinition.MachineToApplication)
                                writer.WriteAttributeString ("allowExeDefinition", allowExeDefinition.ToString ());
-                       if (requirePermission != null)
-                               writer.WriteAttributeString ("requirePermission", requirePermission.Value ? "true" : "false");
+                       if (!requirePermission)
+                               writer.WriteAttributeString ("requirePermission", "false");
                        writer.WriteEndElement ();
                }
                
-               public override void ReadData (Configuration config, XmlTextReader reader, bool overrideAllowed)
+               public override void ReadData (Configuration config, XmlReader reader, bool overrideAllowed)
                {
                        if (!config.HasFile && !allowLocation)
                                throw new ConfigurationErrorsException ("The configuration section <" + Name + "> cannot be defined inside a <location> element.", reader); 
@@ -185,6 +195,16 @@ namespace System.Configuration
                                ConfigurationSection parentSection = config.Parent != null ? config.Parent.GetSectionInstance (this, false) : null;
                                xml = section.SerializeSection (parentSection, Name, mode);
 
+                               string externalDataXml = section.ExternalDataXml;
+                               string filePath = config.FilePath;
+                               
+                               if (!String.IsNullOrEmpty (filePath) && !String.IsNullOrEmpty (externalDataXml)) {
+                                       string path = Path.Combine (Path.GetDirectoryName (filePath), section.SectionInformation.ConfigSource);
+                                       using (StreamWriter sw = new StreamWriter (path)) {
+                                               sw.Write (externalDataXml);
+                                       }
+                               }
+                               
                                if (section.SectionInformation.IsProtected) {
                                        StringBuilder sb = new StringBuilder ();
                                        sb.AppendFormat ("<{0} configProtectionProvider=\"{1}\">\n",
@@ -208,6 +228,9 @@ namespace System.Configuration
                                tr.Close ();*/
                        }
                }
+               
+               internal override void Merge (ConfigInfo data)
+               {}
        }
 }