From: Panagiotis Kanavos <pkanavos@gmail.com>
Date: Fri, 2 Mar 2012 12:10:31 +0000 (+0200)
Subject: Modified loggers to use their enclosing class
X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/commitdiff_plain/db8a958958aa4d86790f2a9f69c14caec5f84d6a

Modified loggers to use their enclosing class
Activated lossy logging of the last 30 messages before an error
Fixes #1799
---

diff --git a/trunk/Pithos.Client.WPF/App.xaml.cs b/trunk/Pithos.Client.WPF/App.xaml.cs
index 98c49ac..d5a06e0 100644
--- a/trunk/Pithos.Client.WPF/App.xaml.cs
+++ b/trunk/Pithos.Client.WPF/App.xaml.cs
@@ -41,21 +41,17 @@
 #endregion
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Diagnostics;
+using System.IO;
 using System.Linq;
-using System.Net;
-using System.Net.Mail;
 using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using Caliburn.Micro;
-using Microsoft.Win32;
-using Caliburn.Micro.Logging;
 using Pithos.Client.WPF.Properties;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
 
 
 namespace Pithos.Client.WPF
@@ -65,13 +61,14 @@ namespace Pithos.Client.WPF
     /// </summary>
     public partial class App : Application
     {
-        private readonly log4net.ILog _log = log4net.LogManager.GetLogger(typeof (App));
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger( MethodBase.GetCurrentMethod().DeclaringType );
 
         public App()
         {
-            log4net.Config.XmlConfigurator.Configure();            
-            
-            this.DispatcherUnhandledException += OnUnhandledException;
+            InitializeLogging();
+
+
+            DispatcherUnhandledException += OnDispatcherUnhandledException;
             AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
             TaskScheduler.UnobservedTaskException += OnUnobservedException;
 
@@ -85,15 +82,41 @@ namespace Pithos.Client.WPF
             InitializeComponent();            
         }
 
+        private static void InitializeLogging()
+        {
+            log4net.Config.XmlConfigurator.Configure();
+
+            try
+            {
+                var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+                var pithosDataPath= Path.Combine(appDataPath , "GRNET");
+                if (!Directory.Exists(pithosDataPath))
+                    Directory.CreateDirectory(pithosDataPath);
+
+                var loggerRepository = (Hierarchy)log4net.LogManager.GetRepository();
+                
+                var appenders = loggerRepository.GetAppenders();
+                var lossyAppender = appenders.OfType<BufferingForwardingAppender>()
+                    .First(appender => appender.Name == "LossyFileAppender");
+                var dumpAppender = lossyAppender.Appenders.OfType<RollingFileAppender>().First();                
+                dumpAppender.File = Path.Combine(pithosDataPath, "errorlog.txt");
+                dumpAppender.ActivateOptions();
+            }
+            catch (Exception exc)
+            {
+                Log.Error("Dumpl appender initialization failed",exc);                
+            }
+        }
+
         protected override void OnStartup(StartupEventArgs e)
         {
             if (!Settings.Default.StartOnSystemStartup && e.Args.Contains("startup"))
             {
-                this.Shutdown();
+                Shutdown();
                 return;
             }
-            
-            //TODO: Possibly add a delay here?
+
+            //Delay during startup
             if (e.Args.Contains("startup"))
             {
                 if (Settings.Default.StartupDelay>TimeSpan.Zero)
@@ -119,30 +142,47 @@ namespace Pithos.Client.WPF
                 return true;
             });
 
-            ShowMessages("Oops!","Where did that come from? \r\nErm, an exception occured.\r\nWe apologize for the inconvenience", messages);
+            Log.Error("Unobserved Task Exception",e.Exception);
+            
+            var message = String.Format(@"{0}\r\n{1}\r\n\r\n{2}", 
+                WPF.Properties.Resources.Unexpected_Error,
+                WPF.Properties.Resources.We_Apologize, 
+                WPF.Properties.Resources.Please_Submit_Error);
+            ShowMessages("Oops!",message, messages);
             e.SetObserved();
         }
 
         private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            var message = e.IsTerminating
-                              ? "Unexpected Exception. The application must terminate"
-                              : "Unexpected Exception";
+            Log.Error("Unhandled exception", (Exception)e.ExceptionObject);
+
+            var description = e.IsTerminating
+                              ? WPF.Properties.Resources.Unexpected_Error_Terminating
+                              : WPF.Properties.Resources.Unexpected_Error;
+            var message = String.Format(@"{0}\r\n{1}\r\n\r\n{2}",
+                description,
+                WPF.Properties.Resources.We_Apologize,
+                WPF.Properties.Resources.Please_Submit_Error);
 
 
+            var exc = ((Exception) e.ExceptionObject);
             var messages = new[]{
                                    new UserMessage
                                        {
-                                           Message = (e.ExceptionObject as Exception).Message,
-                                           Details = e.ExceptionObject.ToString(),
+                                           Message = exc.Message,
+                                           Details = exc.ToString(),
                                            Severity = Severity.Error
                                        }
                                };
+
+
             ShowMessages("Oops!", message,messages);
         }
 
