implab/ImplabNet Commit - r280:f07be402ab02

Added Trace<T>.Debug(...) method for debug messages...

cin -

r280:f07be402ab02 v3

parent child

Context file:

r280:f07be402ab02

Collapse all files

Implab.Playground/Program.cs +11 0

@@ -89,6 +89,17 namespace Implab.Playground {
89	public class Program {	89	public class Program {
90		90
91	static void Main(string[] args) {	91	static void Main(string[] args) {
		92	var u1 = new Uri("/some/one");
		93
		94	Console.WriteLine($"{u1.IsAbsoluteUri}: {u1}");
		95
		96	var u2 = new Uri(u1, "../../two");
		97
		98	Console.WriteLine($"{u2.IsAbsoluteUri}: {u2}");
		99
		100	}
		101
		102	static void Main2(string[] args) {
92	var listener = new SimpleTraceListener(Console.Out);	103	var listener = new SimpleTraceListener(Console.Out);
93	var source = Trace<TypeResolver>.TraceSource;	104	var source = Trace<TypeResolver>.TraceSource;
94	source.Switch.Level = SourceLevels.All;	105	source.Switch.Level = SourceLevels.All;

Implab.ServiceHost/Unity/ContainerBuilder.cs +34 -2

             using System;
+            using System.IO;
             using System.Reflection;
+            using Implab.Diagnostics;
             using Unity;
             namespace Implab.ServiceHost.Unity {
+                using static Trace<ContainerBuilder>;
                 public class ContainerBuilder {
                     readonly TypeResolver m_resolver;
                     readonly ContainerConfigurationSchema m_schema;
+                    Uri m_location;
                     public IUnityContainer Container {
                         get {
                             return m_container;
                     }
+                    /// <summary>
+                    /// Includes the confguration. Creates a new <see cref="ContainerBuilder"/>,
+                    /// and loads the configuration to it. The created builder will share the
+                    /// container and will have its own isolated type resolver.
+                    /// </summary>
+                    /// <param name="file">A path to configuration relative to the current configuration.</param>
                     public void Include(string file) {
                         var includeContext = new ContainerBuilder(m_container, m_schema);
-                        includeContext.LoadConfig(file);
+                        if (m_location != null) {
+                            var uri =  new Uri(m_location, file);
+                            includeContext.LoadConfig(uri);
+                        } else {
+                            includeContext.LoadConfig(file);
+                        }
                     }
+                    /// <summary>
+                    /// Loads a configuration from the specified local file.
+                    /// </summary>
+                    /// <param name="file">The path to the configuration file.</param>
                     public void LoadConfig(string file) {
-                        var config = m_schema.LoadFile(file);
+                        Safe.ArgumentNotEmpty(file, nameof(file));
+                        LoadConfig(new Uri(Path.GetFullPath(file)));
+                    }
+                    public void LoadConfig(Uri location) {
+                        Safe.ArgumentNotNull(location, nameof(location));
+                        m_location = location;
+                        var config = m_schema.LoadConfig(location.ToString());
                         config.Visit(this);
                     }

Implab.ServiceHost/Unity/ContainerConfigurationSchema.cs +2 -2

                         RegisterContainerElement(typeof(T), name);
                     }
-                    public ContainerElement LoadFile(string file) {
+                    public ContainerElement LoadConfig(string uri) {
-                        using (var reader = XmlReader.Create(file)) {
+                        using (var reader = XmlReader.Create(uri)) {
                             return (ContainerElement)Serializer.Deserialize(reader);
                         }
                     }

Implab.ServiceHost/Unity/RegistrationBuilder.cs 0 -16

@@ -23,21 +23,5 namespace Implab.ServiceHost.Unity {
23	protected RegistrationBuilder(Type registrationType) {	23	protected RegistrationBuilder(Type registrationType) {
24	RegistrationType = registrationType;	24	RegistrationType = registrationType;
25	}	25	}
26
27	internal void Visit(SingletonLifetimeElement simgletonLifetime) {
28	Lifetime = new SingletonLifetimeManager();
29	}
30
31	internal void Visit(ContainerLifetimeElement containerLifetime) {
32	Lifetime = new ContainerControlledLifetimeManager();
33	}
34
35	internal void Visit(HierarchicalLifetimeElement hierarchicalLifetime) {
36	Lifetime = new HierarchicalLifetimeManager();
37	}
38
39	internal void Visist(ContextLifetimeElement contextLifetime) {
40	Lifetime = new PerResolveLifetimeManager();
41	}
42	}	26	}
43	} No newline at end of file	27	}

Implab/Diagnostics/Trace.cs +15 -3

                     }
                     /// <summary>
+                    /// Writes a debug message.
+                    /// </summary>
+                    /// <param name="format">Format.</param>
+                    /// <param name="arguments">Arguments.</param>
+                    [Conditional("DEBUG")]
+                    public static void Debug(string format, params object[] arguments) {
+                    }
+                    /// <summary>
                     /// Writes an informational message.
                     /// </summary>
                     /// <param name="format">Format.</param>
                     /// </summary>
                     /// <param name="format">Format.</param>
                     /// <param name="arguments">Arguments.</param>
-                    [Conditional("TRACE")]
                     public static void Warn(string format, params object[] arguments) {
                         TraceSource.TraceEvent(TraceEventType.Warning, 0, format, arguments);
                     }
-                    [Conditional("TRACE")]
+                    /// <summary>
+                    /// Writes a error message.
+                    /// </summary>
+                    /// <param name="format">Format.</param>
+                    /// <param name="arguments">Arguments.</param>
                     public static void Error(string format, params object[] arguments) {
                         TraceSource.TraceEvent(TraceEventType.Error, 0, format, arguments);
                     }
-                    [Conditional("TRACE")]
                     public static void Error(Exception err) {
                         TraceSource.TraceData(TraceEventType.Error, 0, err);
                     }

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages