Merge branch 'master' into public

Source/Framework/Monahrq.Default/Controllers/DefaultCompositeUIEventHandler.cs

@@ -10,6 +10,7 @@
 using Monahrq.Default.Views;
 using Monahrq.Sdk.Events;
 using System.Diagnostics;
+using Monahrq.Infrastructure;
 
 
 namespace Monahrq.Default.Controllers
@@ -37,14 +38,17 @@ public abstract class DefaultCompositeUIEventHandler<T>
     public class SimpleImportCompleteHandler : DefaultCompositeUIEventHandler<ISimpleImportCompletedPayload>, 
         ISimpleImportCompleteHandler
     {
+        [Import(LogNames.Session)]
+        public ILogWriter Logger { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SimpleImportCompleteHandler"/> class.
         /// </summary>
         /// <param name="events">The events.</param>
         [ImportingConstructor]
         public SimpleImportCompleteHandler(IEventAggregator events)
         {
-            events.GetEvent<SimpleImportCompletedEvent>().Subscribe(payload => Handle(payload));
+            events.GetEvent<SimpleImportCompletedEvent>().Subscribe(Handle);
         }
 
         /// <summary>
@@ -53,6 +57,8 @@ public SimpleImportCompleteHandler(IEventAggregator events)
         /// <param name="result">The result.</param>
         public override void Handle(ISimpleImportCompletedPayload result)
         {
+            this.Logger.Information($@"Simple import completed for {result.Description}; {result.CountInserted} rows inserted, {result.NumberOfErrors} errors encountered");
+
             if (result.NumberOfErrors == 0 && result.CountInserted > 0)
             {
                 MessageBox.Show(Application.Current.MainWindow,

Source/Framework/Monahrq.Default/Controllers/PleaseStandByHandler.cs

@@ -7,6 +7,7 @@
 using Microsoft.Practices.Prism.Events;
 using Microsoft.Practices.Prism.Regions;
 using Monahrq.Default.Views;
+using Monahrq.Infrastructure;
 using Monahrq.Sdk.Events;
 using Monahrq.Sdk.Regions;
 
@@ -39,6 +40,9 @@ public class PleaseStandByHandler : DefaultCompositeUIEventHandler<PleaseStandBy
         [Import]
         IEventAggregator Events { get; set; }
 
+        [Import(LogNames.Session)]
+        public ILogWriter Logger { get; set; }
+
         /// <summary>
         /// Handles the specified result.
         /// </summary>
@@ -49,10 +53,13 @@ public override void Handle(PleaseStandByEventPayload result)
             ctrl.Model = result;
             Events.GetEvent<PleaseStandByMessageUpdateEvent>().Subscribe(msg =>
                 {
+                    this.Logger.Debug($"Processing update: {msg}");
                     ctrl.Model.Message = msg;
                     ctrl.Refresh();
                 });
-
+
+            this.Logger.Debug("Pausing normal processing");
+
             IRegion region = RegionManager.Regions[RegionNames.Modal];
             if (!region.Views.Contains(ctrl))
             {

Source/Framework/Monahrq.Default/Controllers/ResumeNormalProcessingHandler.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Practices.Prism.Regions;
 using Monahrq.Default.Views;
+using Monahrq.Infrastructure;
 using Monahrq.Sdk.Events;
 using Monahrq.Sdk.Regions;
 
@@ -14,7 +15,7 @@ namespace Monahrq.Default.Controllers
     /// <summary>
     /// class to resume the processing
     /// </summary>
-    /// <seealso cref="Monahrq.Default.Controllers.DefaultCompositeUIEventHandler{Monahrq.Sdk.Events.Empty}" />
+    /// <seealso cref="Empty" />
     [Export]
     public class ResumeNormalProcessingHandler : DefaultCompositeUIEventHandler<Empty>
     {
@@ -27,6 +28,10 @@ public class ResumeNormalProcessingHandler : DefaultCompositeUIEventHandler<Empt
         /// </value>
         [Import]
         IRegionManager RegionManager { get; set; }
+
+        [Import(LogNames.Session)]
+        public ILogWriter Logger { get; set; }
+
         /// <summary>
         /// Handles the specified payload.
         /// </summary>
@@ -36,6 +41,7 @@ public override void Handle(Empty payload)
             var deactivateThese = RegionManager.Regions[RegionNames.Modal].Views.OfType<PleaseStandBy>();
             foreach (var ctrl in deactivateThese)
             {
+                this.Logger.Debug("Resuming normal processing");
                 RegionManager.Regions[RegionNames.Modal].Deactivate(ctrl);
                 RegionManager.Regions[RegionNames.Modal].Remove(ctrl);
             }

Source/Framework/Monahrq.Default/DataProvider/Administration/DataProviderAdministratorView.xaml.cs

@@ -16,6 +16,7 @@
 using Microsoft.Practices.Prism.Events;
 using Microsoft.Practices.Prism.Regions;
 using Microsoft.Practices.ServiceLocation;
+using Monahrq.Infrastructure;
 using Monahrq.Sdk.DataProvider.Builder;
 using Monahrq.Sdk.Regions;
 
@@ -45,21 +46,11 @@ IDataProviderAdministratorController Controller
         }
 
 
-        IEventAggregator Events
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<IEventAggregator>();
-            }
-        }
+        private IEventAggregator Events => ServiceLocator.Current.GetInstance<IEventAggregator>();
+        private IRegion DialogRegion => ServiceLocator.Current.GetInstance<IRegionManager>().Regions[RegionNames.Modal];
 
-        IRegion DialogRegion
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<IRegionManager>().Regions[RegionNames.Modal];
-            }
-        }
+        [Import]
+        public ILogWriter Logger { get; set; }
 
         [ImportingConstructor]
         public DataProviderAdministratorView(IServiceLocator serviceLocator,
@@ -71,17 +62,21 @@ public DataProviderAdministratorView(IServiceLocator serviceLocator,
                 .Subscribe(evnt => LoadBuilderDialog(evnt.Configuration));
 
             Events.GetEvent<DataProviderAdministratorController.DeletingEvent>()
-               .Subscribe(evnt => PromptForDelete(evnt));
+               .Subscribe(PromptForDelete);
         }
 
         private void PromptForDelete(DeletingConnectionEventArgs evnt)
         {
-            evnt.Cancel =
-                MessageBox.Show(Application.Current.MainWindow,
+            var result = MessageBox.Show(
+                Application.Current.MainWindow,
                     string.Format(@"Delete ""{0}"" ?", evnt.Connection.Name),
                     "Delete Connection?",
                     MessageBoxButton.YesNo,
-                    MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No;
+                    MessageBoxImage.Question, MessageBoxResult.No);
+
+            this.Logger.Debug($"User responded '{result}' to prompt \"Delete {evnt.Connection.Name}\"");
+
+            evnt.Cancel = result == MessageBoxResult.No;
         }
 
         private void LoadBuilderDialog(Infrastructure.Configuration.NamedConnectionElement connection)

Source/Framework/Monahrq.Default/DefaultModule.cs

@@ -9,6 +9,8 @@
 using Microsoft.Practices.ServiceLocation;
 using Monahrq.Default.Controllers;
 using Monahrq.Default.Views;
+using Monahrq.Infrastructure;
+using Monahrq.Infrastructure.Services;
 using Monahrq.Sdk.Attributes.Wings;
 using Monahrq.Sdk.Events;
 using Monahrq.Sdk.Modules;
@@ -59,7 +61,7 @@ IRegion PopupRegion
         /// <summary>
         /// The logger
         /// </summary>
-        private readonly ILoggerFacade _logger;
+        private readonly ILogWriter _logger;
         /// <summary>
         /// The plugin tracker
         /// </summary>
@@ -84,7 +86,7 @@ IRegion PopupRegion
         /// or
         /// moduleTracker</exception>
         [ImportingConstructor]
-        public DefaultModule(ILoggerFacade logger, IRegionManager regionManager, IPluginModuleTracker pluginTracker, IEventAggregator events)
+        public DefaultModule(ILogWriter logger, IRegionManager regionManager, IPluginModuleTracker pluginTracker, IEventAggregator events)
         {
             Events = events;
             if (logger == null)
@@ -148,7 +150,7 @@ public DefaultModule(ILoggerFacade logger, IRegionManager regionManager, IPlugin
         /// </summary>
         public void Initialize()
         {
-            _logger.Log("Monahrq.Default demonstrates logging during Initialize().", Category.Info, Priority.Medium);
+            _logger.Write("Monahrq.Default demonstrates logging during Initialize().");
 
             //_regionManager.RegisterViewWithRegion(Sdk.Regions.RegionNames.Modal, typeof(DataProvider.Administration.DataProviderAdministratorView));
 

Source/Framework/Monahrq.Default/ViewModels/BaseViewModel.cs

@@ -15,6 +15,7 @@
 using System.Threading.Tasks;
 using Monahrq.Infrastructure;
 using Monahrq.Infrastructure.Extensions;
+using Monahrq.Sdk.Logging;
 
 namespace Monahrq.Default.ViewModels
 {
@@ -76,6 +77,8 @@ protected BaseViewModel()
             ViewImportSampleCommand = new DelegateCommand<string>(OnViewSample);
         }
 
+        private readonly Lazy<ILogWriter> logger = new Lazy<ILogWriter>(() => new SessionLogger(new CallbackLogger()));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseViewModel"/> class.
         /// </summary>
@@ -130,6 +133,8 @@ public bool Committed
 
         public DelegateCommand<string> ViewImportSampleCommand { get; set; }
 
+        protected ILogWriter Logger => this.logger.Value;
+
         /// <summary>
         ///     Internal list of errors
         /// </summary>

Source/Framework/Monahrq.Infrastructure/BaseDataLoader/BaseDataDataReaderImporter.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Practices.Prism.Logging;
+using Monahrq.Infrastructure.Domain;
 using Monahrq.Infrastructure.Entities.Domain;
 
 
@@ -52,11 +53,13 @@ public override void LoadData()
                             (ImportType == BaseDataImportStrategyType.Append || VersionStrategy.IsNewest()))
                         {
                             // start transaction
+                            Logger.Write($"Processing base data update for type {typeof(TEntity).Name} from file {file}");
+                            var rows = 0;
 
                             // Verify data file exists.
                             if (!File.Exists(Path.Combine(baseDataDir, file)))
                             {
-                                Logger.Log(string.Format("Import file \"{0}\" missing from the base data resources directory.", file), Category.Warn, Priority.Medium);
+                                Logger.Warning("Import file \"{0}\" missing from the base data resources directory.", file);
                                 return;
                             }
 
@@ -102,9 +105,9 @@ public override void LoadData()
 
                                             if (reader == null)
                                             {
-                                                Logger.Log(string.Format(
-                                                        "A problem occurred while trying to read CSV file \"{0}\". Please make sure that the file is properly formated and has data.",
-                                                        file), Category.Exception, Priority.High);
+                                                Logger.Warning(
+                                                    "A problem occurred while trying to read CSV file \"{0}\". Please make sure that the file is properly formated and has data.",
+                                                    file);
                                                 return;
                                             }
 
@@ -115,21 +118,25 @@ public override void LoadData()
                                                     var temp = LoadFromReader(reader);
                                                     if (temp != null)
                                                         bulkImporter.Insert(temp);
+                                                    rows++;
                                                 }
                                             }
                                         }
                                     }
                                 }
                             }
+
+                            SchemaVersion version;
                             using (var session = DataProvider.SessionFactory.OpenSession())
                             {
-                                var version = VersionStrategy.GetVersion(session);
-
+                                version = VersionStrategy.GetVersion(session);
                                 session.SaveOrUpdate(version);
                                 session.Flush();
                             }
 
                             // commit transaction
+                            Logger.Information(
+                                $"Base data update completed for type {typeof(TEntity).Name}: {rows} rows inserted or updated; now at schema version {version}");
                         }
                     }
 