-        void OnUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
-        {                        
+        void OnDispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            Log.Error("Unhandled Dispatcher exception", e.Exception);
+            
             var messages = new[]{
                                    new UserMessage
                                        {
@@ -151,18 +191,23 @@ namespace Pithos.Client.WPF
                                            Severity = Severity.Error
                                        }
                                };
-            ShowMessages("Oops!", "Unexcpected Exception", messages);
+            ShowMessages(WPF.Properties.Resources.Error_Title, 
+                WPF.Properties.Resources.Unexpected_Error,
+                messages);
             e.Handled=true;
         }
 
         void ShowMessages(string title,string message,IEnumerable<UserMessage> messages )
         {
-            LogMessages(messages);
+            var messageList = messages.ToList();
+            LogMessages(messageList);
             Execute.OnUIThread(()=>{
-                var messageView = new MessageView(messages);
-                messageView.Title = title;
-                messageView.Message = message;
-                messageView.ShowDialog();
+                                       var messageView = new MessageView(messageList)
+                                                        {
+                                                            Title = title, 
+                                                            Message = message
+                                                        };
+                                       messageView.ShowDialog();
             });
         }
 
@@ -170,7 +215,7 @@ namespace Pithos.Client.WPF
         {
             var logMessage = CreateMessage(messages);
 
-            _log.Error(logMessage);
+            Log.Error(logMessage);
         }
 
         private static string CreateMessage(IEnumerable<UserMessage> messages)
diff --git a/trunk/Pithos.Client.WPF/PithosAccount.cs b/trunk/Pithos.Client.WPF/PithosAccount.cs
index 06d7963..a384eb2 100644
--- a/trunk/Pithos.Client.WPF/PithosAccount.cs
+++ b/trunk/Pithos.Client.WPF/PithosAccount.cs
@@ -44,6 +44,7 @@
 // -----------------------------------------------------------------------
 
 using System.IO;
+using System.Reflection;
 using Pithos.Network;
 using log4net;
 
@@ -67,7 +68,7 @@ namespace Pithos.Client.WPF
     /// </summary>
     public static class PithosAccount
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(PithosAccount));
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Asynchronously retrieves PITHOS credentials
diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index dc93a5e..ec04acb 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -207,7 +207,8 @@
                     <TextBlock Text="Hashing Parallelism" Margin="5"/>
                     <extToolkit:IntegerUpDown x:Name="Settings_HashingParallelism" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="1" />                    
                     <TextBlock Text="Startup Delay (minutes)" Margin="5"/>
-                    <extToolkit:IntegerUpDown x:Name="StartupDelay" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="0" />                    
+                    <extToolkit:IntegerUpDown x:Name="StartupDelay" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter number of tasks" Minimum="0" />
+                    <Button x:Name="OpenLogPath" Content="Open Log Path" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto"/>
                 </StackPanel>
             </TabItem>
         </TabControl>
diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 48c7299..c432009 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -46,6 +46,7 @@ using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
@@ -75,7 +76,7 @@ namespace Pithos.Client.WPF.Preferences
         private readonly IEventAggregator _events;
 
         //Logging in the Pithos client is provided by log4net
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private PithosSettings _settings;
         public PithosSettings Settings
@@ -259,6 +260,10 @@ namespace Pithos.Client.WPF.Preferences
         }
 
     
