SectionGroupInfo rootGroup;
IConfigSystem system;
bool hasFile;
+ string rootNamespace;
string configPath;
string locationConfigPath;
-
- internal Configuration (Configuration parent)
+ string locationSubPath;
+
+ internal Configuration (Configuration parent, string locationSubPath)
{
- Init (parent.system, null, parent);
+ this.parent = parent;
+ this.system = parent.system;
+ this.rootGroup = parent.rootGroup;
+ this.locationSubPath = locationSubPath;
}
internal Configuration (InternalConfigurationSystem system, string locationSubPath)
rootGroup.StreamName = streamName;
}
- if (configPath != null)
+ if (streamName != null)
Load ();
}
get { return locationConfigPath; }
}
+ internal string GetLocationSubPath ()
+ {
+ Configuration confg = parent;
+ string path = null;
+ while (confg != null) {
+ path = confg.locationSubPath;
+ if (!String.IsNullOrEmpty (path))
+ return path;
+ confg = confg.parent;
+ }
+ return path;
+ }
+
internal string ConfigPath {
get { return configPath; }
}
get { return (ConnectionStringsSection) GetSection ("connectionStrings"); }
}
+ // MSDN: If the value for this FilePath property represents a merged view and
+ // no actual file exists for the application, the path to the parent configuration
+ // file is returned.
public string FilePath {
- get { return streamName; }
+ get {
+ if (streamName == null && parent != null)
+ return parent.FilePath;
+ return streamName;
+ }
}
public bool HasFile {
}
}
- [MonoTODO ("HostingContext")]
ContextInformation evaluationContext;
public ContextInformation EvaluationContext {
get {
- if (evaluationContext == null)
- evaluationContext = new ContextInformation (this, null /* XXX */);
+ if (evaluationContext == null) {
+ object ctx = system.Host.CreateConfigurationContext (configPath, GetLocationSubPath() );
+ evaluationContext = new ContextInformation (this, ctx);
+ }
+
+
return evaluationContext;
}
}
}
}
- [MonoTODO]
public bool NamespaceDeclared {
- get {
- throw new NotImplementedException ();
- }
- set {
- throw new NotImplementedException ();
- }
+ get { return rootNamespace != null; }
+ set { rootNamespace = value ? "http://schemas.microsoft.com/.NetConfiguration/v2.0" : null; }
}
public ConfigurationSectionGroup RootSectionGroup {
ConfigurationSection sec = data as ConfigurationSection;
if (sec != null || !createDefaultInstance) return sec;
- object secObj = config.CreateInstance () as ConfigurationSection;
- if (!(secObj is ConfigurationSection))
- sec = new IgnoreSection ();
- else {
- sec = (ConfigurationSection) secObj;
+ object secObj = config.CreateInstance ();
+ sec = secObj as ConfigurationSection;
+ if (sec == null) {
+ DefaultSection ds = new DefaultSection ();
+ ds.SectionHandler = secObj as IConfigurationSectionHandler;
+ sec = ds;
}
-
+
ConfigurationSection parentSection = parent != null ? parent.GetSectionInstance (config, true) : null;
- sec.RawXml = data as string;
+
+ string xml = data as string;
+ if (xml == null && parentSection != null)
+ xml = parentSection.RawXml;
+ sec.RawXml = xml;
sec.Reset (parentSection);
-
- if (data != null) {
- XmlTextReader r = new XmlTextReader (new StringReader (data as string));
+
+ if (xml != null && xml == data) {
+ XmlTextReader r = new XmlTextReader (new StringReader (xml));
sec.DeserializeSection (r);
r.Close ();
}
if (sec.SectionInformation.Type == null)
sec.SectionInformation.Type = system.Host.GetConfigTypeName (sec.GetType ());
- sec.SectionInformation.SetName (name);
-
- SectionInfo section = new SectionInfo (name, sec.SectionInformation.Type, sec.SectionInformation.AllowLocation, sec.SectionInformation.AllowDefinition, sec.SectionInformation.AllowExeDefinition);
+ SectionInfo section = new SectionInfo (name, sec.SectionInformation);
section.StreamName = streamName;
section.ConfigHost = system.Host;
group.AddChild (section);
section.ConfigHost = system.Host;
parentGroup.AddChild (section);
elementData [section] = sec;
+
+ sec.Initialize (this, section);
}
internal void RemoveConfigInfo (ConfigInfo config)
try {
Save (stream, mode, forceUpdateAll);
system.Host.WriteCompleted (streamName, true, ctx);
- } catch (Exception ex) {
+ } catch (Exception) {
system.Host.WriteCompleted (streamName, false, ctx);
throw;
} finally {
{
SaveAs (filename, mode, false);
}
-
- [MonoTODO ("Detect if file has changed")]
+
+ [MonoInternalNote ("Detect if file has changed")]
public void SaveAs (string filename, ConfigurationSaveMode mode, bool forceUpdateAll)
{
- Save (new FileStream (filename, FileMode.Open, FileAccess.Write), mode, forceUpdateAll);
+ string dir = Path.GetDirectoryName (Path.GetFullPath (filename));
+ if (!Directory.Exists (dir))
+ Directory.CreateDirectory (dir);
+ Save (new FileStream (filename, FileMode.OpenOrCreate, FileAccess.Write), mode, forceUpdateAll);
}
void Save (Stream stream, ConfigurationSaveMode mode, bool forceUpdateAll)
XmlTextWriter tw = new XmlTextWriter (new StreamWriter (stream));
tw.Formatting = Formatting.Indented;
try {
- tw.WriteStartElement ("configuration");
+ tw.WriteStartDocument ();
+ if (rootNamespace != null)
+ tw.WriteStartElement ("configuration", rootNamespace);
+ else
+ tw.WriteStartElement ("configuration");
if (rootGroup.HasConfigContent (this)) {
rootGroup.WriteConfig (this, tw, mode);
}
bool Load ()
{
- if (streamName == null)
+ 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) {
+ return false;
+ }
+
try {
- Stream stream = system.Host.OpenStreamForRead (streamName);
reader = new XmlTextReader (stream);
ReadConfigFile (reader, streamName);
- } catch (Exception e) {
- return false;
} finally {
if (reader != null)
reader.Close();
internal void ReadConfigFile (XmlTextReader reader, string fileName)
{
reader.MoveToContent ();
+
if (reader.NodeType != XmlNodeType.Element || reader.Name != "configuration")
ThrowException ("Configuration file does not have a valid root element", reader);
- if (reader.HasAttributes)
- ThrowException ("Unrecognized attribute in root element", reader);
+ if (reader.HasAttributes) {
+ while (reader.MoveToNextAttribute ()) {
+ if (reader.LocalName == "xmlns") {
+ rootNamespace = reader.Value;
+ continue;
+ }
+ ThrowException (String.Format ("Unrecognized attribute '{0}' in root element", reader.LocalName), reader);
+ }
+ }
+
+ reader.MoveToElement ();
if (reader.IsEmptyElement) {
reader.Skip ();
internal void ReadData (XmlTextReader reader, bool allowOverride)
{
- rootGroup.ReadRootData (reader, this, allowOverride);
+ rootGroup.ReadData (this, reader, allowOverride);
}
projects / mono.git / blobdiff