@@ -139,7 +146,7 @@ public override void LoadData()
             }
             catch (Exception ex)
             {
-                Logger.Log(ex.ToString(), Category.Warn, Priority.Medium);
+                Logger.Write(ex, "Error loading base data for entity {0}", typeof(TEntity).Name);
             }
         }
     }

Source/Framework/Monahrq.Infrastructure/BaseDataLoader/BaseDataEnumImporter.cs

@@ -2,6 +2,7 @@
 using System.Data;
 using System.Data.SqlClient;
 using Microsoft.Practices.Prism.Logging;
+using Monahrq.Infrastructure.Domain;
 using Monahrq.Infrastructure.Entities.Domain;
 
 namespace Monahrq.Infrastructure.BaseDataLoader
@@ -32,6 +33,9 @@ public override void LoadData()
             {
                 if (!VersionStrategy.IsLoaded() && VersionStrategy.IsNewest())
                 {
+                    Logger.Information($"Processing base data update for type {typeof(TEntity).Name}");
+
+                    var rows = 0;
                     // start transaction
                     using (var session = DataProvider.SessionFactory.OpenStatelessSession())
                     {
@@ -62,23 +66,27 @@ public override void LoadData()
                                 if (temp != null)
                                 {
                                     bulkImporter.Insert(temp);
+                                    rows++;
                                 }
                             }
                         }
                     }
 
+                    SchemaVersion version;
                     using (var session = DataProvider.SessionFactory.OpenSession())
                     {
-                        var version = VersionStrategy.GetVersion(session);
-
+                        version = VersionStrategy.GetVersion(session);
                         session.SaveOrUpdate(version);
                         session.Flush();
                     }
+
+                    Logger.Information($"Base data update completed for type {typeof(TEntity).Name}: {rows} rows inserted or updated; now at schema version {version}");
                 }
             }
             catch (Exception ex)
             {
-                Logger.Log(ex.ToString(), Category.Warn, Priority.Medium);
+                Logger.Write(ex, "Error importing {0} enumeration values for data type {1}", typeof(TEnum).Name,
+                    typeof(TEntity).Name);
             }
         }
     }

Source/Framework/Monahrq.Infrastructure/BaseDataLoader/BaseDataImporter.cs

@@ -36,7 +36,7 @@ public abstract class BaseDataImporter<TEntity, TKey> : IBaseDataImporter<TEntit
         /// The logger.
         /// </value>
         [Import(LogNames.Session)]
-        public ILoggerFacade Logger { get; set; }
+        public ILogWriter Logger { get; set; }
 
         /// <summary>
         /// Gets the loader priority.