+        public void OpenLogPath()
+        {
+            Shell.OpenLogPath();
+        }
         public void SaveChanges()
         {
             DoSave();
diff --git a/trunk/Pithos.Client.WPF/Properties/Resources.Designer.cs b/trunk/Pithos.Client.WPF/Properties/Resources.Designer.cs
index 4fb647f..4122924 100644
--- a/trunk/Pithos.Client.WPF/Properties/Resources.Designer.cs
+++ b/trunk/Pithos.Client.WPF/Properties/Resources.Designer.cs
@@ -70,6 +70,24 @@ namespace Pithos.Client.WPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Oops! Pithos has a crack!.
+        /// </summary>
+        internal static string Error_Title {
+            get {
+                return ResourceManager.GetString("Error_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please help us improve Pithos by submitting the error and a description of what you were doing before the error occured.
+        /// </summary>
+        internal static string Please_Submit_Error {
+            get {
+                return ResourceManager.GetString("Please_Submit_Error", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to The Startup Delay must be greater or equal to 0.
         /// </summary>
         internal static string PreferencesViewModel_StartupDelay_Greater_or_equal_to_0 {
@@ -77,5 +95,32 @@ namespace Pithos.Client.WPF.Properties {
                 return ResourceManager.GetString("PreferencesViewModel_StartupDelay_Greater_or_equal_to_0", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An unexpected error occured..
+        /// </summary>
+        internal static string Unexpected_Error {
+            get {
+                return ResourceManager.GetString("Unexpected_Error", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An unexpected error occured. The application must terminate.
+        /// </summary>
+        internal static string Unexpected_Error_Terminating {
+            get {
+                return ResourceManager.GetString("Unexpected_Error_Terminating", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to We apologize for the inconvenience..
+        /// </summary>
+        internal static string We_Apologize {
+            get {
+                return ResourceManager.GetString("We_Apologize", resourceCulture);
+            }
+        }
     }
 }
diff --git a/trunk/Pithos.Client.WPF/Properties/Resources.resx b/trunk/Pithos.Client.WPF/Properties/Resources.resx
index 2a4f799..4c43e9d 100644
--- a/trunk/Pithos.Client.WPF/Properties/Resources.resx
+++ b/trunk/Pithos.Client.WPF/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,15 +112,30 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-	<data name="PreferencesViewModel_StartupDelay_Greater_or_equal_to_0">
-		<value xml:space="preserve">The Startup Delay must be greater or equal to 0</value>
-	</data>
-	<data name="AddAccountViewModel_SelectAccount_Please_select_a_folder">
-		<value xml:space="preserve">Please select a folder to store local files. Pithos will create a new folder called Okeanos under the folder you specify.</value>
-	</data>
+  <data name="PreferencesViewModel_StartupDelay_Greater_or_equal_to_0" xml:space="preserve">
+    <value>The Startup Delay must be greater or equal to 0</value>
+  </data>
+  <data name="AddAccountViewModel_SelectAccount_Please_select_a_folder" xml:space="preserve">
+    <value>Please select a folder to store local files. Pithos will create a new folder called Okeanos under the folder you specify.</value>
+  </data>
+  <data name="Error_Title" xml:space="preserve">
+    <value>Oops! Pithos has a crack!</value>
+  </data>
+  <data name="Please_Submit_Error" xml:space="preserve">
+    <value>Please help us improve Pithos by submitting the error and a description of what you were doing before the error occured</value>
+  </data>
+  <data name="Unexpected_Error" xml:space="preserve">
+    <value>An unexpected error occured.</value>
+  </data>
+  <data name="Unexpected_Error_Terminating" xml:space="preserve">
+    <value>An unexpected error occured. The application must terminate</value>
+  </data>
+  <data name="We_Apologize" xml:space="preserve">
+    <value>We apologize for the inconvenience.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
index d54d7e2..cec2bff 100644
--- a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
@@ -223,7 +223,7 @@ namespace Pithos.Client.WPF.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr/tools/feedback")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://pithos.dev.grnet.gr/im/feedback")]
         public string FeedbackUri {
             get {
                 return ((string)(this["FeedbackUri"]));
diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.settings b/trunk/Pithos.Client.WPF/Properties/Settings.settings
index f1229d0..a5857e1 100644
--- a/trunk/Pithos.Client.WPF/Properties/Settings.settings
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.settings
@@ -54,7 +54,7 @@
       <Value Profile="(Default)">https://pithos.dev.grnet.gr/login</Value>
     </Setting>
     <Setting Name="FeedbackUri" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://pithos.dev.grnet.gr/tools/feedback</Value>
+      <Value Profile="(Default)">https://pithos.dev.grnet.gr/im/feedback</Value>
     </Setting>
     <Setting Name="MustUpgrade" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
diff --git a/trunk/Pithos.Client.WPF/Shell/FeedbackViewModel.cs b/trunk/Pithos.Client.WPF/Shell/FeedbackViewModel.cs
index f7bdcd8..3df10a9 100644
--- a/trunk/Pithos.Client.WPF/Shell/FeedbackViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/FeedbackViewModel.cs
@@ -69,7 +69,7 @@ namespace Pithos.Client.WPF.Shell
 
         private IWindowManager _windowManager;
 
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 
         [ImportingConstructor]
diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index b06e8b8..eb355a5 100644
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -118,7 +118,7 @@ namespace Pithos.Client.WPF {
 		private ServiceHost _statusService;
 
 		//Logging in the Pithos client is provided by log4net
-		private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 		//Lazily initialized File Version info. This is done once and lazily to avoid blocking the UI
 		private readonly Lazy<FileVersionInfo> _fileVersion;
@@ -423,7 +423,15 @@ namespace Pithos.Client.WPF {
             Process.Start("explorer.exe","/select, " + fullPath);
         }
 
-		public void ShowFileProperties()
+        public void OpenLogPath()
+        {
+            var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var pithosDataPath = Path.Combine(appDataPath, "GRNET");
+
+            Process.Start(pithosDataPath);
+        }
+        
+        public void ShowFileProperties()
 		{
 			var account = Settings.Accounts.First(acc => acc.IsActive);            
 			var dir = new DirectoryInfo(account.RootPath + @"\pithos");
diff --git a/trunk/Pithos.Client.WPF/app.config b/trunk/Pithos.Client.WPF/app.config
index cf18a8f..19670ae 100644
--- a/trunk/Pithos.Client.WPF/app.config
+++ b/trunk/Pithos.Client.WPF/app.config
@@ -111,7 +111,7 @@
         <value>https://pithos.dev.grnet.gr/login</value>
       </setting>
       <setting name="FeedbackUri" serializeAs="String">
-        <value>http://pithos.dev.grnet.gr/tools/feedback</value>
+        <value>https://pithos.dev.grnet.gr/im/feedback</value>
       </setting>
       <setting name="ProductionServer" serializeAs="String">
         <value>https://plus.pithos.grnet.gr</value>
@@ -127,31 +127,46 @@
         <conversionPattern value="%logger (%property{myContext}) [%level]- %message%newline" />
       </layout>
       <filter type="log4net.Filter.LevelRangeFilter">
-        <levelMin value="DEBUG" />
+        <levelMin value="INFO" />
         <levelMax value="FATAL" />
-        <acceptOnMatch value="false" />
-      </filter>
-      <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="NHibernate.SQL" />
-        <acceptOnMatch value="true" />
-      </filter>
-      <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="NHibernate" />
-        <acceptOnMatch value="false" />
       </filter>
-      <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="Caliburn" />
-        <acceptOnMatch value="false" />
+    </appender>
+    	
+	<appender name="DumpFileAppender" type="log4net.Appender.RollingFileAppender">
+		<file value="log.txt" />
+		<appendToFile value="false" />
+		<rollingStyle value="Size" />
+		<maxSizeRollBackups value="10" />
+		<maximumFileSize value="100KB" />
+		<staticLogFileName value="true" />
+		<layout type="log4net.Layout.XMLLayout"/>
+	</appender>
+
+	<appender name="OutputDebugStringAppender" type="log4net.Appender.OutputDebugStringAppender" >
+    <layout type="log4net.Layout.PatternLayout">
+          <conversionPattern value="%logger (%property{myContext}) [%level]- %message%newline" />
+    </layout>
+</appender>
+
+    <appender name="LossyFileAppender" type="log4net.Appender.BufferingForwardingAppender">
+      <filter type="log4net.Filter.LevelRangeFilter">
+        <levelMin value="DEBUG" />
+        <levelMax value="FATAL" />
       </filter>
+      <bufferSize value="30" />
+      <lossy value="true"/>
+      <evaluator type="log4net.Core.LevelEvaluator">
+        <threshold value="ERROR" />
+      </evaluator>
+      <appender-ref ref="DumpFileAppender" />
+	  
     </appender>
-    <logger name="NHibernate.SQL" additivity="false">
-      <level value="DEBUG"/>
-      <appender-ref ref="TraceAppender" />      
-    </logger>
 
     <root>
       <level value="DEBUG" />
-      <appender-ref ref="TraceAppender" />
-    </root>
+	    <appender-ref ref="LossyFileAppender" />
+		<appender-ref ref="TraceAppender" />
+		<appender-ref ref="OutputDebugStringAppender" />
+	</root>
   </log4net>
 </configuration>
\ No newline at end of file
diff --git a/trunk/Pithos.Core/Agents/DeleteAgent.cs b/trunk/Pithos.Core/Agents/DeleteAgent.cs
index 3a0e5ea..bf3dc2d 100644
--- a/trunk/Pithos.Core/Agents/DeleteAgent.cs
+++ b/trunk/Pithos.Core/Agents/DeleteAgent.cs
@@ -44,6 +44,7 @@ using System.ComponentModel.Composition;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Threading.Tasks.Dataflow;
 using Pithos.Interfaces;
 using Pithos.Network;
@@ -60,12 +61,11 @@ namespace Pithos.Core.Agents
     [Export]
     public class DeleteAgent
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         [Import]
         public IStatusKeeper StatusKeeper { get; set; }
 
-        private static readonly ILog Log = LogManager.GetLogger("DeleteAgent");
-
         //A separate agent is used to execute delete actions immediatelly;
         private readonly ActionBlock<CloudDeleteAction> _deleteAgent;
 
diff --git a/trunk/Pithos.Core/Agents/FileAgent.cs b/trunk/Pithos.Core/Agents/FileAgent.cs
index b73e14e..8cef5bf 100644
--- a/trunk/Pithos.Core/Agents/FileAgent.cs
+++ b/trunk/Pithos.Core/Agents/FileAgent.cs
@@ -46,6 +46,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Pithos.Interfaces;
@@ -58,6 +59,8 @@ namespace Pithos.Core.Agents
 //    [Export]
     public class FileAgent
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         Agent<WorkflowState> _agent;
         private FileSystemWatcher _watcher;
         private FileSystemWatcherAdapter _adapter;
@@ -73,7 +76,6 @@ namespace Pithos.Core.Agents
 
         internal string RootPath { get;  set; }
 
-        private static readonly ILog Log = LogManager.GetLogger("FileAgent");
 
         public void Start(AccountInfo accountInfo,string rootPath)
         {
diff --git a/trunk/Pithos.Core/Agents/NetworkAgent.cs b/trunk/Pithos.Core/Agents/NetworkAgent.cs
index 563f0f9..077a810 100644
--- a/trunk/Pithos.Core/Agents/NetworkAgent.cs
+++ b/trunk/Pithos.Core/Agents/NetworkAgent.cs
@@ -47,6 +47,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Castle.ActiveRecord;
@@ -59,6 +60,8 @@ namespace Pithos.Core.Agents
     [Export]
     public class NetworkAgent
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private Agent<CloudAction> _agent;
 
         [System.ComponentModel.Composition.Import]
@@ -69,7 +72,6 @@ namespace Pithos.Core.Agents
         
         public IStatusNotification StatusNotification { get; set; }
 
-        private static readonly ILog Log = LogManager.GetLogger("NetworkAgent");
 
         [System.ComponentModel.Composition.Import]
         public IPithosSettings Settings { get; set; }
diff --git a/trunk/Pithos.Core/Agents/PollAgent.cs b/trunk/Pithos.Core/Agents/PollAgent.cs
index b14068c..6da6d51 100644
--- a/trunk/Pithos.Core/Agents/PollAgent.cs
+++ b/trunk/Pithos.Core/Agents/PollAgent.cs
@@ -45,6 +45,7 @@ using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Castle.ActiveRecord;
@@ -67,7 +68,7 @@ namespace Pithos.Core.Agents
     [Export]
     public class PollAgent
     {
-        private static readonly ILog Log = LogManager.GetLogger("PollAgent");
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         [System.ComponentModel.Composition.Import]
         public IStatusKeeper StatusKeeper { get; set; }
diff --git a/trunk/Pithos.Core/Agents/StatusAgent.cs b/trunk/Pithos.Core/Agents/StatusAgent.cs
index 8dcf5ae..f0d54cb 100644
--- a/trunk/Pithos.Core/Agents/StatusAgent.cs
+++ b/trunk/Pithos.Core/Agents/StatusAgent.cs
@@ -47,6 +47,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -61,13 +62,14 @@ namespace Pithos.Core.Agents
     [Export(typeof(IStatusChecker)),Export(typeof(IStatusKeeper))]
     public class StatusAgent:IStatusChecker,IStatusKeeper
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         [System.ComponentModel.Composition.Import]
         public IPithosSettings Settings { get; set; }
 
         private Agent<Action> _persistenceAgent;
 
 
-        private static readonly ILog Log = LogManager.GetLogger("StatusAgent");
 
         public StatusAgent()
         {            
diff --git a/trunk/Pithos.Core/Agents/WorkflowAgent.cs b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
index d05f8d3..79617cb 100644
--- a/trunk/Pithos.Core/Agents/WorkflowAgent.cs
+++ b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
@@ -46,6 +46,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Castle.ActiveRecord;
@@ -58,6 +59,8 @@ namespace Pithos.Core.Agents
     [Export]
     public class WorkflowAgent
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         readonly Agent<WorkflowState> _agent;
                 
         public IStatusNotification StatusNotification { get; set; }
@@ -67,7 +70,7 @@ namespace Pithos.Core.Agents
         [System.ComponentModel.Composition.Import]
         public NetworkAgent NetworkAgent { get; set; }
 
-        private static readonly ILog Log = LogManager.GetLogger("WorkflowAgent");
+
 
         public WorkflowAgent()
         {
diff --git a/trunk/Pithos.Core/FileState.cs b/trunk/Pithos.Core/FileState.cs
index 58f91be..5fbacbd 100644
--- a/trunk/Pithos.Core/FileState.cs
+++ b/trunk/Pithos.Core/FileState.cs
@@ -41,6 +41,7 @@
 #endregion
 using System.Diagnostics.Contracts;
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using Castle.ActiveRecord;
 using Castle.ActiveRecord.Framework;
@@ -62,7 +63,8 @@ namespace Pithos.Core
     [ActiveRecord]
     public class FileState : ActiveRecordLinqBase<FileState>
     {
-        private static readonly ILog Log = LogManager.GetLogger("FileState");
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
 
         private IList<FileTag> _tags = new List<FileTag>();
 
diff --git a/trunk/Pithos.Core/PithosMonitor.cs b/trunk/Pithos.Core/PithosMonitor.cs
index 9e74cb1..567be26 100644
--- a/trunk/Pithos.Core/PithosMonitor.cs
+++ b/trunk/Pithos.Core/PithosMonitor.cs
@@ -45,6 +45,7 @@ using System.ComponentModel.Composition;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Pithos.Core.Agents;
@@ -57,6 +58,8 @@ namespace Pithos.Core
     [Export(typeof(PithosMonitor))]
     public class PithosMonitor:IDisposable
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private int _blockSize;
         private string _blockHash;
 
@@ -129,11 +132,10 @@ namespace Pithos.Core
         }
 
         private AccountInfo _accountInfo;
-        
-       
 
 
-        private static readonly ILog Log = LogManager.GetLogger(typeof(PithosMonitor));
+
+
 
 
         public bool Pause
diff --git a/trunk/Pithos.Network/CloudFilesClient.cs b/trunk/Pithos.Network/CloudFilesClient.cs
index a58b015..fb5ba71 100644
--- a/trunk/Pithos.Network/CloudFilesClient.cs
+++ b/trunk/Pithos.Network/CloudFilesClient.cs
@@ -55,6 +55,7 @@ using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -67,6 +68,8 @@ namespace Pithos.Network
     [Export(typeof(ICloudClient))]
     public class CloudFilesClient:ICloudClient
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         //CloudFilesClient uses *_baseClient* internally to communicate with the server
         //RestClient provides a REST-friendly interface over the standard WebClient.
         private RestClient _baseClient;
@@ -137,7 +140,6 @@ namespace Pithos.Network
         public bool UsePithos { get; set; }
 
 
-        private static readonly ILog Log = LogManager.GetLogger("CloudFilesClient");
 
         public CloudFilesClient(string userName, string apiKey)
         {
diff --git a/trunk/Pithos.Network/RestClient.cs b/trunk/Pithos.Network/RestClient.cs
index 95528a1..5c1a77b 100644
--- a/trunk/Pithos.Network/RestClient.cs
+++ b/trunk/Pithos.Network/RestClient.cs
@@ -44,6 +44,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using log4net;
@@ -61,6 +62,8 @@ namespace Pithos.Network
     /// </summary>
     public class RestClient:WebClient
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         public int Timeout { get; set; }
 
         public bool TimedOut { get; set; }
@@ -84,8 +87,6 @@ namespace Pithos.Network
             }            
         }
 
-        private static readonly ILog Log = LogManager.GetLogger("RestClient");
-
 
         [ContractInvariantMethod]
         private void Invariants()
diff --git a/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
index a5b19b5..2c38bff 100644
--- a/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
+++ b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
@@ -46,7 +46,7 @@
         "Entry"
         {
         "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -58,7 +58,7 @@
         "Entry"
         {
         "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -70,13 +70,13 @@
         "Entry"
         {
         "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -88,13 +88,13 @@
         "Entry"
         {
         "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -124,25 +124,25 @@
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -178,7 +178,7 @@
         "Entry"
         {
         "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -190,7 +190,7 @@
         "Entry"
         {
         "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -226,7 +226,7 @@
         "Entry"
         {
         "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
-        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -238,7 +238,7 @@
         "Entry"
         {
         "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -268,7 +268,7 @@
         "Entry"
         {
         "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
-        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -280,7 +280,7 @@
         "Entry"
         {
         "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -304,7 +304,7 @@
         "Entry"
         {
         "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -316,7 +316,7 @@
         "Entry"
         {
         "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -328,13 +328,13 @@
         "Entry"
         {
         "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
-        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -364,61 +364,61 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
+        "OwnerKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_392252B203784D91A39016FC82CD5887"
+        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_B998E7FC1F540278910B0D58694455C2"
+        "OwnerKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -430,61 +430,61 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
+        "OwnerKey" = "8:_B998E7FC1F540278910B0D58694455C2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_392252B203784D91A39016FC82CD5887"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
+        "OwnerKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
+        "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
+        "OwnerKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
+        "OwnerKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -599,6 +599,11 @@
             "AssemblyAsmDisplayName" = "8:WPFToolkit.Extended, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_392252B203784D91A39016FC82CD5887"
+                    {
+                    "Name" = "8:WPFToolkit.Extended.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:WPFToolkit.Extended.dll"
             "TargetName" = "8:"
@@ -625,6 +630,11 @@
             "AssemblyAsmDisplayName" = "8:Castle.ActiveRecord, Version=3.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_4C5B93BC82FE5E63E01458A8DA46B4D6"
+                    {
+                    "Name" = "8:Castle.ActiveRecord.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Castle.ActiveRecord.dll"
             "TargetName" = "8:"
@@ -651,6 +661,11 @@
             "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_586310F986FB0DB4F49D3EAFBD87760C"
+                    {
+                    "Name" = "8:log4net.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:log4net.dll"
             "TargetName" = "8:"
@@ -677,6 +692,11 @@
             "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Dataflow, Version=0.0.4098.29463, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_5B7E11B508E123A2BA4C11623DA3E029"
+                    {
+                    "Name" = "8:System.Threading.Tasks.Dataflow.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:System.Threading.Tasks.Dataflow.dll"
             "TargetName" = "8:"
@@ -703,6 +723,11 @@
             "AssemblyAsmDisplayName" = "8:ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_626ECD9012C5D7BD4388B6BE07F5107D"
+                    {
+                    "Name" = "8:ParallelExtensionsExtras.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:ParallelExtensionsExtras.dll"
             "TargetName" = "8:"
@@ -729,6 +754,11 @@
             "AssemblyAsmDisplayName" = "8:Caliburn.Micro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_6BC141E8128E964AD9B9281537E64BEA"
+                    {
+                    "Name" = "8:Caliburn.Micro.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Caliburn.Micro.dll"
             "TargetName" = "8:"
@@ -755,6 +785,11 @@
             "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.76.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
+                    "_71EDC030F43F0D5A22D833BE7229E576"
+                    {
+                    "Name" = "8:System.Data.SQLite.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:System.Data.SQLite.dll"
             "TargetName" = "8:"
@@ -781,6 +816,11 @@
             "AssemblyAsmDisplayName" = "8:NHibernate, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+                    {
+                    "Name" = "8:NHibernate.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:NHibernate.dll"
             "TargetName" = "8:"
@@ -807,6 +847,11 @@
             "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_91EEC8BDF3543C1C3379FB93171A844E"
+                    {
+                    "Name" = "8:System.Windows.Interactivity.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:System.Windows.Interactivity.dll"
             "TargetName" = "8:"
@@ -833,6 +878,11 @@
             "AssemblyAsmDisplayName" = "8:AsyncCtpLibrary, Version=1.0.4107.18181, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_A490E069DF5DE5852575B6E157EB50BE"
+                    {
+                    "Name" = "8:AsyncCtpLibrary.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:AsyncCtpLibrary.dll"
             "TargetName" = "8:"
@@ -859,6 +909,11 @@
             "AssemblyAsmDisplayName" = "8:Pithos.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
+                    "_A611766CD2793378FFAB2F3063F81496"
+                    {
+                    "Name" = "8:Pithos.Core.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Pithos.Core.dll"
             "TargetName" = "8:"
@@ -905,6 +960,11 @@
             "AssemblyAsmDisplayName" = "8:Castle.Components.Validator, Version=2.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_B998E7FC1F540278910B0D58694455C2"
+                    {
+                    "Name" = "8:Castle.Components.Validator.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Castle.Components.Validator.dll"
             "TargetName" = "8:"
@@ -931,6 +991,11 @@
             "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b9a188c8922137c6, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_C7EE41E4C982C8217BD7DCDA76836670"
+                    {
+                    "Name" = "8:Newtonsoft.Json.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Newtonsoft.Json.dll"
             "TargetName" = "8:"
@@ -957,6 +1022,11 @@
             "AssemblyAsmDisplayName" = "8:NHibernate.ByteCode.Castle, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_DD69E9C0F36E10A97EB92CFBAFD2662D"
+                    {
+                    "Name" = "8:NHibernate.ByteCode.Castle.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:NHibernate.ByteCode.Castle.dll"
             "TargetName" = "8:"
@@ -983,6 +1053,11 @@
             "AssemblyAsmDisplayName" = "8:Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_DD70D5956F2E708F680AF121870FFCCD"
+                    {
+                    "Name" = "8:Iesi.Collections.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Iesi.Collections.dll"
             "TargetName" = "8:"
@@ -1009,6 +1084,11 @@
             "AssemblyAsmDisplayName" = "8:Pithos.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_E42C4D0836CDB6008642BC929C51E416"
+                    {
+                    "Name" = "8:Pithos.Network.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Pithos.Network.dll"
             "TargetName" = "8:"
@@ -1035,6 +1115,11 @@
             "AssemblyAsmDisplayName" = "8:Pithos.Interfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_E46F39A63288379E63BDD76C9F21CC3E"
+                    {
+                    "Name" = "8:Pithos.Interfaces.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Pithos.Interfaces.dll"
             "TargetName" = "8:"
@@ -1061,6 +1146,11 @@
             "AssemblyAsmDisplayName" = "8:Castle.Core, Version=2.5.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_F472AA6700476700D62AABE8262628BF"
+                    {
+                    "Name" = "8:Castle.Core.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Castle.Core.dll"
             "TargetName" = "8:"
@@ -1087,6 +1177,11 @@
             "AssemblyAsmDisplayName" = "8:Hardcodet.Wpf.TaskbarNotification, Version=1.0.4.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_FA76529F78D7D6108EDBA33F19836A6B"
+                    {
+                    "Name" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
             "TargetName" = "8:"
@@ -1113,6 +1208,11 @@
             "AssemblyAsmDisplayName" = "8:NHibernate.Search, Version=0.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
+                    "_FBB2F726C4025B9184DFBD2748E15EBE"
+                    {
+                    "Name" = "8:NHibernate.Search.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:NHibernate.Search.dll"
             "TargetName" = "8:"
@@ -1138,6 +1238,28 @@
         }
         "Folder"
         {
+            "{1525181F-901A-416C-8A58-119130FE478E}:_22C90C70537D41D3A0FAA53FA43941F5"
+            {
+            "Name" = "8:#1915"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:AppDataFolder"
+                "Folders"
+                {
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_B12549FA43364BFCB917F25161E2F3CD"
+                    {
+                    "Name" = "8:GRNET"
+                    "AlwaysCreate" = "11:TRUE"
+                    "Condition" = "8:"
+                    "Transitive" = "11:FALSE"
+                    "Property" = "8:_D9DCD31A441A4B7B845F98CB12D6BFBA"
+                        "Folders"
+                        {
+                        }
+                    }
+                }
+            }
             "{1525181F-901A-416C-8A58-119130FE478E}:_2FAEB724740948159527B05C76F4FDFA"
             {
             "Name" = "8:#1919"
@@ -1211,7 +1333,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
         "ProductCode" = "8:{57BE17ED-F02F-43C0-B44B-845697CD3D6A}"
-        "PackageCode" = "8:{088CDA63-20EF-47B5-A8A5-6A64BAAF98E3}"
+        "PackageCode" = "8:{F55471B6-9395-4893-810B-8199D93F61CD}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
diff --git a/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
index 981874a..8b79d3b 100644
--- a/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
+++ b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
@@ -46,7 +46,7 @@
         "Entry"
         {
         "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -58,7 +58,7 @@
         "Entry"
         {
         "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -70,13 +70,13 @@
         "Entry"
         {
         "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -88,13 +88,13 @@
         "Entry"
         {
         "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -124,25 +124,25 @@
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -172,7 +172,7 @@
         "Entry"
         {
         "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -184,7 +184,7 @@
         "Entry"
         {
         "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -226,7 +226,7 @@
         "Entry"
         {
         "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
-        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -238,7 +238,7 @@
         "Entry"
         {
         "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -268,7 +268,7 @@
         "Entry"
         {
         "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
-        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -280,7 +280,7 @@
         "Entry"
         {
         "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -304,7 +304,7 @@
         "Entry"
         {
         "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -316,7 +316,7 @@
         "Entry"
         {
         "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -328,13 +328,13 @@
         "Entry"
         {
         "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
-        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -364,61 +364,61 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
+        "OwnerKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_392252B203784D91A39016FC82CD5887"
+        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_B998E7FC1F540278910B0D58694455C2"
+        "OwnerKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -430,61 +430,61 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
+        "OwnerKey" = "8:_B998E7FC1F540278910B0D58694455C2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_392252B203784D91A39016FC82CD5887"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
+        "OwnerKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
+        "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
+        "OwnerKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
+        "OwnerKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -1171,6 +1171,28 @@
                     }
                 }
             }
+            "{1525181F-901A-416C-8A58-119130FE478E}:_5BEEF61E2AAB455583657C8DD5516E04"
+            {
+            "Name" = "8:#1915"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:AppDataFolder"
+                "Folders"
+                {
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_C152A4127ABE4E6589590D66607FA409"
+                    {
+                    "Name" = "8:GRNET"
+                    "AlwaysCreate" = "11:TRUE"
+                    "Condition" = "8:"
+                    "Transitive" = "11:FALSE"
+                    "Property" = "8:_74EE38C95E294AECB202AE99AF3DDDD2"
+                        "Folders"
+                        {
+                        }
+                    }
+                }
+            }
             "{1525181F-901A-416C-8A58-119130FE478E}:_6A4E9CCC3D6C43F1B145AFEEB2699167"
             {
             "Name" = "8:#1916"
diff --git a/trunk/Pithos.ShellExtensions/IoC.cs b/trunk/Pithos.ShellExtensions/IoC.cs
index 5dfeb17..39ccfce 100644
--- a/trunk/Pithos.ShellExtensions/IoC.cs
+++ b/trunk/Pithos.ShellExtensions/IoC.cs
@@ -53,7 +53,7 @@ namespace Pithos.ShellExtensions
     /// </summary>
     public class IoC
     {
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos.Extensions.IoC");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// The MEF Container
diff --git a/trunk/Pithos.ShellExtensions/Menus/FileContextMenu.cs b/trunk/Pithos.ShellExtensions/Menus/FileContextMenu.cs
index 735d1bc..5e30019 100644
--- a/trunk/Pithos.ShellExtensions/Menus/FileContextMenu.cs
+++ b/trunk/Pithos.ShellExtensions/Menus/FileContextMenu.cs
@@ -46,6 +46,7 @@ using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
@@ -58,7 +59,7 @@ namespace Pithos.ShellExtensions.Menus
     [Guid("B1F1405D-94A1-4692-B72F-FC8CAF8B8700"), ComVisible(true)]
     public class FileContextMenu : IShellExtInit, IContextMenu
     {
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos.FileContextMenu");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private const string MenuHandlername = "Pithos.FileContextMenu";
 
diff --git a/trunk/Pithos.ShellExtensions/Overlays/IconOverlayBase.cs b/trunk/Pithos.ShellExtensions/Overlays/IconOverlayBase.cs
index b1d0638..a8ac8c5 100644
--- a/trunk/Pithos.ShellExtensions/Overlays/IconOverlayBase.cs
+++ b/trunk/Pithos.ShellExtensions/Overlays/IconOverlayBase.cs
@@ -46,6 +46,7 @@ using System.IO;
 
 using System.ComponentModel.Composition;
 using System.Linq;
+using System.Reflection;
 using Microsoft.Win32;
 using Pithos.Interfaces;
 
@@ -54,7 +55,7 @@ namespace Pithos.ShellExtensions.Overlays
 
     public class IconOverlayBase : IShellIconOverlayIdentifier
     {
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos.IconOverlay");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected static string PithosPrefix = "0Pithos";
 
diff --git a/trunk/Pithos.ShellExtensions/ShellSettings.cs b/trunk/Pithos.ShellExtensions/ShellSettings.cs
index ca6b972..8e17bb7 100644
--- a/trunk/Pithos.ShellExtensions/ShellSettings.cs
+++ b/trunk/Pithos.ShellExtensions/ShellSettings.cs
@@ -41,6 +41,7 @@
 #endregion
 using System.ComponentModel.Composition;
 using System.Diagnostics;
+using System.Reflection;
 using System.ServiceModel;
 using Microsoft.Win32;
 using Pithos.Interfaces;
@@ -58,7 +59,7 @@ namespace Pithos.ShellExtensions
     [Export(typeof(IPithosSettings))]
     public class ShellSettings:IPithosSettings
     {
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos.ShellSettings");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Lazy<IPithosSettings> _settings;
         public ShellSettings()
diff --git a/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs b/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs
index 2a5afa8..9c8b219 100644
--- a/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs
+++ b/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs
@@ -40,6 +40,7 @@
  */
 #endregion
 using System.ComponentModel.Composition;
+using System.Reflection;
 using System.ServiceModel;
 using Microsoft.Win32;
 using Pithos.Interfaces;
@@ -60,7 +61,7 @@ namespace Pithos.ShellExtensions
         [Import]
         public IPithosSettings Settings { get; set; }
 
-        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos.ShellStatusChecker");
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public FileOverlayStatus GetFileOverlayStatus(string path)
         {