Simplified proxy management code

diff --git a/trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs b/trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs
index aa59f66..14f5ba8 100644 (file)
--- a/trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs
+++ b/trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs
@@ -201,37 +201,17 @@ namespace Pithos.Client.WPF.Configuration
             get { return _settings.HashingParallelism; }
             set { _settings.HashingParallelism = value; }
         }
-/*
-        public override IEnumerable<string> GetDynamicMemberNames()
-        {
-            return (from SettingsProperty property in _settings.Properties
-                        select property.Name);
-        }
-
-
-        private Lazy<ILookup<string, SettingsProperty>> _propertyNames = new Lazy<ILookup<string, SettingsProperty>>(
-            () => (from SettingsProperty property in
-                       _settings.Properties
-                   select property).ToLookup(property => property.Name));
-
-        public override bool TryGetMember(GetMemberBinder binder, out object result)
-        {
-            result = null;
-            if (!_propertyNames.Value.Contains(binder.Name))
-                return false;
-            result=_settings.Properties[binder.Name];
-            return true;
-        }
-*/
 
         public void Save()
         {
             _settings.Save();
+            Proxy.SetFromSettings(this);
         }
 
         public void Reload()
         {
             _settings.Reload();
+            Proxy.SetFromSettings(this);
         }
     }
 }

diff --git a/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
index 6a2167c..5f0892a 100644 (file)
--- a/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
+++ b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
@@ -246,6 +246,7 @@
       <DependentUpon>NewContainerView.xaml</DependentUpon>
     </Compile>
     <Compile Include="FileProperties\NewContainerViewModel.cs" />
+    <Compile Include="PithosException.cs" />
     <Compile Include="Preferences\AddAccountView.xaml.cs">
       <DependentUpon>AddAccountView.xaml</DependentUpon>
     </Compile>
@@ -259,6 +260,7 @@
       <DependentUpon>ProxyAccountView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Preferences\ProxyAccountViewModel.cs" />
+    <Compile Include="Proxy.cs" />
     <Compile Include="Shell\AboutView.xaml.cs">
       <DependentUpon>AboutView.xaml</DependentUpon>
     </Compile>

diff --git a/trunk/Pithos.Client.WPF/PithosAccount.cs b/trunk/Pithos.Client.WPF/PithosAccount.cs
index 66bfae6..36847a9 100644 (file)
--- a/trunk/Pithos.Client.WPF/PithosAccount.cs
+++ b/trunk/Pithos.Client.WPF/PithosAccount.cs
@@ -95,6 +95,7 @@ namespace Pithos.Client.WPF
             return receiveCredentials;
         }
 
+/*
         private static async Task<NetworkCredential> ListenHttpForRedirectAsync(string listenerUrl)
         {
             using (var listener = new HttpListener())
@@ -139,6 +140,7 @@ namespace Pithos.Client.WPF
                 }
             }
         }
+*/
 
         private static async Task<NetworkCredential> ListenForRedirectAsync(int port)
         {
@@ -161,7 +163,7 @@ namespace Pithos.Client.WPF
                         //This may be a common occurence 
 
                         if (String.IsNullOrWhiteSpace(request))
-                            throw new Exception("Nothing retrieved");
+                            throw new PithosException("The server did send any information");
                         Log.InfoFormat("[RETRIEVE] Got Connection {0}", request);
 
 
@@ -174,7 +176,7 @@ namespace Pithos.Client.WPF
                         {
                             Respond(stream, "Failure", "The server did not return a username or token");
                             Log.ErrorFormat("[RETRIEVE] No credentials returned by server");
-                            throw new Exception("The server did not return a username or token");
+                            throw new PithosException("The server did not return a username or token");
                         }
                         else
                         {
@@ -188,7 +190,7 @@ namespace Pithos.Client.WPF
             catch (Exception exc)
             {
                 Log.Error("[RETRIEVE][ERROR] Receive connection {0}", exc);
-                throw;
+                throw new PithosException("An error occured while retrieving credentials",exc);
             }
         }
 

diff --git a/trunk/Pithos.Client.WPF/PithosException.cs b/trunk/Pithos.Client.WPF/PithosException.cs
new file mode 100644 (file)
index 0000000..94022fe
--- /dev/null
+++ b/trunk/Pithos.Client.WPF/PithosException.cs
@@ -0,0 +1,34 @@
+// -----------------------------------------------------------------------
+// <copyright file="PithosException.cs" company="Microsoft">
+// TODO: Update copyright text.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Pithos.Client.WPF
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+
+    /// <summary>
+    /// TODO: Update summary.
+    /// </summary>
+    public class PithosException:Exception
+    {
+        public PithosException(){}
+
+        public PithosException(string message)
+            :base(message)
+        {
+            
+        }
+
+        public PithosException(string message,Exception innerException)
+            :base(message,innerException)
+        {
+            
+        }
+
+    }    
+}

diff --git a/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
index 24503a7..ceba974 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs
@@ -163,6 +163,11 @@ namespace Pithos.Client.WPF.Preferences
 
                 IsConfirmed = true;
             }
+            catch (PithosException exc)
+            {
+                ClearBusy();
+                MessageBox.Show(exc.Message, "Unable to retrieve credentials");
+            }
             catch (Exception exc)
             {
                 IsConfirmed = false;
@@ -258,14 +263,12 @@ namespace Pithos.Client.WPF.Preferences
             
         }
 
-        public WebProxy Proxy { get; set; }
-
         public async void TestAccount()
         {
             try
             {
                 SetBusy("Validating Credentials", "");
-                var client = new CloudFilesClient(AccountName, Token) { AuthenticationUrl = CurrentServer,Proxy=Proxy };                
+                var client = new CloudFilesClient(AccountName, Token) { AuthenticationUrl = CurrentServer,/*Proxy=Proxy */};                
                 var containers = await TaskEx.Run(() =>
                                                       {
                                                           client.Authenticate();

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index e919285..f53d1f6 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -149,13 +149,14 @@
                 </TabItem.Header>
                     <Grid Margin="10,5">
                         <RadioButton Name="Settings_UseDefaultProxy" Content="Use System Defaults" Margin="5,6,5,0" Height="16" VerticalAlignment="Top"/>
-                        <RadioButton Name="Settings_UseManualProxy" Content="Manual" Margin="5,28,5,0" Height="16" VerticalAlignment="Top"/>
-                        <Label Content="Server" Height="28" HorizontalAlignment="Left" Margin="5,47,0,0" Name="label2" VerticalAlignment="Top" />
-                        <TextBox Height="23" HorizontalAlignment="Left" Margin="76,51,0,0" Name="Settings_ProxyServer" VerticalAlignment="Top" Width="162" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>
-                        <TextBlock Height="23" HorizontalAlignment="Left" Margin="244,51,0,0" Name="textBlock1" Text=":" VerticalAlignment="Top" />
-                        <TextBox Height="23" HorizontalAlignment="Left" Margin="254,51,0,0" Name="Settings_ProxyPort" VerticalAlignment="Top" Width="65" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>
+                    <RadioButton Name="Settings_UseNoProxy" Content="No Proxy" Margin="5,25,5,0" Height="16" VerticalAlignment="Top"/>
+                    <RadioButton Name="Settings_UseManualProxy" Content="Manual" Margin="5,44,5,0" Height="16" VerticalAlignment="Top"/>
+                        <Label Content="Server" Height="28" HorizontalAlignment="Left" Margin="5,63,0,0" Name="label2" VerticalAlignment="Top" />
+                        <TextBox Height="23" HorizontalAlignment="Left" Margin="76,67,0,0" Name="Settings_ProxyServer" VerticalAlignment="Top" Width="162" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>
+                        <TextBlock Height="23" HorizontalAlignment="Left" Margin="244,67,0,0" Name="textBlock1" Text=":" VerticalAlignment="Top" />
+                        <TextBox Height="23" HorizontalAlignment="Left" Margin="254,67,0,0" Name="Settings_ProxyPort" VerticalAlignment="Top" Width="65" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>
 
-                        <GroupBox Height="109" HorizontalAlignment="Left" Margin="5,80,0,0" Name="groupBox2" VerticalAlignment="Top" Width="373" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}">
+                        <GroupBox Height="109" HorizontalAlignment="Left" Margin="5,96,0,0" Name="groupBox2" VerticalAlignment="Top" Width="373" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}">
                             <GroupBox.Header>
                                 <CheckBox Content="Proxy requires authentication" Height="16" VerticalAlignment="Top" Name="Settings_ProxyAuthentication" />
                             </GroupBox.Header>

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 10a18d0..89c8726 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -195,8 +195,7 @@ namespace Pithos.Client.WPF.Preferences
         private void DoSave()
         {
             Settings.Save();
-            //SetStartupMode();
-
+            //SetStartupMode();            
 
             foreach (var account in Settings.Accounts)
             {                                
@@ -231,29 +230,11 @@ namespace Pithos.Client.WPF.Preferences
         }
 */
 
-        private WebProxy ProxyFromSettings()
-        {
-            if (Settings.UseManualProxy)
-            {
-                var proxy = new WebProxy(Settings.ProxyServer, Settings.ProxyPort);
-                //If the proxy requires specific authentication settings, use them
-                if (Settings.ProxyAuthentication)
-                {
-                    proxy.Credentials = new NetworkCredential(Settings.ProxyUsername, Settings.ProxyPassword, Settings.ProxyDomain);
-                }
-                //Otherwise, if there are generic authentication settings, use them
-                if (!String.IsNullOrWhiteSpace(CredentialCache.DefaultNetworkCredentials.UserName))
-                {
-                    proxy.Credentials = CredentialCache.DefaultNetworkCredentials;
-                }
-                return proxy;
-            }
-            return null;
-        }
+        
 
        public void AddAccount()
        {
-           var wizard = new AddAccountViewModel {Proxy = ProxyFromSettings()};
+           var wizard = new AddAccountViewModel();
            if (_windowManager.ShowDialog(wizard) == true)
            {
                string selectedPath = wizard.AccountPath;

diff --git a/trunk/Pithos.Client.WPF/Preferences/ProxyAccountView.xaml b/trunk/Pithos.Client.WPF/Preferences/ProxyAccountView.xaml
index 9c52518..bcfb2bb 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/ProxyAccountView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/ProxyAccountView.xaml
@@ -1,7 +1,8 @@
 <Window x:Class="Pithos.Client.WPF.Preferences.ProxyAccountView"\r
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
-        xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters" Title="ProxyAccountView" Height="300" Width="400" Topmost="True">\r
+        xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters" Title="ProxyAccountView" \r
+        Height="220" Width="400" Topmost="True">\r
     <Window.Resources>\r
         <ResourceDictionary>\r
             <ResourceDictionary.MergedDictionaries>\r
@@ -14,54 +15,34 @@
         <Grid.RowDefinitions>\r
             <RowDefinition Height="Auto"/>\r
             <RowDefinition Height="Auto"/>\r
-            <RowDefinition Height="Auto"/>\r
             <RowDefinition/>\r
             <RowDefinition Height="Auto"/>\r
         </Grid.RowDefinitions>\r
         <Grid.ColumnDefinitions>\r
-            <ColumnDefinition Width="Auto"/>\r
-            <ColumnDefinition />\r
+            <ColumnDefinition Width="*"/>\r
         </Grid.ColumnDefinitions>\r
-        <RadioButton Name="Settings_UseDefaultProxy" Content="Use System Defaults" Margin="5,6,5,0" Height="16" VerticalAlignment="Top"/>\r
-        <RadioButton Name="Settings_UseManualProxy" Content="Manual" Margin="5,28,5,0" Height="16" VerticalAlignment="Top"/>\r
-        <Label Content="Server" Height="28" HorizontalAlignment="Left" Margin="5,47,0,0" Name="label2" VerticalAlignment="Top" />\r
-        <TextBox Height="23" HorizontalAlignment="Left" Margin="76,51,0,0" Name="Settings_ProxyServer" VerticalAlignment="Top" Width="162" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>\r
-        <TextBlock Height="23" HorizontalAlignment="Left" Margin="244,51,0,0" Name="textBlock1" Text=":" VerticalAlignment="Top" />\r
-        <TextBox Height="23" HorizontalAlignment="Left" Margin="254,51,0,0" Name="Settings_ProxyPort" VerticalAlignment="Top" Width="65" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}"/>\r
+        <TextBlock Grid.Row="0"  Margin="5">Your Proxy server requires authentication</TextBlock>\r
 \r
-        <GroupBox Height="109" HorizontalAlignment="Left" Margin="5,80,0,0" Name="groupBox2" VerticalAlignment="Top" Width="373" IsEnabled="{Binding ElementName=Settings_UseManualProxy, Path=IsChecked}">\r
-            <GroupBox.Header>\r
-                <CheckBox Content="Proxy requires authentication" Height="16" VerticalAlignment="Top" Name="Settings_ProxyAuthentication" />\r
-            </GroupBox.Header>\r
-            <Grid >\r
+            <Grid Grid.Row="1"  Margin="5,10">\r
                 <Grid.RowDefinitions>\r
                     <RowDefinition/>\r
                     <RowDefinition/>\r
                     <RowDefinition/>\r
                 </Grid.RowDefinitions>\r
                 <Grid.ColumnDefinitions>\r
-                    <ColumnDefinition/>\r
+                    <ColumnDefinition Width="Auto"/>\r
                     <ColumnDefinition/>\r
                 </Grid.ColumnDefinitions>\r
                 <Label Content="Username" Height="28" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" />\r
                 <Label Content="Password" Height="28" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" />\r
                 <Label Content="Domain" Height="28" HorizontalAlignment="Left" Grid.Row="2" Grid.Column="0"  VerticalAlignment="Top" />\r
-                <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="1" Name="Settings_ProxyUsername" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
-                <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="1" Name="Settings_ProxyPassword" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
-                <TextBox Height="23" HorizontalAlignment="Left" Grid.Row="2" Grid.Column="1" Name="Settings_ProxyDomain" VerticalAlignment="Top" Width="157" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
+                <TextBox Height="23" Margin="10,5"  HorizontalAlignment="Stretch" Grid.Row="0" Grid.Column="1" Name="Settings_ProxyUsername" VerticalAlignment="Top" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
+            <TextBox Height="23" Margin="10,5" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="1" Name="Settings_ProxyPassword" VerticalAlignment="Top"  IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
+            <TextBox Height="23" Margin="10,5" HorizontalAlignment="Stretch" Grid.Row="2" Grid.Column="1" Name="Settings_ProxyDomain" VerticalAlignment="Top" IsEnabled="{Binding IsChecked,ElementName=Settings_ProxyAuthentication}"/>\r
             </Grid>\r
-        </GroupBox>\r
     \r
 \r
-<!--\r
-    <TextBlock Text="UserName" Grid.Row="0" Grid.Column="0" Margin="5"/>\r
-            <TextBox x:Name="UserName" Grid.Row="0" Grid.Column="1" Margin="5"/>\r
-            <TextBlock Text="Password" Grid.Row="1" Grid.Column="0" Margin="5"/>\r
-            <TextBox x:Name="Password" Grid.Row="1" Grid.Column="1" Margin="5"/>\r
-            <TextBlock Text="Domain" Grid.Row="2" Grid.Column="0" Margin="5"/>\r
-            <TextBox x:Name="Domain" Grid.Row="2" Grid.Column="1" Margin="5"/>\r
--->\r
-        <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Bottom">\r
+        <StackPanel Orientation="Horizontal" Grid.Row="3"  HorizontalAlignment="Right" VerticalAlignment="Bottom">\r
             <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}"/>\r
             <Button Name="RejectChanges" Content="Cancel" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}"/>\r
         </StackPanel>\r

diff --git a/trunk/Pithos.Client.WPF/Preferences/ProxyAccountViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/ProxyAccountViewModel.cs
index e40b991..b47996f 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/ProxyAccountViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/ProxyAccountViewModel.cs
@@ -71,22 +71,19 @@ namespace Pithos.Client.WPF.Preferences
             set\r
             {\r
                 _settings = value;\r
-                NotifyOfPropertyChange(()=>Settings);\r
+                UserName = _settings.ProxyUsername;\r
+                Password = _settings.ProxyPassword;\r
+                Domain = _settings.ProxyDomain;\r
+                NotifyOfPropertyChange(() => Settings);\r
             }\r
         }\r
 \r
         private PithosSettings _settings;\r
 \r
-        public ProxyAccountViewModel(PithosSettings settings)\r
-        {\r
-            if (settings == null)\r
-                throw new ArgumentNullException("settings");\r
-            Contract.EndContractBlock();\r
 \r
-            Settings = settings;\r
-            UserName = Settings.ProxyUsername;\r
-            Password = Settings.ProxyPassword;\r
-            Domain = Settings.ProxyDomain;\r
+        public ProxyAccountViewModel()\r
+        {\r
+            \r
         }\r
 \r
         public void SaveChanges()\r
@@ -100,10 +97,7 @@ namespace Pithos.Client.WPF.Preferences
             Settings.UseNoProxy = false;\r
             Settings.ProxyAuthentication = true;\r
 */\r
-            Settings.Save();\r
-            CredentialCache.DefaultNetworkCredentials.Password = Settings.ProxyPassword;\r
-            CredentialCache.DefaultNetworkCredentials.UserName = Settings.ProxyUsername;\r
-            CredentialCache.DefaultNetworkCredentials.Domain= Settings.ProxyDomain;\r
+            Proxy.SetCredentials(Settings.ProxyUsername, Settings.ProxyPassword, Settings.ProxyDomain);\r
             this.TryClose(true);            \r
         }\r
 \r

diff --git a/trunk/Pithos.Client.WPF/Proxy.cs b/trunk/Pithos.Client.WPF/Proxy.cs
new file mode 100644 (file)
index 0000000..e5caa13
--- /dev/null
+++ b/trunk/Pithos.Client.WPF/Proxy.cs
@@ -0,0 +1,62 @@
+// -----------------------------------------------------------------------
+// <copyright file="Proxy.cs" company="Microsoft">
+// TODO: Update copyright text.
+// </copyright>
+// -----------------------------------------------------------------------
+
+using System.Net;
+using Pithos.Interfaces;
+
+namespace Pithos.Client.WPF
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+
+    /// <summary>
+    /// TODO: Update summary.
+    /// </summary>
+    public class Proxy
+    {
+        //or the proxy changes, not when the monitor starts
+        public static void SetFromSettings(IPithosSettings pithosSettings)
+        {
+            IWebProxy proxy;
+            if (pithosSettings.UseNoProxy)
+            {
+                proxy = null;
+            }
+            else if (pithosSettings.UseManualProxy)
+            {
+                proxy = new WebProxy(pithosSettings.ProxyServer, pithosSettings.ProxyPort);
+                //If the proxy requires specific authentication settings, use them
+                if (pithosSettings.ProxyAuthentication)
+                {
+                    proxy.Credentials = new NetworkCredential(pithosSettings.ProxyUsername, pithosSettings.ProxyPassword, pithosSettings.ProxyDomain);
+                }
+                //Otherwise, if there are generic authentication settings, use them
+                if (!String.IsNullOrWhiteSpace(CredentialCache.DefaultNetworkCredentials.UserName))
+                {
+                    proxy.Credentials = CredentialCache.DefaultNetworkCredentials;
+                }
+            }
+            //In all other cases, use the default proxy
+            else 
+            {
+                proxy = WebRequest.GetSystemWebProxy();
+            }
+            WebRequest.DefaultWebProxy = proxy;
+        }
+
+
+        public static void SetCredentials(string proxyUsername, string proxyPassword, string proxyDomain)
+        {
+            CredentialCache.DefaultNetworkCredentials.Password = proxyPassword;
+            CredentialCache.DefaultNetworkCredentials.UserName = proxyUsername;
+            CredentialCache.DefaultNetworkCredentials.Domain = proxyDomain;
+            if (WebRequest.DefaultWebProxy!=null)
+                WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultNetworkCredentials;
+        }
+    }
+}

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 9240989..b1958fc 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -104,6 +104,8 @@ namespace Pithos.Client.WPF {
 
                                Settings = settings;
 
+                Proxy.SetFromSettings(settings);
+
                                StatusMessage = "In Synch";
 
                 _fileVersion=  new Lazy<FileVersionInfo>(() =>
@@ -131,10 +133,13 @@ namespace Pithos.Client.WPF {
                {
                        base.OnActivate();
 
+            
+
                        StartMonitoring();                    
                }
 
 
+
                private async void StartMonitoring()
                {
                        try
@@ -558,14 +563,13 @@ namespace Pithos.Client.WPF {
            private void TryAuthenticateProxy(PithosMonitor monitor,int retries)
            {
                Execute.OnUIThread(() =>
-                                      {
-                                          var proxyAccount = new ProxyAccountViewModel(this.Settings);
-                                          if (true == _windowManager.ShowDialog(proxyAccount))
-                                          {
-                                           
-                                              StartMonitor(monitor, retries);
-                                              NotifyOfPropertyChange(() => Accounts);
-                                          }
+                                      {                                       
+                                          var proxyAccount = IoC.Get<ProxyAccountViewModel>();
+                                        proxyAccount.Settings = this.Settings;
+                                          if (true != _windowManager.ShowDialog(proxyAccount)) 
+                                           return;
+                                          StartMonitor(monitor, retries);
+                                          NotifyOfPropertyChange(() => Accounts);
                                       });
            }
 

diff --git a/trunk/Pithos.Core/Agents/NetworkAgent.cs b/trunk/Pithos.Core/Agents/NetworkAgent.cs
index 10ff255..72ae3c5 100644 (file)
--- a/trunk/Pithos.Core/Agents/NetworkAgent.cs
+++ b/trunk/Pithos.Core/Agents/NetworkAgent.cs
@@ -35,6 +35,9 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+//TODO: Now there is a UUID tag. This can be used for renames/moves
+
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -408,10 +411,7 @@ namespace Pithos.Core.Agents
                 await _deleteAgent.PauseEvent.WaitAsync();
 
                 Log.Info("Scheduled");
-                var client = new CloudFilesClient(accountInfo)
-                                 {
-                                     Proxy = PithosMonitor.ProxyFromSettings(this.Settings)
-                                 };
+                var client = new CloudFilesClient(accountInfo);
 
                 var containers = client.ListContainers(accountInfo.UserName);
 

diff --git a/trunk/Pithos.Core/PithosMonitor.cs b/trunk/Pithos.Core/PithosMonitor.cs
index 1fa7807..7a01c0c 100644 (file)
--- a/trunk/Pithos.Core/PithosMonitor.cs
+++ b/trunk/Pithos.Core/PithosMonitor.cs
@@ -171,8 +171,6 @@ namespace Pithos.Core
             
 
             CloudClient=new CloudFilesClient(UserName,ApiKey);
-            var proxy = ProxyFromSettings(Settings);            
-            CloudClient.Proxy = proxy;
             CloudClient.UsePithos = true;
             CloudClient.AuthenticationUrl = this.AuthenticationUrl;            
 
@@ -227,27 +225,6 @@ namespace Pithos.Core
 
         public string AuthenticationUrl { get; set; }
 
-        //TODO: Move this method somewhere else
-        public static WebProxy ProxyFromSettings(IPithosSettings pithosSettings)
-        {            
-            if (pithosSettings.UseManualProxy)
-            {
-                var proxy = new WebProxy(pithosSettings.ProxyServer, pithosSettings.ProxyPort);
-                //If the proxy requires specific authentication settings, use them
-                if (pithosSettings.ProxyAuthentication)
-                {
-                    proxy.Credentials=new NetworkCredential(pithosSettings.ProxyUsername,pithosSettings.ProxyPassword,pithosSettings.ProxyDomain);
-                }
-                    //Otherwise, if there are generic authentication settings, use them
-                if (!String.IsNullOrWhiteSpace(CredentialCache.DefaultNetworkCredentials.UserName))
-                {
-                    proxy.Credentials = CredentialCache.DefaultNetworkCredentials;
-                }
-                return proxy;
-            }
-            return null;
-        }
-
         private void IndexLocalFiles()
         {
             StatusNotification.NotifyChange("Indexing Local Files",TraceLevel.Info);

diff --git a/trunk/Pithos.Network/CloudFilesClient.cs b/trunk/Pithos.Network/CloudFilesClient.cs
index 30c7644..de253c0 100644 (file)
--- a/trunk/Pithos.Network/CloudFilesClient.cs
+++ b/trunk/Pithos.Network/CloudFilesClient.cs
@@ -93,7 +93,7 @@ namespace Pithos.Network
 
         protected Uri RootAddressUri { get; set; }
 
-        private WebProxy _proxy;
+       /* private WebProxy _proxy;
         public WebProxy Proxy
         {
             get { return _proxy; }
@@ -104,7 +104,7 @@ namespace Pithos.Network
                     _baseClient.Proxy = value;                
             }
         }
-
+*/
 
         /* private Uri _proxy;
         public Uri Proxy
@@ -189,8 +189,8 @@ namespace Pithos.Network
 
             using (var authClient = new RestClient{BaseAddress=AuthenticationUrl})
             {                
-                if (Proxy != null)
-                    authClient.Proxy = Proxy;
+               /* if (Proxy != null)
+                    authClient.Proxy = Proxy;*/
 
                 Contract.Assume(authClient.Headers!=null);
 
@@ -210,7 +210,7 @@ namespace Pithos.Network
                     BaseAddress = storageUrl,
                     Timeout = 10000,
                     Retries = 3,
-                    Proxy=Proxy
+                    //Proxy=Proxy
                 };
 
                 StorageUrl = new Uri(storageUrl);

diff --git a/trunk/Pithos.Network/ICloudClient.cs b/trunk/Pithos.Network/ICloudClient.cs
index 070468b..251ab37 100644 (file)
--- a/trunk/Pithos.Network/ICloudClient.cs
+++ b/trunk/Pithos.Network/ICloudClient.cs
@@ -19,7 +19,7 @@ namespace Pithos.Network
 
         bool UsePithos { get; set; }
         AccountInfo Authenticate();
-        WebProxy Proxy { get; set; }
+        //WebProxy Proxy { get; set; }
         double DownloadPercentLimit { get; set; }
         double UploadPercentLimit { get; set; }
         string AuthenticationUrl { get; set; }
@@ -75,8 +75,7 @@ namespace Pithos.Network
         public string UserName { get; set; }
         public Uri StorageUrl { get; set; }
         public string Token { get; set; }
-
-        public WebProxy Proxy { get; set; }
+        
         public double DownloadPercentLimit { get; set; }
         public double UploadPercentLimit { get; set; }
 

diff --git a/trunk/Pithos.Network/Signature.cs b/trunk/Pithos.Network/Signature.cs
index fdfe011..164f2fa 100644 (file)
--- a/trunk/Pithos.Network/Signature.cs
+++ b/trunk/Pithos.Network/Signature.cs
@@ -5,7 +5,6 @@ using System.Diagnostics.Contracts;
 using System.IO;
 using System.Runtime.Remoting.Metadata.W3cXsd2001;
 using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
 using System.Linq;
 
@@ -210,51 +209,11 @@ namespace Pithos.Network
                         newHashes[step] = finalHash;
                     }
                 });
-/*
-            Parallel.For(0, leafs/2,
-                () => HashAlgorithm.Create(algorithm),
-                (step, state, hasher) =>
-                {
-                                 
-                    var i = step*2;
-                    var block1 = i <= hashCount - 1 ? hashMap[i]: empty;
-                    var block2 = i <= hashCount - 2 ? hashMap[i + 1] : empty;
-
-                    hasher.TransformBlock(block1, 0, block1.Length, null, 0);
-                    hasher.TransformFinalBlock(block2, 0, block2.Length);
-                    
-                    var finalHash = hasher.Hash;
-                    //Store the final value in its proper place
-                    newHashes[step] = finalHash;
-                                        
-                    return hasher;
-                },
-                hasher => hasher.Dispose());
-*/
+
             //Extract the hashes to a list ordered by their step 
             var hashes = newHashes.OrderBy(pair => pair.Key).Select(pair => pair.Value).ToList();
             return CalculateTopHash(hashes, algorithm);                   
-        }
-
-        
-
-      /*  public static string CalculateTopHash(string hashString, string algorithm)
-        {
-            if (String.IsNullOrWhiteSpace(algorithm))
-                throw new ArgumentNullException("algorithm");
-            Contract.EndContractBlock();
-            if (String.IsNullOrWhiteSpace(hashString))
-                return String.Empty;
-
-            using (var hasher = HashAlgorithm.Create(algorithm))
-            {
-                var bytes=Encoding.ASCII.GetBytes(hashString.ToLower());
-                var hash=hasher.ComputeHash(bytes);
-                return hash.ToHashString();
-            }
-        }*/
-
-
+        }        
     
 
         public static byte[] CalculateHash(byte[] buffer,string algorithm)

diff --git a/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
index 2277cc6..561813f 100644 (file)
--- a/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
+++ b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
@@ -15,342 +15,348 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_00C78A0AE638245667A5681AAAA0F51F"
-        "OwnerKey" = "8:_C19B1A60C99103E4AB0CB34FBD46A86E"
+        "MsmKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_392252B203784D91A39016FC82CD5887"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_00C78A0AE638245667A5681AAAA0F51F"
+        "MsmKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_00C78A0AE638245667A5681AAAA0F51F"
-        "OwnerKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "MsmKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_00C78A0AE638245667A5681AAAA0F51F"
+        "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_0736FE37D25828806DF384EDC4B3D32B"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_0736FE37D25828806DF384EDC4B3D32B"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_12F390B80DE8E9BA050029362F21B586"
+        "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_13807DF64A18092E2104382D6350B99E"
-        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_13807DF64A18092E2104382D6350B99E"
-        "OwnerKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_13807DF64A18092E2104382D6350B99E"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_13807DF64A18092E2104382D6350B99E"
+        "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "MsmKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_34ADFE0811EB2D9499F60B369E3485B1"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_34ADFE0811EB2D9499F60B369E3485B1"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4C5FCC22F28C07C66077388307617AE7"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4C5FCC22F28C07C66077388307617AE7"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_50962F5953A9C1BD89C34A84D71A156F"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_50962F5953A9C1BD89C34A84D71A156F"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_51F776D6CADE12D9CF455A8572C50A90"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_90E897E68BA5452CBEC4A01C45B58AC7"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_51F776D6CADE12D9CF455A8572C50A90"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
+        "OwnerKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5907BDFBCCD9996878A22FB928EC136D"
+        "MsmKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5A954DFDECEA1772693C525449B45377"
-        "OwnerKey" = "8:_94AF0407772DC0469EA5A27F079132FE"
+        "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
+        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5A954DFDECEA1772693C525449B45377"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5BDDF78B8F57F5F0C86B681FC536679D"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5BDDF78B8F57F5F0C86B681FC536679D"
-        "OwnerKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "MsmKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5BDDF78B8F57F5F0C86B681FC536679D"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
-        "OwnerKey" = "8:_50962F5953A9C1BD89C34A84D71A156F"
+        "MsmKey" = "8:_B49160FDF21C82F60E2F28FF690673F7"
+        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_B998E7FC1F540278910B0D58694455C2"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
+        "MsmKey" = "8:_B998E7FC1F540278910B0D58694455C2"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
-        "OwnerKey" = "8:_0736FE37D25828806DF384EDC4B3D32B"
+        "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
+        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_90E897E68BA5452CBEC4A01C45B58AC7"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
+        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_94AF0407772DC0469EA5A27F079132FE"
-        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmKey" = "8:_CA9290C6891140349781FA66336D9693"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C19B1A60C99103E4AB0CB34FBD46A86E"
-        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "MsmKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C19B1A60C99103E4AB0CB34FBD46A86E"
+        "MsmKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C19B1A60C99103E4AB0CB34FBD46A86E"
-        "OwnerKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C19B1A60C99103E4AB0CB34FBD46A86E"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_CA9290C6891140349781FA66336D9693"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_CCAE7818C895B517369F69B2359B7A13"
-        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "MsmKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
+        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D53346F14784BE6C73E9FB150C13B3AB"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D53346F14784BE6C73E9FB150C13B3AB"
+        "MsmKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D53346F14784BE6C73E9FB150C13B3AB"
-        "OwnerKey" = "8:_0736FE37D25828806DF384EDC4B3D32B"
+        "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D53346F14784BE6C73E9FB150C13B3AB"
-        "OwnerKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
+        "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D90F384DDD0DCD7EF3877F70303E7A5E"
-        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D90F384DDD0DCD7EF3877F70303E7A5E"
-        "OwnerKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "MsmKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D90F384DDD0DCD7EF3877F70303E7A5E"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D90F384DDD0DCD7EF3877F70303E7A5E"
+        "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E95A76F4D8A3B3ED01B4FACB84A7A0CD"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E95A76F4D8A3B3ED01B4FACB84A7A0CD"
+        "MsmKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E95A76F4D8A3B3ED01B4FACB84A7A0CD"
-        "OwnerKey" = "8:_50962F5953A9C1BD89C34A84D71A156F"
+        "MsmKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "MsmKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
@@ -364,121 +370,121 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_21830C08E62142E089908EA0AA2FBF19"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_3455E6F41DFDCA75B1C8BAD894A467F2"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_34ADFE0811EB2D9499F60B369E3485B1"
+        "OwnerKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4C5FCC22F28C07C66077388307617AE7"
+        "OwnerKey" = "8:_71EDC030F43F0D5A22D833BE7229E576"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_F3FE5091AA4BA657DF9F9258B6344D85"
+        "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_0736FE37D25828806DF384EDC4B3D32B"
+        "OwnerKey" = "8:_FBB2F726C4025B9184DFBD2748E15EBE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_50962F5953A9C1BD89C34A84D71A156F"
+        "OwnerKey" = "8:_DD69E9C0F36E10A97EB92CFBAFD2662D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7F0CEA3459356C2FB8451101EFCE55D9"
+        "OwnerKey" = "8:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D53346F14784BE6C73E9FB150C13B3AB"
+        "OwnerKey" = "8:_DD70D5956F2E708F680AF121870FFCCD"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E95A76F4D8A3B3ED01B4FACB84A7A0CD"
+        "OwnerKey" = "8:_F472AA6700476700D62AABE8262628BF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_51F776D6CADE12D9CF455A8572C50A90"
+        "OwnerKey" = "8:_B998E7FC1F540278910B0D58694455C2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5907BDFBCCD9996878A22FB928EC136D"
+        "OwnerKey" = "8:_392252B203784D91A39016FC82CD5887"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_12F390B80DE8E9BA050029362F21B586"
+        "OwnerKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5BDDF78B8F57F5F0C86B681FC536679D"
+        "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_94AF0407772DC0469EA5A27F079132FE"
+        "OwnerKey" = "8:_6BC141E8128E964AD9B9281537E64BEA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5A954DFDECEA1772693C525449B45377"
+        "OwnerKey" = "8:_91EEC8BDF3543C1C3379FB93171A844E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C19B1A60C99103E4AB0CB34FBD46A86E"
+        "OwnerKey" = "8:_E46F39A63288379E63BDD76C9F21CC3E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_00C78A0AE638245667A5681AAAA0F51F"
+        "OwnerKey" = "8:_C7EE41E4C982C8217BD7DCDA76836670"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_13807DF64A18092E2104382D6350B99E"
+        "OwnerKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D90F384DDD0DCD7EF3877F70303E7A5E"
+        "OwnerKey" = "8:_A490E069DF5DE5852575B6E157EB50BE"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -586,20 +592,20 @@
         }
         "File"
         {
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_00C78A0AE638245667A5681AAAA0F51F"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_392252B203784D91A39016FC82CD5887"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b9a188c8922137c6, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:WPFToolkit.Extended, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_00C78A0AE638245667A5681AAAA0F51F"
+                    "_392252B203784D91A39016FC82CD5887"
                     {
-                    "Name" = "8:Newtonsoft.Json.dll"
+                    "Name" = "8:WPFToolkit.Extended.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Newtonsoft.Json.dll"
+            "SourcePath" = "8:WPFToolkit.Extended.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -617,20 +623,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0736FE37D25828806DF384EDC4B3D32B"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4C5B93BC82FE5E63E01458A8DA46B4D6"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:NHibernate.Search, Version=0.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Castle.ActiveRecord, Version=3.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_0736FE37D25828806DF384EDC4B3D32B"
+                    "_4C5B93BC82FE5E63E01458A8DA46B4D6"
                     {
-                    "Name" = "8:NHibernate.Search.dll"
+                    "Name" = "8:Castle.ActiveRecord.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:NHibernate.Search.dll"
+            "SourcePath" = "8:Castle.ActiveRecord.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -648,20 +654,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_12F390B80DE8E9BA050029362F21B586"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_586310F986FB0DB4F49D3EAFBD87760C"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Hardcodet.Wpf.TaskbarNotification, Version=1.0.4.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_12F390B80DE8E9BA050029362F21B586"
+                    "_586310F986FB0DB4F49D3EAFBD87760C"
                     {
-                    "Name" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
+                    "Name" = "8:log4net.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
+            "SourcePath" = "8:log4net.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -679,20 +685,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_13807DF64A18092E2104382D6350B99E"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5B7E11B508E123A2BA4C11623DA3E029"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Dataflow, Version=0.0.4098.29463, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_13807DF64A18092E2104382D6350B99E"
+                    "_5B7E11B508E123A2BA4C11623DA3E029"
                     {
-                    "Name" = "8:log4net.dll"
+                    "Name" = "8:System.Threading.Tasks.Dataflow.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:log4net.dll"
+            "SourcePath" = "8:System.Threading.Tasks.Dataflow.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -710,20 +716,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_21830C08E62142E089908EA0AA2FBF19"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_626ECD9012C5D7BD4388B6BE07F5107D"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Pithos.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_21830C08E62142E089908EA0AA2FBF19"
+                    "_626ECD9012C5D7BD4388B6BE07F5107D"
                     {
-                    "Name" = "8:Pithos.Core.dll"
+                    "Name" = "8:ParallelExtensionsExtras.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Pithos.Core.dll"
+            "SourcePath" = "8:ParallelExtensionsExtras.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -741,20 +747,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3455E6F41DFDCA75B1C8BAD894A467F2"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6BC141E8128E964AD9B9281537E64BEA"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Pithos.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Caliburn.Micro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_3455E6F41DFDCA75B1C8BAD894A467F2"
+                    "_6BC141E8128E964AD9B9281537E64BEA"
                     {
-                    "Name" = "8:Pithos.Network.dll"
+                    "Name" = "8:Caliburn.Micro.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Pithos.Network.dll"
+            "SourcePath" = "8:Caliburn.Micro.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -772,20 +778,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_34ADFE0811EB2D9499F60B369E3485B1"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_71EDC030F43F0D5A22D833BE7229E576"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Dataflow, Version=0.0.4098.29463, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.76.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_34ADFE0811EB2D9499F60B369E3485B1"
+                    "_71EDC030F43F0D5A22D833BE7229E576"
                     {
-                    "Name" = "8:System.Threading.Tasks.Dataflow.dll"
+                    "Name" = "8:System.Data.SQLite.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:System.Threading.Tasks.Dataflow.dll"
+            "SourcePath" = "8:System.Data.SQLite.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -803,20 +809,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4C5FCC22F28C07C66077388307617AE7"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.76.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:NHibernate, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_4C5FCC22F28C07C66077388307617AE7"
+                    "_89E3F50B2C3DDF59B632A4BEFEE3D3A1"
                     {
-                    "Name" = "8:System.Data.SQLite.dll"
+                    "Name" = "8:NHibernate.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:System.Data.SQLite.dll"
+            "SourcePath" = "8:NHibernate.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -834,20 +840,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_50962F5953A9C1BD89C34A84D71A156F"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91EEC8BDF3543C1C3379FB93171A844E"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:NHibernate.ByteCode.Castle, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_50962F5953A9C1BD89C34A84D71A156F"
+                    "_91EEC8BDF3543C1C3379FB93171A844E"
                     {
-                    "Name" = "8:NHibernate.ByteCode.Castle.dll"
+                    "Name" = "8:System.Windows.Interactivity.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:NHibernate.ByteCode.Castle.dll"
+            "SourcePath" = "8:System.Windows.Interactivity.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -865,20 +871,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_51F776D6CADE12D9CF455A8572C50A90"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A490E069DF5DE5852575B6E157EB50BE"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Castle.Components.Validator, Version=2.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:AsyncCtpLibrary, Version=1.0.4107.18181, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_51F776D6CADE12D9CF455A8572C50A90"
+                    "_A490E069DF5DE5852575B6E157EB50BE"
                     {
-                    "Name" = "8:Castle.Components.Validator.dll"
+                    "Name" = "8:AsyncCtpLibrary.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Castle.Components.Validator.dll"
+            "SourcePath" = "8:AsyncCtpLibrary.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -896,20 +902,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5907BDFBCCD9996878A22FB928EC136D"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A611766CD2793378FFAB2F3063F81496"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:WPFToolkit.Extended, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Pithos.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_5907BDFBCCD9996878A22FB928EC136D"
+                    "_A611766CD2793378FFAB2F3063F81496"
                     {
-                    "Name" = "8:WPFToolkit.Extended.dll"
+                    "Name" = "8:Pithos.Core.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:WPFToolkit.Extended.dll"
+            "SourcePath" = "8:Pithos.Core.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -927,21 +933,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5A954DFDECEA1772693C525449B45377"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B49160FDF21C82F60E2F28FF690673F7"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_5A954DFDECEA1772693C525449B45377"
-                    {
-                    "Name" = "8:System.Windows.Interactivity.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:System.Windows.Interactivity.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:Pithos.ShellExtensions.tlb"
+            "TargetName" = "8:Pithos.ShellExtensions.tlb"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
             "Condition" = "8:"
@@ -953,25 +948,25 @@
             "Permanent" = "11:FALSE"
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
-            "Register" = "3:1"
+            "Register" = "3:2"
             "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5BDDF78B8F57F5F0C86B681FC536679D"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B998E7FC1F540278910B0D58694455C2"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Castle.Components.Validator, Version=2.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_5BDDF78B8F57F5F0C86B681FC536679D"
+                    "_B998E7FC1F540278910B0D58694455C2"
                     {
-                    "Name" = "8:ParallelExtensionsExtras.dll"
+                    "Name" = "8:Castle.Components.Validator.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:ParallelExtensionsExtras.dll"
+            "SourcePath" = "8:Castle.Components.Validator.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -989,20 +984,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7F0CEA3459356C2FB8451101EFCE55D9"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C7EE41E4C982C8217BD7DCDA76836670"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:NHibernate, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b9a188c8922137c6, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_7F0CEA3459356C2FB8451101EFCE55D9"
+                    "_C7EE41E4C982C8217BD7DCDA76836670"
                     {
-                    "Name" = "8:NHibernate.dll"
+                    "Name" = "8:Newtonsoft.Json.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:NHibernate.dll"
+            "SourcePath" = "8:Newtonsoft.Json.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1020,20 +1015,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_94AF0407772DC0469EA5A27F079132FE"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD69E9C0F36E10A97EB92CFBAFD2662D"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Caliburn.Micro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:NHibernate.ByteCode.Castle, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_94AF0407772DC0469EA5A27F079132FE"
+                    "_DD69E9C0F36E10A97EB92CFBAFD2662D"
                     {
-                    "Name" = "8:Caliburn.Micro.dll"
+                    "Name" = "8:NHibernate.ByteCode.Castle.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Caliburn.Micro.dll"
+            "SourcePath" = "8:NHibernate.ByteCode.Castle.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1051,20 +1046,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C19B1A60C99103E4AB0CB34FBD46A86E"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD70D5956F2E708F680AF121870FFCCD"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Pithos.Interfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_C19B1A60C99103E4AB0CB34FBD46A86E"
+                    "_DD70D5956F2E708F680AF121870FFCCD"
                     {
-                    "Name" = "8:Pithos.Interfaces.dll"
+                    "Name" = "8:Iesi.Collections.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Pithos.Interfaces.dll"
+            "SourcePath" = "8:Iesi.Collections.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1082,10 +1077,21 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CCAE7818C895B517369F69B2359B7A13"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E42C4D0836CDB6008642BC929C51E416"
             {
-            "SourcePath" = "8:Pithos.ShellExtensions.tlb"
-            "TargetName" = "8:Pithos.ShellExtensions.tlb"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "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:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
             "Condition" = "8:"
@@ -1097,25 +1103,25 @@
             "Permanent" = "11:FALSE"
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
-            "Register" = "3:2"
+            "Register" = "3:1"
             "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D53346F14784BE6C73E9FB150C13B3AB"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E46F39A63288379E63BDD76C9F21CC3E"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Pithos.Interfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_D53346F14784BE6C73E9FB150C13B3AB"
+                    "_E46F39A63288379E63BDD76C9F21CC3E"
                     {
-                    "Name" = "8:Iesi.Collections.dll"
+                    "Name" = "8:Pithos.Interfaces.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Iesi.Collections.dll"
+            "SourcePath" = "8:Pithos.Interfaces.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1133,20 +1139,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D90F384DDD0DCD7EF3877F70303E7A5E"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F472AA6700476700D62AABE8262628BF"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AsyncCtpLibrary, Version=1.0.4107.18181, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Castle.Core, Version=2.5.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_D90F384DDD0DCD7EF3877F70303E7A5E"
+                    "_F472AA6700476700D62AABE8262628BF"
                     {
-                    "Name" = "8:AsyncCtpLibrary.dll"
+                    "Name" = "8:Castle.Core.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:AsyncCtpLibrary.dll"
+            "SourcePath" = "8:Castle.Core.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1164,20 +1170,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E95A76F4D8A3B3ED01B4FACB84A7A0CD"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA76529F78D7D6108EDBA33F19836A6B"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Castle.Core, Version=2.5.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Hardcodet.Wpf.TaskbarNotification, Version=1.0.4.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_E95A76F4D8A3B3ED01B4FACB84A7A0CD"
+                    "_FA76529F78D7D6108EDBA33F19836A6B"
                     {
-                    "Name" = "8:Castle.Core.dll"
+                    "Name" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Castle.Core.dll"
+            "SourcePath" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1195,20 +1201,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F3FE5091AA4BA657DF9F9258B6344D85"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FBB2F726C4025B9184DFBD2748E15EBE"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Castle.ActiveRecord, Version=3.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:NHibernate.Search, Version=0.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_F3FE5091AA4BA657DF9F9258B6344D85"
+                    "_FBB2F726C4025B9184DFBD2748E15EBE"
                     {
-                    "Name" = "8:Castle.ActiveRecord.dll"
+                    "Name" = "8:NHibernate.Search.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Castle.ActiveRecord.dll"
+            "SourcePath" = "8:NHibernate.Search.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -1305,7 +1311,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
         "ProductCode" = "8:{0558EE1F-65D8-4046-BAF8-EA9325EA6DC1}"
-        "PackageCode" = "8:{73EF8FC6-2DB9-4DBE-8415-A5CE5FD4C872}"
+        "PackageCode" = "8:{854306E3-126A-40FA-A599-32616D5048A3}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -1313,7 +1319,7 @@
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
         "ProductVersion" = "8:1.0.0"
-        "Manufacturer" = "8:GRNet"
+        "Manufacturer" = "8:GRNET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://code.grnet.gr/projects/pithos-ms-client"
         "Title" = "8:Pithos"

diff --git a/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
index e2bc265..b096e6e 100644 (file)
--- a/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
+++ b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
@@ -21,18 +21,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_263B85E7C62D146E20358A3F08BBC740"
-        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_263B85E7C62D146E20358A3F08BBC740"
-        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_392252B203784D91A39016FC82CD5887"
         "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
@@ -75,6 +63,24 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_E42C4D0836CDB6008642BC929C51E416"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
+        "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
@@ -189,14 +195,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_A952570414DA4B8547D9CD8FEE174CD1"
-        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "MsmKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_B49160FDF21C82F60E2F28FF690673F7"
+        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -376,7 +382,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_263B85E7C62D146E20358A3F08BBC740"
+        "OwnerKey" = "8:_5B7E11B508E123A2BA4C11623DA3E029"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -586,20 +592,20 @@
         }
         "File"
         {
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_263B85E7C62D146E20358A3F08BBC740"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_392252B203784D91A39016FC82CD5887"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Dataflow, Version=0.0.4098.29463, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:WPFToolkit.Extended, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_263B85E7C62D146E20358A3F08BBC740"
+                    "_392252B203784D91A39016FC82CD5887"
                     {
-                    "Name" = "8:System.Threading.Tasks.Dataflow.dll"
+                    "Name" = "8:WPFToolkit.Extended.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:System.Threading.Tasks.Dataflow.dll"
+            "SourcePath" = "8:WPFToolkit.Extended.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -617,20 +623,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_392252B203784D91A39016FC82CD5887"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4C5B93BC82FE5E63E01458A8DA46B4D6"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:WPFToolkit.Extended, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Castle.ActiveRecord, Version=3.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_392252B203784D91A39016FC82CD5887"
+                    "_4C5B93BC82FE5E63E01458A8DA46B4D6"
                     {
-                    "Name" = "8:WPFToolkit.Extended.dll"
+                    "Name" = "8:Castle.ActiveRecord.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:WPFToolkit.Extended.dll"
+            "SourcePath" = "8:Castle.ActiveRecord.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -648,20 +654,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4C5B93BC82FE5E63E01458A8DA46B4D6"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_586310F986FB0DB4F49D3EAFBD87760C"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Castle.ActiveRecord, Version=3.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_4C5B93BC82FE5E63E01458A8DA46B4D6"
+                    "_586310F986FB0DB4F49D3EAFBD87760C"
                     {
-                    "Name" = "8:Castle.ActiveRecord.dll"
+                    "Name" = "8:log4net.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Castle.ActiveRecord.dll"
+            "SourcePath" = "8:log4net.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -679,20 +685,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_586310F986FB0DB4F49D3EAFBD87760C"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5B7E11B508E123A2BA4C11623DA3E029"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Dataflow, Version=0.0.4098.29463, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_586310F986FB0DB4F49D3EAFBD87760C"
+                    "_5B7E11B508E123A2BA4C11623DA3E029"
                     {
-                    "Name" = "8:log4net.dll"
+                    "Name" = "8:System.Threading.Tasks.Dataflow.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:log4net.dll"
+            "SourcePath" = "8:System.Threading.Tasks.Dataflow.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
@@ -927,7 +933,7 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A952570414DA4B8547D9CD8FEE174CD1"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B49160FDF21C82F60E2F28FF690673F7"
             {
             "SourcePath" = "8:Pithos.ShellExtensions.tlb"
             "TargetName" = "8:Pithos.ShellExtensions.tlb"
@@ -1305,7 +1311,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
         "ProductCode" = "8:{0558EE1F-65D8-4046-BAF8-EA9325EA6DC1}"
-        "PackageCode" = "8:{28A5FAAF-90D1-41B9-B512-85C6616ED99D}"
+        "PackageCode" = "8:{C4AB794E-8D82-4C44-9A8C-4429ED596FDE}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -1313,7 +1319,7 @@
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
         "ProductVersion" = "8:1.0.0"
-        "Manufacturer" = "8:GRNet"
+        "Manufacturer" = "8:GRNET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://code.grnet.gr/projects/pithos-ms-client"
         "Title" = "8:Pithos"