Merge lp:~mandel/ubuntuone-windows-installer/move_sync_to_service into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

In this version, the WCF services are hosted in the user space. This is donw by created WCf services hosted in a console application. In order to be able to load the correct configuration, two appdomains are used, one to start the app, the second one to do the WCF hosting. This second appdomain has the users configuration which is build the first time the application is ran.

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs	2010-10-08 12:04:40 +0000
+++ install/UbuntuOne7.wxs	2010-10-08 12:04:40 +0000
@@ -95,6 +95,16 @@
 					           Name="UbuntuOne">
 						<Directory Id="DaemonDir"
 								   Name="Daemon">
+                            <Component Id="DaemonAutostart" 
+									   Guid="c3308920-d2d1-11df-bd3b-0800200c9a66">
+								<RegistryValue Id="Daemon.rst" 
+											   Root="HKCU" 
+											   Key="Software\Microsoft\Windows\CurrentVersion\Run" 
+											   Name="Ubuntu One Client Daemon" 
+											   Value="[DaemonDir]Canonical.UbuntuOne.ProcessDispatcher.exe" 
+											   Type="string"/>
+								<Condition>UBUNTUONeDAEMON_START_VIA_REGISTRY</Condition>
+							</Component>
 							<Component Id="DaemonCommonLibComponent" 
 									   Guid="a609b650-94b5-11df-981c-0800200c9a66">
 								<File Id="Canonical.UbuntuOne.Common.dll" 
@@ -118,22 +128,6 @@
 									  DiskId="1" 
 									  Source="build_results\Daemon\Canonical.UbuntuOne.ProcessDispatcher.exe" 
 									  KeyPath="yes"/>
-								<!-- Install, start and stop service using the msi -->
-								<ServiceInstall Id="ProcessDispatcher.exe" 
-												Name="UbuntuOne" 
-												DisplayName="Ubuntu One Sync Daemon" 
-												Type="ownProcess"
-												Interactive="no" 
-												Start="auto" 
-												Vital="yes" 
-												ErrorControl="ignore"
-												Description="Provides a central process that manages the Ubuntu One sync daemon." />
-								<ServiceControl Id="ProcessDispatcherControl" 
-												Name="UbuntuOne" 
-												Start="install" 
-												Stop="uninstall" 
-												Remove="uninstall" 
-												Wait="yes" />
 							</Component>
 							<Component Id="DaemonProgramComponentConfig" 
 									   Guid="6ac2f100-94bb-11df-981c-0800200c9a66">
@@ -474,6 +468,22 @@
 									      Source="build_results\Client\Config\log4net.config" 
 									      KeyPath="yes"/>
 								</Component>
+                                <Component Id="ClientConfigServiceModelBindings" 
+									       Guid="a76325d0-d200-11df-bd3b-0800200c9a66">
+									<File Id="serviceModelBindings_client" 
+										  Name="serviceModel.bindings.config" 
+									      DiskId="1" 
+									      Source="build_results\Client\Config\serviceModel.bindings.config" 
+									      KeyPath="yes"/>
+								</Component>
+                                <Component Id="ClientConfigServiceModelClient" 
+									       Guid="b2b8c250-d200-11df-bd3b-0800200c9a66">
+									<File Id="serviceModelClient_client" 
+										  Name="serviceModel.client.config" 
+									      DiskId="1" 
+									      Source="build_results\Client\Config\serviceModel.client.config" 
+									      KeyPath="yes"/>
+								</Component>
 							</Directory>
                             <Directory Id="U1SyncExecutable"
 								       Name="U1Sync">
@@ -987,7 +997,10 @@
 			<ComponentRef Id="UbuntuOneClientConfig" />
 			<ComponentRef Id="UbuntuOneClientPdb" />
 			<ComponentRef Id="ClientConfigLog4Net" />
+            <ComponentRef Id="ClientConfigServiceModelBindings" />
+            <ComponentRef Id="ClientConfigServiceModelClient" />
 			<!-- Client auto start -->
+			<ComponentRef Id="DaemonAutostart" />
 			<ComponentRef Id="UbuntuOneClietnAutostart" />
             <!-- U1Sync pacakge -->
             <ComponentRef Id="CTypesComponent" />
@@ -1050,10 +1063,6 @@
             <ComponentRef Id="UbuntuSSOViews" />
             <ComponentRef Id="Newtonsoft.Json" />
 		</Feature>
-        
-        <InstallExecuteSequence>
-            <ScheduleReboot After='InstallFinalize' />
-        </InstallExecuteSequence>
 
         <UI Id="WixUI_Minimal_No_License">
             <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
 
=== modified file 'install/UbuntuOneXP.wxs'
--- install/UbuntuOneXP.wxs	2010-10-08 12:04:40 +0000
+++ install/UbuntuOneXP.wxs	2010-10-08 12:04:40 +0000
@@ -95,6 +95,16 @@
 					           Name="UbuntuOne">
 						<Directory Id="DaemonDir"
 								   Name="Daemon">
+                            <Component Id="DaemonAutostart" 
+									   Guid="c3308920-d2d1-11df-bd3b-0800200c9a66">
+								<RegistryValue Id="Daemon.rst" 
+											   Root="HKCU" 
+											   Key="Software\Microsoft\Windows\CurrentVersion\Run" 
+											   Name="Ubuntu One Client Daemon" 
+											   Value="[DaemonDir]Canonical.UbuntuOne.ProcessDispatcher.exe" 
+											   Type="string"/>
+								<Condition>UBUNTUONeDAEMON_START_VIA_REGISTRY</Condition>
+							</Component>
 							<Component Id="DaemonCommonLibComponent" 
 									   Guid="a609b650-94b5-11df-981c-0800200c9a66">
 								<File Id="Canonical.UbuntuOne.Common.dll" 
@@ -118,22 +128,6 @@
 									  DiskId="1" 
 									  Source="build_results\Daemon\Canonical.UbuntuOne.ProcessDispatcher.exe" 
 									  KeyPath="yes"/>
-								<!-- Install, start and stop service using the msi -->
-								<ServiceInstall Id="ProcessDispatcher.exe" 
-												Name="UbuntuOne" 
-												DisplayName="Ubuntu One Sync Daemon" 
-												Type="ownProcess"
-												Interactive="no" 
-												Start="auto" 
-												Vital="yes" 
-												ErrorControl="ignore"
-												Description="Provides a central process that manages the Ubuntu One sync daemon." />
-								<ServiceControl Id="ProcessDispatcherControl" 
-												Name="UbuntuOne" 
-												Start="install" 
-												Stop="uninstall" 
-												Remove="uninstall" 
-												Wait="yes" />
 							</Component>
 							<Component Id="DaemonProgramComponentConfig" 
 									   Guid="6ac2f100-94bb-11df-981c-0800200c9a66">
@@ -474,6 +468,22 @@
 									      Source="build_results\Client\Config\log4net.config" 
 									      KeyPath="yes"/>
 								</Component>
+                                <Component Id="ClientConfigServiceModelBindings" 
+									       Guid="a76325d0-d200-11df-bd3b-0800200c9a66">
+									<File Id="serviceModelBindings_client" 
+										  Name="serviceModel.bindings.config" 
+									      DiskId="1" 
+									      Source="build_results\Client\Config\serviceModel.bindings.config" 
+									      KeyPath="yes"/>
+								</Component>
+                                <Component Id="ClientConfigServiceModelClient" 
+									       Guid="b2b8c250-d200-11df-bd3b-0800200c9a66">
+									<File Id="serviceModelClient_client" 
+										  Name="serviceModel.client.config" 
+									      DiskId="1" 
+									      Source="build_results\Client\Config\serviceModel.client.config" 
+									      KeyPath="yes"/>
+								</Component>
 							</Directory>
                             <Directory Id="U1SyncExecutable"
 								       Name="U1Sync">
@@ -784,7 +794,10 @@
 			<ComponentRef Id="UbuntuOneClientConfig" />
 			<ComponentRef Id="UbuntuOneClientPdb" />
 			<ComponentRef Id="ClientConfigLog4Net" />
-			<!-- Client auto start -->
+            <ComponentRef Id="ClientConfigServiceModelBindings" />
+            <ComponentRef Id="ClientConfigServiceModelClient" />
+			<!-- auto start -->
+            <ComponentRef Id="DaemonAutostart" />
 			<ComponentRef Id="UbuntuOneClietnAutostart" />
             <!-- U1Sync pacakge -->
             <ComponentRef Id="CTypesComponent" />
@@ -823,10 +836,6 @@
             <ComponentRef Id="Newtonsoft.Json" />
 		</Feature>
         
-        <InstallExecuteSequence>
-            <ScheduleReboot After='InstallFinalize' />
-        </InstallExecuteSequence>
-        
         <UI Id="WixUI_Minimal_No_License">
             <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
             <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
 
=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-10-06 10:43:02 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-10-08 12:04:40 +0000
@@ -102,7 +102,13 @@
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.ServiceModel">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase">
 
=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-08 12:04:40 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-08 12:04:40 +0000
@@ -17,15 +17,15 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
-using System.Diagnostics;
 using System.IO;
+using System.ServiceModel;
 using Canonical.Ubuntu.SSO;
 using Canonical.UbuntuOne.Client.Preferences;
 using Canonical.UbuntuOne.Common;
 using Canonical.UbuntuOne.Common.Aop;
+using Canonical.UbuntuOne.Common.Net;
 using Canonical.UbuntuOne.Common.Utils;
 using log4net;
-using Microsoft.Win32;
 
 namespace Canonical.UbuntuOne.Client.Notification
 {
@@ -53,8 +53,6 @@
         private ISSOCredentialsProvider _ssoProvider;
         private ILog _logger;
         private readonly object _loggerLock = new object();
-        private string _u1SyncPath;
-        private readonly object _u1SyncPathLock = new object();
 
         #endregion
 
@@ -95,6 +93,7 @@
         /// Gets and sets the message box used to send messages to the user.
         /// </summary>
         public IMessageBox MessageBox { get; set; }
+
         /// <summary>
         /// Gets and sets the provider that will return the credentials used in ubuntu one.
         /// </summary>
@@ -130,6 +129,17 @@
             }
         }
 
+        /// <summary>
+        /// Gets and sets the channel factory that can be used to create communication objects that are used to
+        /// interact with the sync daemon.
+        /// </summary>
+        public ChannelFactory<ISyncDaemon> SyncDaemonChannelFactory { get; set; }
+
+        /// <summary>
+        /// Gets and sets the service caller that is used to do the house keeping when calling a service.
+        /// </summary>
+        public IServiceCaller ServiceCaller { get; set; }
+ 
         #endregion
 
         #region Properties
@@ -153,36 +163,6 @@
             set { _logger = value; }
         }
 
-        private string U1SyncPath
-        {
-            get
-            {
-                if (_u1SyncPath == null)
-                {
-                    lock (_u1SyncPathLock)
-                    {
-                        try
-                        {
-                            using (var softwareEntry = Registry.LocalMachine.OpenSubKey("SOFTWARE"))
-                            using (var canonicalEntry = softwareEntry.OpenSubKey("Canonical"))
-                            using (var ubuntuOneEntry = canonicalEntry.OpenSubKey("UbuntuOne"))
-                            {
-                                _u1SyncPath = (string) ubuntuOneEntry.GetValue("InstallationPath");
-                                _u1SyncPath = Path.Combine(_u1SyncPath, "Client");
-                                _u1SyncPath = Path.Combine(_u1SyncPath, "U1Sync");
-                            }
-                        }
-                        catch(NullReferenceException)
-                        {
-                            // thrown when we did not find the key, that is, not correct installation
-                            Logger.Error("Registry key HKLM/Software/Canonical/UbuntuOne is not present!!!");
-                        }
-                    }
-                }
-                return _u1SyncPath;
-            }
-        }
-
         #endregion
 
         #region Constructors
@@ -256,64 +236,16 @@
             // check if the credentials are for us
             if (args.ApplicationName != "UbuntuOne") return;
             Logger.Info("Got the UbuntuOne credentials!");
-            // get the string used to pass the credentials to the python code.
-            var tokens = string.Format("{0}:{1}:{2}:{3}",
-                                       args.Credentials["Token"],
-                                       args.Credentials["TokenSecret"],
-                                       args.Credentials["ConsumerKey"],
-                                       args.Credentials["ConsumerSecret"]);
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
                                       "UbuntuOne");
             // ensure that the path can be handled by the python code
             oneDir = oneDir.Replace("\\", "\\\\");
-            if (!Directory.Exists(oneDir))
-            {
-                Logger.InfoFormat("Creating dir '{0}'", oneDir);
-                Directory.CreateDirectory(oneDir);
-            }
-
-            if (!Directory.Exists(Path.Combine(oneDir, ".ubuntuone-sync")))
-            {
-                // init the directory
-                var init = new Process
-                {
-                    StartInfo =
-                    {
-                        WorkingDirectory = U1SyncPath,
-                        FileName = Path.Combine(U1SyncPath, "main.exe"),
-                        Arguments = String.Format(" --init \"{0}\" --oauth {1}", oneDir, tokens),
-                        UseShellExecute = false,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        CreateNoWindow = true,
-                        WindowStyle = ProcessWindowStyle.Hidden
-
-                    }
-                };
-                Logger.InfoFormat("Executing u1sync with args: {0}", init.StartInfo.Arguments);
-                init.Start();
-                init.WaitForExit();
-                Logger.InfoFormat("StandarOutput from u1sync is: {0}", init.StandardOutput.ReadToEnd());
-                Logger.ErrorFormat("StandardError from u1sync is: {0}", init.StandardError.ReadToEnd());
-                init.Close();
-
-            }
-
-            var proc = new Process
-            {
-                StartInfo =
-                {
-                    WorkingDirectory = U1SyncPath,
-                    FileName = Path.Combine(U1SyncPath, "main.exe"),
-                    Arguments = String.Format("\"{0}\" --oauth {1}", oneDir, tokens),
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden
-                }
-            };
-            proc.Start();
+            // call the ISyncService to perform the manual sync
+            
+            var syncServiceChannel = SyncDaemonChannelFactory.CreateChannel();
+            ServiceCaller.SaveProxyCall(
+                () => syncServiceChannel.ManualSync(oneDir, args.Credentials["Token"], args.Credentials["TokenSecret"],args.Credentials["ConsumerKey"], args.Credentials["ConsumerSecret"]),
+                (ICommunicationObject) syncServiceChannel);
         }
 
         [DebugLogged]
 
=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-10-08 12:04:40 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-10-08 12:04:40 +0000
@@ -79,14 +79,20 @@
     <Compile Include="Net\HttpWebRequestFactory.cs" />
     <Compile Include="Net\IHttpWebRequestFactory.cs" />
     <Compile Include="Net\IHttpWebRequest.cs" />
+    <Compile Include="Net\IServiceCaller.cs" />
+    <Compile Include="Net\ServiceCaller.cs" />
     <Compile Include="OperationContracts\IEventNotifier.cs" />
     <Compile Include="Security\IAuthentication.cs" />
     <Compile Include="Threading\IDispatcher.cs" />
     <Compile Include="Threading\WpfDispatcher.cs" />
+    <Compile Include="Utils\ApplicationLocatorException.cs" />
     <Compile Include="Utils\ApplicationWrapper.cs" />
+    <Compile Include="Utils\ConfigurationLocator.cs" />
+    <Compile Include="Utils\Constants.cs" />
     <Compile Include="Utils\Explorer.cs" />
     <Compile Include="Utils\ExplorerException.cs" />
     <Compile Include="Utils\IApplication.cs" />
+    <Compile Include="Utils\IApplicationLocator.cs" />
     <Compile Include="Utils\IExplorer.cs" />
     <Compile Include="IMessageBox.cs" />
     <Compile Include="IProcessManager.cs" />
@@ -132,6 +138,7 @@
     </Compile>
     <Compile Include="Update\SelfUpdateException.cs" />
     <Compile Include="Update\UpdatingPresenter.cs" />
+    <Compile Include="Utils\UbuntuOneApplicationLocator.cs" />
     <Compile Include="Validation\ArgumentValidation.cs" />
     <Compile Include="Validation\EqualityValidationExtensions.cs" />
     <Compile Include="Validation\MultiException.cs" />
 
=== added file 'src/Canonical.UbuntuOne.Common/Net/IServiceCaller.cs'
--- src/Canonical.UbuntuOne.Common/Net/IServiceCaller.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Net/IServiceCaller.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.ServiceModel;
+
+namespace Canonical.UbuntuOne.Common.Net
+{
+    /// <summary>
+    /// Interface to be implemented by those objects that allow to call WCF service and that will
+    /// perform all the house keeping required.
+    /// </summary>
+    public interface IServiceCaller
+    {
+        /// <summary>
+        /// A method that allows to correctly clean a channel when executing a call to
+        /// a web service. This method takes an action that should be using the channel
+        /// and the casted channel so that we can access the ICommunicationObject methods.
+        /// </summary>
+        /// <param name="action">The action to be performed that uses the channel.</param>
+        /// <param name="channel">The casted channel that will be used to clean its state.</param>
+        void SaveProxyCall(Action action, ICommunicationObject channel);
+
+        /// <summary>
+        /// A method that allows to correctly clean a channel when executing a call to
+        /// a web service. This method takes an action that should be using the channel
+        /// and the casted channel so that we can access the ICommunicationObject methods.
+        /// </summary>
+        /// <param name="action">An action that has a wcf proxy call.</param>
+        /// <param name="channel">The casted channel that will be used to clean its state.</param>
+        /// <returns>The result of the action</returns>
+        TResult SaveProxyCall<TResult>(Func<TResult> action, ICommunicationObject channel);
+    }
+}
 
=== added file 'src/Canonical.UbuntuOne.Common/Net/ServiceCaller.cs'
--- src/Canonical.UbuntuOne.Common/Net/ServiceCaller.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Net/ServiceCaller.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.ServiceModel;
+
+namespace Canonical.UbuntuOne.Common.Net
+{
+    /// <summary>
+    /// Implementation of the IServiceCaller interface that performs the required house keeping used when 
+    /// calling a WCF service.
+    /// </summary>
+    internal class ServiceCaller : IServiceCaller
+    {
+        #region Implementation of IServiceCaller
+
+        /// <summary>
+        /// A method that allows to correctly clean a channel when executing a call to
+        /// a web service. This method takes an action that should be using the channel
+        /// and the casted channel so that we can access the ICommunicationObject methods.
+        /// </summary>
+        /// <param name="action">The action to be performed that uses the channel.</param>
+        /// <param name="channel">The casted channel that will be used to clean its state.</param>
+        public void SaveProxyCall(Action action, ICommunicationObject channel)
+        {
+            try
+            {
+                action();
+                channel.Close();
+            }
+            catch (FaultException)
+            {
+                channel.Close();
+            }
+            catch (CommunicationException)
+            {
+                channel.Abort();
+            }
+            catch (TimeoutException)
+            {
+                channel.Abort();
+            }
+            catch (Exception)
+            {
+                channel.Abort();
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// A method that allows to correctly clean a channel when executing a call to
+        /// a web service. This method takes an action that should be using the channel
+        /// and the casted channel so that we can access the ICommunicationObject methods.
+        /// </summary>
+        /// <param name="action">An action that has a wcf proxy call.</param>
+        /// <param name="channel">The casted channel that will be used to clean its state.</param>
+        /// <returns>The result of the action</returns>
+        public TResult SaveProxyCall<TResult>(Func<TResult> action, ICommunicationObject channel)
+        {
+            try
+            {
+                var result = action();
+                channel.Close();
+                return result;
+            }
+            catch (FaultException)
+            {
+                channel.Close();
+            }
+            catch (CommunicationException)
+            {
+                channel.Abort();
+            }
+            catch (TimeoutException)
+            {
+                channel.Abort();
+            }
+            catch (Exception)
+            {
+                channel.Abort();
+                throw;
+            }
+
+            return default(TResult);
+        }
+
+        #endregion
+    }
+}
 
=== modified file 'src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs'
--- src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs	2010-08-30 17:30:31 +0000
+++ src/Canonical.UbuntuOne.Common/OperationContracts/ISyncDaemon.cs	2010-10-08 12:04:40 +0000
@@ -29,6 +29,17 @@
     [ServiceContract]
 	public interface ISyncDaemon
 	{
+        /// <summary>
+        /// Allows to perform a manual sync of the root Ubuntu One directory in the provided path using the oauth information
+        /// passed to the service.
+        /// </summary>
+        /// <param name="path">The path to which the root of the Ubuntu One folder will be sync.</param>
+        /// <param name="token">The token from oauth.</param>
+        /// <param name="tokenSecret">The token secret from oauth.</param>
+        /// <param name="consumerKey">The consumer key from oauth.</param>
+        /// <param name="consumerSecret">The consumer secret from oauth.</param>
+        [OperationContract]
+	    void ManualSync(string path, string token, string tokenSecret, string consumerKey, string consumerSecret);
 
 		/// <summary>
 		/// Allows to start the daemon by a client.
@@ -57,12 +68,6 @@
 		bool TryStop();
 
         /// <summary>
-        /// Allows the user to perform a manual sync of his machine with the ubuntu one server.
-        /// </summary>
-	    [OperationContract]
-	    void ManualSync();
-
-        /// <summary>
         /// Returns the port number of the socket that the synd daemo is listening to for communication.
         /// </summary>
         /// <returns></returns>
 
=== added file 'src/Canonical.UbuntuOne.Common/Utils/ApplicationLocatorException.cs'
--- src/Canonical.UbuntuOne.Common/Utils/ApplicationLocatorException.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Utils/ApplicationLocatorException.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+
+namespace Canonical.UbuntuOne.Common.Utils
+{
+    /// <summary>
+    /// Base exception class thrown when there have been issues finding an application in the system.
+    /// </summary>
+    public class ApplicationLocatorException : Exception
+    {
+        /// <summary>
+        /// Creates a new instance of the class.
+        /// </summary>
+        public ApplicationLocatorException()
+        {
+
+        }
+
+        /// <summary>
+        /// Creates a new instance of the class that will have the given message.
+        /// </summary>
+        /// <param name="message">The message to be carried by the exception.</param>
+        public ApplicationLocatorException(string message)
+            : base(message)
+        {
+
+        }
+
+        /// <summary>
+        /// Creates a new instance of the class that will have the given message and inner exception.
+        /// </summary>
+        /// <param name="message">The message to be carried by the exception.</param>
+        /// <param name="innerException">The inner exception.</param>
+        public ApplicationLocatorException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+
+        }
+    }
+}
 
=== added file 'src/Canonical.UbuntuOne.Common/Utils/ConfigurationLocator.cs'
--- src/Canonical.UbuntuOne.Common/Utils/ConfigurationLocator.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Utils/ConfigurationLocator.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.IO;
+using System.Security.Principal;
+using Canonical.UbuntuOne.ProcessDispatcher;
+using log4net;
+
+namespace Canonical.UbuntuOne.Common.Utils
+{
+    /// <summary>
+    /// This class allow to find the configuration to be used in the application accodring to the user that started the 
+    /// process. This allows to point to different configurations that will ensure that there are no service collitions
+    /// by usint the users name space.
+    /// </summary>
+    public class ConfigurationLocator
+    {
+        #region Variables
+
+        private const string UserToken = "$username$";
+        private const string ConfigFolder = "Config";
+        private const string DaemonAppConfigName = "Canonical.UbuntuOne.ProcessDispatcher.exe.config";
+        private const string UserAppConfigName = "UbuntuOneClient.exe.config";
+        private const string Log4NetConfig = "log4net.config";
+        private const string BehavioursConfig = "serviceModel.behaviours.config";
+        private const string BindingsConfig = "serviceModel.bindings.config";
+        private const string ServicesConfig = "serviceModel.services.config";
+        private const string ClientConfig = "serviceModel.client.config";
+        private string _userConfigPath;
+        private readonly object _userConfigPathLock = new object();
+        private readonly object _loggerLock = new object();
+        private ILog _logger;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Allows to get and set the logger that will be used.
+        /// </summary>
+        internal ILog Logger
+        {
+            get
+            {
+                if (_logger == null)
+                {
+                    lock (_loggerLock)
+                    {
+                        _logger = LogManager.GetLogger(typeof(ConfigurationLocator));
+                    }
+                }
+                return _logger;
+            }
+            set
+            {
+                _logger = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to be used to store the users configuration.
+        /// </summary>
+        private string UserDaemonConfigPath
+        {
+            get
+            {
+                if (_userConfigPath == null)
+                {
+                    lock (_userConfigPathLock)
+                    {
+                        _userConfigPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+                        _userConfigPath = Path.Combine(_userConfigPath, "UbuntuOne");
+                        _userConfigPath = Path.Combine(_userConfigPath, "Daemon");
+                    }
+                }
+                return _userConfigPath;
+            }
+        }
+
+        private string UserClientConfigPath
+        {
+            get
+            {
+                if (_userConfigPath == null)
+                {
+                    lock (_userConfigPathLock)
+                    {
+                        _userConfigPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+                        _userConfigPath = Path.Combine(_userConfigPath, "UbuntuOne");
+                        _userConfigPath = Path.Combine(_userConfigPath, "Client");
+                    }
+                }
+                return _userConfigPath;
+            }
+        }
+        /// <summary>
+        /// Gets and sets the application locator that will be used to find the location of the 
+        /// root configuration.
+        /// </summary>
+        public IApplicationLocator ApplicationLocator { get; set; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new configuration locator with the default app locator.
+        /// </summary>
+        public ConfigurationLocator()
+            : this(new UbuntuOneApplicationLocator())
+        {
+
+        }
+
+        /// <summary>
+        /// Creates a new configuration locator with a pass app locator.
+        /// </summary>
+        /// <param name="applicationLocator">The object that will return the path to known applications.</param>
+        public ConfigurationLocator(IApplicationLocator applicationLocator)
+        {
+            ApplicationLocator = applicationLocator;
+        }
+
+        #endregion
+
+        #region Helpers
+
+        /// <summary>
+        /// Returns if the configuration for the current user daemon is present.
+        /// </summary>
+        /// <returns>A flag stating if the configuraton is present.</returns>
+        private bool IsDaemonConfigurationPresent()
+        {
+            // the configuration is store per user in his location to 
+            // ensure that he is the only one using it
+            return Directory.Exists(UserDaemonConfigPath)
+                   && File.Exists(Path.Combine(UserDaemonConfigPath, DaemonAppConfigName))
+                   && Directory.Exists(Path.Combine(UserDaemonConfigPath, ConfigFolder));
+        }
+
+        /// <summary>
+        /// Returns if the configuration for the current user client is present
+        /// </summary>
+        /// <returns>A flag stating if the configuration is present.</returns>
+        private bool IsClientConfigurationPresent()
+        {
+            return Directory.Exists(UserClientConfigPath)
+                && File.Exists(Path.Combine(UserClientConfigPath, UserAppConfigName))
+                && Directory.Exists(Path.Combine(UserClientConfigPath, ConfigFolder));
+        }
+
+        /// <summary>
+        /// Methods that updates all the urls in the services named pipes so that they are ersonalized 
+        /// for the current user.
+        /// </summary>
+        private void UpdateDaemonServicesConfiguration()
+        {
+            var servicesFullPath = Path.Combine(UserDaemonConfigPath, ConfigFolder);
+            servicesFullPath = Path.Combine(servicesFullPath, ServicesConfig);
+            string userConfig;
+            using (var fileReader = new StreamReader(new FileStream(servicesFullPath, FileMode.Open)))
+            {
+                userConfig = fileReader.ReadToEnd();
+            }
+            userConfig = userConfig.Replace(UserToken, WindowsIdentity.GetCurrent().Name);
+            File.Delete(servicesFullPath);
+            using (var fileWriter = new StreamWriter(new FileStream(servicesFullPath, FileMode.CreateNew)))
+            {
+                fileWriter.Write(userConfig);
+            }
+        }
+
+        /// <summary>
+        /// Updates the clients configurations so that the clients uses the correct named pipes.
+        /// </summary>
+        private void UpdateClientConfiguration()
+        {
+            var clientsFullPath = Path.Combine(UserClientConfigPath, ConfigFolder);
+            clientsFullPath = Path.Combine(clientsFullPath, ClientConfig);
+            string userConfig;
+            using(var fileReader = new StreamReader(new FileStream(clientsFullPath, FileMode.Open)))
+            {
+                userConfig = fileReader.ReadToEnd();
+            }
+            userConfig = userConfig.Replace(UserToken, WindowsIdentity.GetCurrent().Name);
+            File.Delete(clientsFullPath);
+            using(var fileWriter = new StreamWriter(new FileStream(clientsFullPath, FileMode.CreateNew)))
+            {
+                fileWriter.Write(userConfig);
+            }
+        }
+
+        /// <summary>
+        /// Method that copies all the configuration that is deployed by the msi to the users config location.
+        /// </summary>
+        private void CopyDaemonRootConfiguration()
+        {
+            if (!Directory.Exists(UserDaemonConfigPath))
+            {
+                Logger.DebugFormat("Creating dir {0}", UserDaemonConfigPath);
+                Directory.CreateDirectory(UserDaemonConfigPath);
+            }
+            // we need to copy the info from the root path
+            var daemonPath = ApplicationLocator.GetApplicationPath(Constants.U1DaemonAppName);
+            File.Copy(Path.Combine(daemonPath, DaemonAppConfigName), Path.Combine(UserDaemonConfigPath, DaemonAppConfigName));
+            // we copy the config files for log4net and the service model
+            var userConfigFolderPath = Path.Combine(UserDaemonConfigPath, ConfigFolder);
+            if (!Directory.Exists(userConfigFolderPath))
+            {
+                Logger.DebugFormat("Create dir {0}", userConfigFolderPath);
+                Directory.CreateDirectory(userConfigFolderPath);
+            }
+            var rootConfigFolderPath = Path.Combine(daemonPath, ConfigFolder);
+            File.Copy(Path.Combine(rootConfigFolderPath, Log4NetConfig), Path.Combine(userConfigFolderPath, Log4NetConfig));
+            File.Copy(Path.Combine(rootConfigFolderPath, BehavioursConfig), Path.Combine(userConfigFolderPath, BehavioursConfig));
+            File.Copy(Path.Combine(rootConfigFolderPath, BindingsConfig), Path.Combine(userConfigFolderPath, BindingsConfig));
+            File.Copy(Path.Combine(rootConfigFolderPath, ServicesConfig), Path.Combine(userConfigFolderPath, ServicesConfig));
+        }
+
+        private void CopyClietnRootConfiguration()
+        {
+            if (!Directory.Exists(UserClientConfigPath))
+            {
+                Logger.DebugFormat("Creating dir {0}", UserClientConfigPath);
+                Directory.CreateDirectory(UserClientConfigPath);
+            }
+            // we need to copy the info from the root path
+            var clientPath = ApplicationLocator.GetApplicationPath(Constants.U1ClientAppName);
+            File.Copy(Path.Combine(clientPath, UserAppConfigName), Path.Combine(UserClientConfigPath, UserAppConfigName));
+            // we copy the config files for log4net and the service model
+            var userConfigFolderPath = Path.Combine(UserClientConfigPath, ConfigFolder);
+            if (!Directory.Exists(userConfigFolderPath))
+            {
+                Logger.DebugFormat("Create dir {0}", userConfigFolderPath);
+                Directory.CreateDirectory(userConfigFolderPath);
+            }
+            var rootConfigFolderPath = Path.Combine(clientPath, ConfigFolder);
+            File.Copy(Path.Combine(rootConfigFolderPath, Log4NetConfig), Path.Combine(userConfigFolderPath, Log4NetConfig));
+            File.Copy(Path.Combine(rootConfigFolderPath, BindingsConfig), Path.Combine(userConfigFolderPath, BindingsConfig));
+            File.Copy(Path.Combine(rootConfigFolderPath, ClientConfig), Path.Combine(userConfigFolderPath, ClientConfig));
+        }
+
+        #endregion
+
+
+
+        ///<summary>
+        /// Returns the path with the configuration to be used for the dameon for the current user.
+        ///</summary>
+        ///<returns>The path to the configuration to be used by the current user when running the daemon.</returns>
+        public string GetCurrentUserDaemonConfiguration()
+        {
+            if (!IsDaemonConfigurationPresent())
+            {
+                Logger.Info("The users config does not exist!");
+                // we copy the root configuration
+                CopyDaemonRootConfiguration();
+                // we update the name pipe so that the use the current user name as part of the path
+                UpdateDaemonServicesConfiguration();
+            }
+            var appConfigPath = Path.Combine(UserDaemonConfigPath, DaemonAppConfigName);
+            Logger.InfoFormat("The config path is {0}", appConfigPath);
+            return appConfigPath;
+        }
+
+        /// <summary>
+        /// Returns the path with the configuration to be used for the client for the current user.
+        /// </summary>
+        /// <returns>The path to the configuration to use.</returns>
+        public string GetCurrentUserClientConfiguration()
+        {
+            if (!IsClientConfigurationPresent())
+            {
+                Logger.Info("The users config does not exist!");
+                // we copy the root configuration
+                CopyClietnRootConfiguration();
+                // we update the name pipe so that the use the current user name as part of the path
+                UpdateClientConfiguration();
+            }
+            var appConfigPath = Path.Combine(UserClientConfigPath, UserAppConfigName);
+            Logger.InfoFormat("The config path is {0}", appConfigPath);
+            return appConfigPath;
+
+            return null;
+        }
+
+    }
+}
 
=== added file 'src/Canonical.UbuntuOne.Common/Utils/Constants.cs'
--- src/Canonical.UbuntuOne.Common/Utils/Constants.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Utils/Constants.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Canonical.UbuntuOne.ProcessDispatcher
+{
+    /// <summary>
+    /// Contains a set of constants share among different classes.
+    /// </summary>
+    public static class Constants
+    {
+        public const string U1SyncAppName = "U1Sync";
+        public const string U1DaemonAppName = "U1Daemon";
+        public const string U1ClientAppName = "U1Client";
+    }
+}
 
=== added file 'src/Canonical.UbuntuOne.Common/Utils/IApplicationLocator.cs'
--- src/Canonical.UbuntuOne.Common/Utils/IApplicationLocator.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Utils/IApplicationLocator.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System.Collections.Generic;
+
+namespace Canonical.UbuntuOne.Common.Utils
+{
+    /// <summary>
+    /// Interface to be implemented by those object that know how to locate an application in the system so that
+    /// it can be called in a different process.
+    /// </summary>
+    public interface IApplicationLocator
+    {
+        /// <summary>
+        /// Returns a collecion with the names of the known application by the object.
+        /// </summary>
+        /// <returns>A string with all the different applications that the object knows how to locate.</returns>
+        ICollection<string> GetKnownApplications();
+
+        /// <summary>
+        /// Returns the full path in the system of the application that mathces the given name.
+        /// </summary>
+        /// <param name="appName">The name of the application we want to locate.</param>
+        /// <returns>The full path of the application with the given name.</returns>
+        string GetApplicationPath(string appName);
+
+    }
+}
 
=== added file 'src/Canonical.UbuntuOne.Common/Utils/UbuntuOneApplicationLocator.cs'
--- src/Canonical.UbuntuOne.Common/Utils/UbuntuOneApplicationLocator.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/Utils/UbuntuOneApplicationLocator.cs	2010-10-08 12:04:40 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Canonical.UbuntuOne.Common.Win32;
+using Canonical.UbuntuOne.ProcessDispatcher;
+using log4net;
+using Microsoft.Win32;
+
+namespace Canonical.UbuntuOne.Common.Utils
+{
+    /// <summary>
+    /// Implementation of an IApplicationLocator that does know how to locate the U1 applictions.
+    /// </summary>
+    public class UbuntuOneApplicationLocator : IApplicationLocator
+    {
+        #region Variables
+
+        private readonly IRegistryKey _localMachineKey;
+        private string _installationPath;
+        private readonly object _installationPathLock = new object();
+        private ILog _logger;
+        private readonly object _loggerLock = new object();
+
+        #endregion
+
+        #region Constructors
+
+        public UbuntuOneApplicationLocator()
+            : this(new RegistryKeyWrapper(Registry.LocalMachine))
+        {
+
+        }
+        public UbuntuOneApplicationLocator(IRegistryKey registryKey)
+        {
+            _localMachineKey = registryKey;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets and sets the logger used by the class.
+        /// </summary>
+        internal ILog Logger
+        {
+            get
+            {
+                if (_logger == null)
+                {
+                    lock (_loggerLock)
+                    {
+                        _logger = LogManager.GetLogger(typeof(UbuntuOneApplicationLocator));
+                    }
+                }
+                return _logger;
+            }
+            set { _logger = value; }
+        }
+
+        #endregion
+
+        #region Helpers
+
+        private string InstallationPath
+        {
+            get
+            {
+                if (_installationPath == null)
+                {
+                    lock (_installationPathLock)
+                    {
+                        try
+                        {
+                            using (var softwareEntry = _localMachineKey.OpenSubKey("SOFTWARE"))
+                            using (var canonicalEntry = softwareEntry.OpenSubKey("Canonical"))
+                            using (var ubuntuOneEntry = canonicalEntry.OpenSubKey("UbuntuOne"))
+                            {
+                                _installationPath = (string)ubuntuOneEntry.GetValue("InstallationPath");
+                            }
+                        }
+                        catch (NullReferenceException e)
+                        {
+                            // thrown when we did not find the key, that is, not correct installation
+                            Logger.Error("Registry key HKLM/Software/Canonical/UbuntuOne is not present!!!");
+                            throw new ApplicationLocatorException("Registry key HKLM/Software/Canonical/UbuntuOne is not present!!!", e);
+                        }
+                    }
+                }
+                return _installationPath;
+            }
+        }
+        #endregion
+
+        #region Implementation of IApplicationLocator
+
+        /// <summary>
+        /// Returns a collecion with the names of the known application by the object.
+        /// </summary>
+        /// <returns>A string with all the different applications that the object knows how to locate.</returns>
+        public ICollection<string> GetKnownApplications()
+        {
+            return new[] { Constants.U1SyncAppName, Constants.U1DaemonAppName, Constants.U1ClientAppName };
+        }
+
+        /// <summary>
+        /// Returns the full path in the system of the application that mathces the given name.
+        /// </summary>
+        /// <param name="appName">The name of the application we want to locate.</param>
+        /// <returns>The full path of the application with the given name.</returns>
+        public string GetApplicationPath(string appName)
+        {
+            if (string.Compare(appName, Constants.U1SyncAppName, true) == 0)
+            {
+                var u1sync = Path.Combine(InstallationPath, "Client");
+                u1sync = Path.Combine(u1sync, "U1Sync");
+                return u1sync;
+            }
+            if (string.Compare(appName, Constants.U1DaemonAppName, true) == 0)
+            {
+                var u1daemon = Path.Combine(InstallationPath, "Daemon");
+                return u1daemon;
+            }
+            if(string.Compare(appName, Constants.U1ClientAppName, true) == 0)
+            {
+                var u1client = Path.Combine(InstallationPath, "Client");
+                return u1client;
+            }
+            throw new ApplicationLocatorException(string.Format("Application {0} is not known.", appName));
+        }
+
+        #endregion
+    }
+}
 
=== modified file 'src/Canonical.UbuntuOne.Common/objects.xml'
--- src/Canonical.UbuntuOne.Common/objects.xml	2010-10-05 10:14:44 +0000
+++ src/Canonical.UbuntuOne.Common/objects.xml	2010-10-08 12:04:40 +0000
@@ -45,6 +45,13 @@
   <object id="Application"
           type="Canonical.UbuntuOne.Common.Utils.ApplicationWrapper, Canonical.UbuntuOne.Common" />
 
+  <object id="ServiceCaller"
+            type="Canonical.UbuntuOne.Common.Net.ServiceCaller, Canonical.UbuntuOne.Common" />
+
+  <object id="ApplicationLocator"
+          type="Canonical.UbuntuOne.Common.Utils.UbuntuOneApplicationLocator, Canonical.UbuntuOne.Common"
+          autowire="autodetect"/>
+  
   <!-- ######################################################################################## -->
   <!--                             Net Objects                                                  -->
   <!-- ######################################################################################## -->
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/App.config'
--- src/Canonical.UbuntuOne.ProcessDispatcher/App.config	2010-08-18 09:49:09 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/App.config	2010-10-08 12:04:40 +0000
@@ -32,19 +32,10 @@
   
   <!-- Spring configuration -->
   <spring>
-    <parsers>
-      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
-    </parsers>
     <context>
       <resource uri="assembly://Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher/objects.xml" />
+      <resource uri="assembly://Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common/objects.xml" />
     </context>
-    <objects xmlns="http://www.springframework.net"
-             xmlns:db="http://www.springframework.net/database">
-      <!-- most internal objects definition is in the embeded objects.xml file here you will just find the db configuration -->
-      <db:provider id="DbProvider"
-                   provider="SQLite-1.0.65"
-                   connectionString="Data Source=UbuntuOne.db;Version=3;FailIfMissing=False;Compress=True"/>
-    </objects>
   </spring>
 
   <system.serviceModel>
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-10-06 10:43:02 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-10-08 12:04:40 +0000
@@ -6,7 +6,7 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D353509-C095-4E72-A693-3CEE97704C7D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>Canonical.UbuntuOne.ProcessDispatcher</RootNamespace>
     <AssemblyName>Canonical.UbuntuOne.ProcessDispatcher</AssemblyName>
     <FileUpgradeFlags>
@@ -30,6 +30,8 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -89,18 +91,14 @@
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
     </Compile>
+    <Compile Include="SyncDaemonWindowsService.cs">
+    </Compile>
     <Compile Include="CallerContext.cs" />
     <Compile Include="EventNotifier.cs" />
     <Compile Include="ICallerContext.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="ProjectInstaller.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="SyncConfigurationService.cs" />
     <Compile Include="SyncDaemonService.cs" />
-    <Compile Include="SyncDaemonWindowsService.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="SyncFileManagerService.cs" />
     <Compile Include="SyncFoldersService.cs" />
     <Compile Include="SyncSharesService.cs" />
@@ -128,13 +126,13 @@
       <HintPath>..\..\lib\Spring.Net\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\SQLite\System.Data.SQLite.DLL</HintPath>
     </Reference>
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Configuration.Install" />
     <Reference Include="System.ServiceModel">
     </Reference>
     <Reference Include="System.Core">
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Config/serviceModel.behaviours.config'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Config/serviceModel.behaviours.config	2010-07-26 15:57:10 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Config/serviceModel.behaviours.config	2010-10-08 12:04:40 +0000
@@ -2,7 +2,7 @@
 <behaviors>
   <serviceBehaviors>
     <behavior name="Canonical.UbuntuOne.ProcessDispatcher.DefaultBehavior">
-      <serviceMetadata httpGetEnabled="true" />
+      <serviceMetadata httpGetEnabled="false" />
       <serviceDebug includeExceptionDetailInFaults="true" />
     </behavior>
   </serviceBehaviors>
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Config/serviceModel.services.config'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Config/serviceModel.services.config	2010-07-26 15:57:10 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Config/serviceModel.services.config	2010-10-08 12:04:40 +0000
@@ -4,10 +4,10 @@
            name="SyncConfigurationService">
     <host>
       <baseAddresses>
-        <add baseAddress="http://localhost:8000/UbuntuOne/SyncConfigurationService"/>
+        <add baseAddress="net.pipe://localhost/UbuntuOne/SyncConfigurationService/$username$"/>
       </baseAddresses>
     </host>
-    <endpoint address="net.pipe://localhost/UbuntuOne/SyncConfigurationService"
+    <endpoint address="net.pipe://localhost/UbuntuOne/SyncConfigurationService/$username$"
               binding="netNamedPipeBinding"
               bindingConfiguration="namedPipeBinding"
               contract="Canonical.UbuntuOne.Common.ISyncConfiguration">
@@ -15,19 +15,16 @@
         <dns value="localhost" />
       </identity>
     </endpoint>
-    <endpoint address="mex"
-              binding="mexHttpBinding"
-              contract="IMetadataExchange" />
   </service>
 
   <service behaviorConfiguration="Canonical.UbuntuOne.ProcessDispatcher.DefaultBehavior"
            name="SyncDaemonService">
     <host>
       <baseAddresses>
-        <add baseAddress="http://localhost:8000/UbuntuOne/SyncDaemonService"/>
+        <add baseAddress="net.pipe://localhost/UbuntuOne/SyncDaemonService/$username$"/>
       </baseAddresses>
     </host>
-    <endpoint address="net.pipe://localhost/UbuntuOne/SyncDaemonService"
+    <endpoint address="net.pipe://localhost/UbuntuOne/SyncDaemonService/$username$"
               binding="netNamedPipeBinding"
               bindingConfiguration="namedPipeBinding"
               contract="Canonical.UbuntuOne.Common.ISyncDaemon">
@@ -35,19 +32,16 @@
         <dns value="localhost" />
       </identity>
     </endpoint>
-    <endpoint address="mex"
-              binding="mexHttpBinding"
-              contract="IMetadataExchange" />
   </service>
 
   <service behaviorConfiguration="Canonical.UbuntuOne.ProcessDispatcher.DefaultBehavior"
            name="SyncFileManagerService">
     <host>
       <baseAddresses>
-        <add baseAddress="http://localhost:8000/UbuntuOne/SyncFileManagerService"/>
+        <add baseAddress="net.pipe://localhost/UbuntuOne/SyncFileManagerService/$username$"/>
       </baseAddresses>
     </host>
-    <endpoint address="net.pipe://localhost/UbuntuOne/SyncFileManagerService"
+    <endpoint address="net.pipe://localhost/UbuntuOne/SyncFileManagerService/$username$"
               binding="netNamedPipeBinding"
               bindingConfiguration="namedPipeBinding"
               contract="Canonical.UbuntuOne.Common.ISyncFileManager">
@@ -55,19 +49,16 @@
         <dns value="localhost" />
       </identity>
     </endpoint>
-    <endpoint address="mex"
-              binding="mexHttpBinding"
-              contract="IMetadataExchange" />
   </service>
 
   <service behaviorConfiguration="Canonical.UbuntuOne.ProcessDispatcher.DefaultBehavior"
            name="SyncFoldersService">
     <host>
       <baseAddresses>
-        <add baseAddress="http://localhost:8000/UbuntuOne/SyncFoldersService"/>
+        <add baseAddress="net.pipe://localhost/UbuntuOne/SyncFoldersService/$username$"/>
       </baseAddresses>
     </host>
-    <endpoint address="net.pipe://localhost/UbuntuOne/SyncFoldersService"
+    <endpoint address="net.pipe://localhost/UbuntuOne/SyncFoldersService/$username$"
               binding="netNamedPipeBinding"
               bindingConfiguration="namedPipeBinding"
               contract="Canonical.UbuntuOne.Common.ISyncFolders">
@@ -75,19 +66,16 @@
         <dns value="localhost" />
       </identity>
     </endpoint>
-    <endpoint address="mex"
-              binding="mexHttpBinding"
-              contract="IMetadataExchange" />
   </service>
 
   <service behaviorConfiguration="Canonical.UbuntuOne.ProcessDispatcher.DefaultBehavior"
            name="SyncSharesService">
     <host>
       <baseAddresses>
-        <add baseAddress="http://localhost:8000/UbuntuOne/SyncSharesService"/>
+        <add baseAddress="net.pipe://localhost/UbuntuOne/SyncSharesService"/>
       </baseAddresses>
     </host>
-    <endpoint address="net.pipe://localhost/UbuntuOne/SyncSharesService"
+    <endpoint address="net.pipe://localhost/UbuntuOne/SyncSharesService/$username$"
               binding="netNamedPipeBinding"
               bindingConfiguration="namedPipeBinding"
               contract="Canonical.UbuntuOne.Common.ISyncShares">
@@ -95,8 +83,5 @@
         <dns value="localhost" />
       </identity>
     </endpoint>
-    <endpoint address="mex"
-              binding="mexHttpBinding"
-              contract="IMetadataExchange" />
   </service>
 </services>
 \ No newline at end of file
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Program.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Program.cs	2010-09-08 08:24:05 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Program.cs	2010-10-08 12:04:40 +0000
@@ -17,29 +17,63 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
-using System.ServiceProcess;
+using System;
 using Canonical.UbuntuOne.Common.Container;
+using Canonical.UbuntuOne.Common.Utils;
 using log4net;
 
 namespace Canonical.UbuntuOne.ProcessDispatcher
 {
-	static class Program
-	{
-	    private static ILog _logger = LogManager.GetLogger(typeof (Program));
-
-		/// <summary>
-		/// This method starts the service.
-		/// </summary>
-		static void Main()
-		{
-            _logger.Debug("Starting services.");
-            // use the IoC to get the implementation of the SyncDaemon service, the IoC will take care of 
-            // setting the object correctly.
-            ObjectsContainer.Initialize(new SpringContainer());
-            var syncDaemonWindowsService = ObjectsContainer.GetImplementationOf<SyncDaemonWindowsService>();
-            
-			// To run more than one service you have to add them here
-            ServiceBase.Run(new ServiceBase[] { syncDaemonWindowsService });
-		}
-	}
+
+    static class Program
+    {
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(Program));
+        private static readonly ConfigurationLocator _configLocator = new ConfigurationLocator();
+
+        /// <summary>
+        /// This method starts the service.
+        /// </summary>
+        static void Main()
+        {
+            // HACK: This technique is quite interesting although it is a hack. The idea is the following,
+            // due to the fact that we want to run a WCF service per user and not per machine, we have to be able 
+            // to determine at runtime the users pipe names. To do so we would use a config file per user
+            // but ofcourse we cannot do that at install time becuase we do not know all the user. 
+            //
+            // Ideally we would not have to do this hack and the ConfiguratonManager would allow to refrest the app
+            // condifuration, but it is not the case!! On top of that you cannot do so by using reflection :(
+            //
+            // The trick is simple, we use the normal app.config to start the program, once the program is started we create
+            // a new app domain where we will be doing all the work. Because we are the ones starting the app domain, we can
+            // tell him to use a diff configuration, which means that we poit to a new config for this user that points to
+            // the correct pipe names :D
+            // This is not cheap, now we have a dummy app domain, the one that start this program, and a second app domain that
+            // is used to load the spring context plus all the WCT setting. The SeriesAppDomain is the one that really does
+            // the job.
+            _logger.Debug("Redirecting configuration");
+
+            // Setup information for the new appdomain.
+            var setup = new AppDomainSetup
+            {
+                ConfigurationFile = _configLocator.GetCurrentUserDaemonConfiguration()
+            };
+
+            // Create the new appdomain with the new config.
+            var executionAppDomain = AppDomain.CreateDomain("ServicesAppDomain", AppDomain.CurrentDomain.Evidence, setup);
+
+            // Call the write config method in that appdomain.
+            executionAppDomain.DoCallBack(() =>
+            {
+                _logger.Debug("Starting services.");
+                // use the IoC to get the implementation of the SyncDaemon service, the IoC will take care of 
+                // setting the object correctly.
+                ObjectsContainer.Initialize(new SpringContainer());
+                var syncDaemonWindowsService = ObjectsContainer.GetImplementationOf<SyncDaemonWindowsService>();
+                // To run more than one service you have to add them here
+                syncDaemonWindowsService.Start();
+                while (true) ;
+            });
+
+        }
+    }
 }
 
=== removed file 'src/Canonical.UbuntuOne.ProcessDispatcher/ProjectInstaller.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher/ProjectInstaller.cs	2010-09-08 08:24:05 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/ProjectInstaller.cs	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010 Canonical Ltd.
- * 
- * This file is part of UbuntuOne on Windows.
- * 
- * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
- * it under the terms of the GNU Lesser General Public License version 		
- * as published by the Free Software Foundation.		
- *		
- * Ubuntu One on Windows is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
- * GNU Lesser General Public License for more details.	
- *
- * You should have received a copy of the GNU Lesser General Public License	
- * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Authors: Manuel de la Peña <[e-mail]>
- */
-using System.ComponentModel;
-using System.Configuration.Install;
-using System.ServiceProcess;
-
-namespace Canonical.UbuntuOne.ProcessDispatcher
-{
-    /// <summary>
-    /// Installer that will allows to set up the daemon when using the InnstalUtil application.
-    /// </summary>
-	[RunInstaller(true)]
-	public class ProjectInstaller : Installer
-	{
-		private readonly ServiceProcessInstaller _serviceProcessInstaller;
-		private readonly ServiceInstaller _serviceInstaller;
-		
-        /// <summary>
-        /// Creates a new instance of the installer.
-        /// </summary>
-		public ProjectInstaller()
-		{
-			_serviceProcessInstaller = new ServiceProcessInstaller();
-			_serviceInstaller = new ServiceInstaller();
-			// Here you can set properties on serviceProcessInstaller or register event handlers
-			_serviceProcessInstaller.Account = ServiceAccount.LocalService;
-			
-			_serviceInstaller.ServiceName = SyncDaemonWindowsService.MyServiceName;
-			Installers.AddRange(new Installer[] { _serviceProcessInstaller, _serviceInstaller });
-		}
-	}
-}
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs	2010-08-30 17:30:31 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs	2010-10-08 12:04:40 +0000
@@ -19,9 +19,13 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.ServiceModel;
 using Canonical.UbuntuOne.Common;
 using Canonical.UbuntuOne.Common.Aop;
 using Canonical.UbuntuOne.Common.Security;
+using Canonical.UbuntuOne.Common.Utils;
 using Canonical.UbuntuOne.Common.Validation;
 using log4net;
 
@@ -32,6 +36,7 @@
     /// </summary>
     internal class SyncDaemonService : ISyncDaemon
     {
+
         #region Variables
 
         // contains a map between user id and pid so that we know if the process is running already.
@@ -76,6 +81,12 @@
         /// </summary>
         internal IAuthentication Authentication { get; set; }
 
+        /// <summary>
+        /// Allows to get and set the application locator that can be used to find the required
+        /// external applications.
+        /// </summary>
+        internal IApplicationLocator ApplicationLocator { get; set; }
+
         #endregion
 
         public SyncDaemonService()
@@ -83,12 +94,12 @@
             _processesMap = new Dictionary<string, IProcessManager>();
         }
 
-
         /// <summary>
         /// Allows to start the daemon by a client.
         /// </summary>
         /// <exception cref="SyncDaemonException">Exception thrown when the process could not be started.</exception>
         [DebugLogged]
+        [OperationBehavior(Impersonation = ImpersonationOption.Allowed)]
         public void Start()
         {
             ValidateArgs.Begin()
@@ -135,7 +146,7 @@
                 Start();
                 return true;
             }
-            catch(SyncDaemonException)
+            catch (SyncDaemonException)
             {
                 return false;
             }
@@ -155,7 +166,7 @@
             if (Authentication.IsAuthenticated)
             {
                 var user = Authentication.Username;
-                if(_processesMap.ContainsKey(user))
+                if (_processesMap.ContainsKey(user))
                 {
                     // get the manager, stop the process and remove the info
                     var manager = _processesMap[user];
@@ -164,7 +175,7 @@
                         manager.Stop();
                         _processesMap.Remove(user);
                     }
-                    catch(ProcessManagementException ex)
+                    catch (ProcessManagementException ex)
                     {
                         var message = String.Format("Daemon for {0} could not be stoped: {1}", user, ex.Message);
                         throw new SyncDaemonException(message, ex);
@@ -189,7 +200,7 @@
                 Stop();
                 return true;
             }
-            catch(SyncDaemonException)
+            catch (SyncDaemonException)
             {
                 return false;
             }
@@ -204,6 +215,82 @@
         }
 
         /// <summary>
+        /// Allows to perform a manual sync of the root Ubuntu One directory in the provided path using the oauth information
+        /// passed to the service.
+        /// </summary>
+        /// <param name="path">The path to which the root of the Ubuntu One folder will be sync.</param>
+        /// <param name="token">The token from oauth.</param>
+        /// <param name="tokenSecret">The token secret from oauth.</param>
+        /// <param name="consumerKey">The consumer key from oauth.</param>
+        /// <param name="consumerSecret">The consumer secret from oauth.</param>
+        public void ManualSync(string path, string token, string tokenSecret, string consumerKey, string consumerSecret)
+        {
+            ValidateArgs.Begin()
+                .IsNotNullOrEmpty(path, "path")
+                .IsNotNullOrEmpty(token, "toke")
+                .IsNotNullOrEmpty(consumerKey, "consumerKey")
+                .IsNotNullOrEmpty(consumerSecret, "consumerSecret")
+                .Check();
+            // should always be executed befre the impersonation
+            var u1SyncPath = ApplicationLocator.GetApplicationPath(Constants.U1SyncAppName);
+            var tokens = string.Format("{0}:{1}:{2}:{3}", token, tokenSecret, consumerKey, consumerSecret);
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+            if (!Directory.Exists(Path.Combine(path, ".ubuntuone-sync")))
+            {
+                var initCommand = String.Format("{0} --init \"{1}\" --oauth {2}",
+                                                Path.Combine(u1SyncPath, "main.exe"),
+                                                path, tokens);
+                Logger.DebugFormat("Executing {0} as user {1}", initCommand,
+                                   ServiceSecurityContext.Current.WindowsIdentity.Name);
+
+                //init the directory
+                var init = new Process
+                {
+                    StartInfo =
+                    {
+                        WorkingDirectory = u1SyncPath,
+                        FileName = Path.Combine(u1SyncPath, "main.exe"),
+                        Arguments = String.Format(" --init \"{0}\" --oauth {1}", path, tokens),
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true,
+                        WindowStyle = ProcessWindowStyle.Hidden
+
+                    }
+                };
+                Logger.InfoFormat("Executing u1sync with args: {0}", init.StartInfo.Arguments);
+                init.Start();
+                init.WaitForExit();
+                Logger.InfoFormat("StandarOutput from u1sync is: {0}", init.StandardOutput.ReadToEnd());
+                Logger.ErrorFormat("StandardError from u1sync is: {0}", init.StandardError.ReadToEnd());
+                init.Close();
+
+            }
+            var syncCommand = String.Format("{0} --oauth {1}", Path.Combine(u1SyncPath, "main.exe"), tokens);
+            Logger.DebugFormat("Executing {0} as user {1}", syncCommand,
+                               ServiceSecurityContext.Current.WindowsIdentity.Name);
+            var proc = new Process
+            {
+                StartInfo =
+                {
+                    WorkingDirectory = u1SyncPath,
+                    FileName = Path.Combine(u1SyncPath, "main.exe"),
+                    Arguments = String.Format("\"{0}\" --oauth {1}", path, tokens),
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
+                }
+            };
+            proc.Start();
+        }
+
+        /// <summary>
         /// Returns the port number of the socket that the synd daemo is listening to for communication.
         /// </summary>
         /// <returns></returns>
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonWindowsService.cs'
--- src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonWindowsService.cs	2010-09-08 08:24:05 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonWindowsService.cs	2010-10-08 12:04:40 +0000
@@ -18,7 +18,6 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System.ServiceModel;
-using System.ServiceProcess;
 using Canonical.UbuntuOne.Common.Aop;
 using log4net;
 
@@ -29,7 +28,7 @@
     /// 
     /// This service is used to ensure that the sync daemon run sper user and allows to amange those processes.
     /// </summary>
-    public class SyncDaemonWindowsService : ServiceBase
+    public class SyncDaemonWindowsService
     {
         #region Variables
 
@@ -56,7 +55,7 @@
                 {
                     lock (_loggerLock)
                     {
-                        _logger = LogManager.GetLogger(typeof (SyncDaemonWindowsService));
+                        _logger = LogManager.GetLogger(typeof(SyncDaemonWindowsService));
                     }
                 }
                 return _logger;
@@ -114,36 +113,23 @@
                 SyncFileManager,
                 SyncFolders,
                 SyncShares
-            };    
+            };
         }
 
         #endregion
 
         /// <summary>
-        /// Creates a new instance of the sync daemon windows service.
-        /// </summary>
-        public SyncDaemonWindowsService()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            ServiceName = MyServiceName;
-        }
-
-        /// <summary>
         /// Start this service.
         /// </summary>
         [DebugLogged]
-        protected override void OnStart(string[] args)
+        public void Start()
         {
 
             foreach (var serviceHost in GetHosts())
             {
                 // make sure that it is close and reopen
                 Logger.InfoFormat("Host {0} state is {1}", serviceHost.BaseAddresses[0], serviceHost.State);
-                if(serviceHost.State == CommunicationState.Closed)
+                if (serviceHost.State == CommunicationState.Closed)
                     serviceHost.Open();
             }
             Logger.DebugFormat("{0} started.", MyServiceName);
@@ -153,11 +139,11 @@
         /// Stop this service.
         /// </summary>
         [DebugLogged]
-        protected override void OnStop()
+        public void Stop()
         {
             var hosts = GetHosts();
 
-            for (var index = 0; index < hosts.Length; index++ )
+            for (var index = 0; index < hosts.Length; index++)
             {
                 if (hosts[index] == null)
                 {
 
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/objects.xml'
--- src/Canonical.UbuntuOne.ProcessDispatcher/objects.xml	2010-09-28 08:41:33 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/objects.xml	2010-10-08 12:04:40 +0000
@@ -35,7 +35,7 @@
     <property name="attribute"
               value="Canonical.UbuntuOne.Common.Aop.DebugLoggedAttribute, Canonical.UbuntuOne.Common" />
   </object>
-
+  
   <!-- ###################################################################################################### -->
   <!-- Wcf services that will allows .Net languages to interact with the SyncDaemon                           -->
   <!-- ###################################################################################################### -->
@@ -43,19 +43,27 @@
 
   <!-- services -->
   <object id="SyncConfigurationService"
-          type="Canonical.UbuntuOne.ProcessDispatcher.SyncConfigurationService, Canonical.UbuntuOne.ProcessDispatcher" />
+          type="Canonical.UbuntuOne.ProcessDispatcher.SyncConfigurationService, Canonical.UbuntuOne.ProcessDispatcher"
+          autowire="autodetect"/>
 
   <object id="SyncDaemonService"
-          type="Canonical.UbuntuOne.ProcessDispatcher.SyncDaemonService, Canonical.UbuntuOne.ProcessDispatcher" />
+          type="Canonical.UbuntuOne.ProcessDispatcher.SyncDaemonService, Canonical.UbuntuOne.ProcessDispatcher"
+          autowire="autodetect">
+    <property name="ApplicationLocator"
+              ref="ApplicationLocator" />
+  </object>
 
   <object id="SyncFileManagerService"
-          type="Canonical.UbuntuOne.ProcessDispatcher.SyncFileManagerService, Canonical.UbuntuOne.ProcessDispatcher" />
+          type="Canonical.UbuntuOne.ProcessDispatcher.SyncFileManagerService, Canonical.UbuntuOne.ProcessDispatcher" 
+          autowire="autodetect"/>
 
   <object id="SyncFoldersService"
-          type="Canonical.UbuntuOne.ProcessDispatcher.SyncFoldersService, Canonical.UbuntuOne.ProcessDispatcher" />
+          type="Canonical.UbuntuOne.ProcessDispatcher.SyncFoldersService, Canonical.UbuntuOne.ProcessDispatcher" 
+          autowire="autodetect"/>
 
   <object id="SyncSharesService"
-          type="Canonical.UbuntuOne.ProcessDispatcher.SyncSharesService, Canonical.UbuntuOne.ProcessDispatcher" />
+          type="Canonical.UbuntuOne.ProcessDispatcher.SyncSharesService, Canonical.UbuntuOne.ProcessDispatcher" 
+          autowire="autodetect"/>
   
   <!-- hosts -->
 
 
=== modified file 'src/ServiceTestApp/Program.cs'
--- src/ServiceTestApp/Program.cs	2010-07-26 16:01:09 +0000
+++ src/ServiceTestApp/Program.cs	2010-10-08 12:04:40 +0000
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Canonical.UbuntuOne.Common.Container;
 using Canonical.UbuntuOne.ProcessDispatcher;
 
 
=== modified file 'src/UbuntuOne.sln'
--- src/UbuntuOne.sln	2010-10-06 10:43:02 +0000
+++ src/UbuntuOne.sln	2010-10-08 12:04:40 +0000
@@ -13,8 +13,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Canonical.UbuntuOne.Client.Views", "Canonical.UbuntuOne.Client.Views\Canonical.UbuntuOne.Client.Views.csproj", "{1B5BA61A-4B34-424A-886E-E2B0CF547D4D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTestApp", "ServiceTestApp\ServiceTestApp.csproj", "{009E6FD4-DE20-410A-B1F3-5F0542CD8745}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Canonical.UbuntuOne.Client.Test", "Canonical.UbuntuOne.Client.Test\Canonical.UbuntuOne.Client.Test.csproj", "{2947FCA2-D6FC-4509-83F8-64A87447EBD3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UbuntuOneClient", "UbuntuOneClient\UbuntuOneClient.csproj", "{E41083CC-B99A-4AEC-93CC-F693F6AA6071}"
@@ -104,16 +102,6 @@
 		{1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B5BA61A-4B34-424A-886E-E2B0CF547D4D}.Release|x86.ActiveCfg = Release|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Release|Any CPU.Build.0 = Release|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{009E6FD4-DE20-410A-B1F3-5F0542CD8745}.Release|x86.ActiveCfg = Release|Any CPU
 		{2947FCA2-D6FC-4509-83F8-64A87447EBD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2947FCA2-D6FC-4509-83F8-64A87447EBD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2947FCA2-D6FC-4509-83F8-64A87447EBD3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 
=== modified file 'src/UbuntuOneClient/App.config'
--- src/UbuntuOneClient/App.config	2010-10-05 15:20:36 +0000
+++ src/UbuntuOneClient/App.config	2010-10-08 12:04:40 +0000
@@ -29,6 +29,11 @@
       </factoryAdapter>
     </logging>
   </common>
+
+  <system.serviceModel>
+    <bindings configSource="Config\serviceModel.bindings.config"/>
+    <client configSource="Config\serviceModel.client.config"/>
+  </system.serviceModel>
   
   <spring>
     <context>
 
=== added file 'src/UbuntuOneClient/Config/serviceModel.bindings.config'
--- src/UbuntuOneClient/Config/serviceModel.bindings.config	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/Config/serviceModel.bindings.config	2010-10-08 12:04:40 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<bindings>
+  <!-- Named pipe binding provided to allow better performance that the wsHttpBinding -->
+  <netNamedPipeBinding>
+    <binding name="namedPipeBinding"
+             closeTimeout="00:01:00"
+             openTimeout="00:01:00"
+             receiveTimeout="00:10:00"
+             sendTimeout="00:01:00"
+             transactionFlow="false"
+             transferMode="Buffered"
+             transactionProtocol="OleTransactions"
+             hostNameComparisonMode="StrongWildcard"
+             maxBufferPoolSize="524288"
+             maxBufferSize="65536"
+             maxConnections="10"
+             maxReceivedMessageSize="65536">
+      <security mode="Transport">
+        <transport protectionLevel="EncryptAndSign" />
+      </security>
+    </binding>
+  </netNamedPipeBinding>
+</bindings>
 \ No newline at end of file
 
=== added file 'src/UbuntuOneClient/Config/serviceModel.client.config'
--- src/UbuntuOneClient/Config/serviceModel.client.config	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/Config/serviceModel.client.config	2010-10-08 12:04:40 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<client>
+  <endpoint name="configurationEndpoint"
+            address="net.pipe://localhost/UbuntuOne/SyncConfigurationService/$username$"
+            binding="netNamedPipeBinding"
+            bindingConfiguration="namedPipeBinding"
+            contract="Canonical.UbuntuOne.Common.ISyncConfiguration">
+  </endpoint>
+
+  <endpoint name="syncDaemonEndpoint"
+            address="net.pipe://localhost/UbuntuOne/SyncDaemonService/$username$"
+            binding="netNamedPipeBinding"
+            bindingConfiguration="namedPipeBinding"
+            contract="Canonical.UbuntuOne.Common.ISyncDaemon">
+  </endpoint>
+  
+  <endpoint name="fileManagerEndpoint"
+            address="net.pipe://localhost/UbuntuOne/SyncFileManagerService/$username$"
+            binding="netNamedPipeBinding"
+            bindingConfiguration="namedPipeBinding"
+            contract="Canonical.UbuntuOne.Common.ISyncFileManager">
+  </endpoint>
+
+  <endpoint name="syncFoldersEndpoint"
+            address="net.pipe://localhost/UbuntuOne/SyncFoldersService/$username$"
+            binding="netNamedPipeBinding"
+            bindingConfiguration="namedPipeBinding"
+            contract="Canonical.UbuntuOne.Common.ISyncFolders">
+  </endpoint>
+
+  <endpoint name="syncSharesEndpoint"
+            address="net.pipe://localhost/UbuntuOne/SyncSharesService/$username$"
+            binding="netNamedPipeBinding"
+            bindingConfiguration="namedPipeBinding"
+            contract="Canonical.UbuntuOne.Common.ISyncShares">
+  </endpoint>
+  
+</client>
 \ No newline at end of file
 
=== modified file 'src/UbuntuOneClient/Program.cs'
--- src/UbuntuOneClient/Program.cs	2010-09-09 09:11:07 +0000
+++ src/UbuntuOneClient/Program.cs	2010-10-08 12:04:40 +0000
@@ -39,6 +39,7 @@
         private INotificationIconView _notifyIcon;
         private readonly object _notifyIconLock = new object();
         private Thread _updatesThread;
+        private static readonly ConfigurationLocator _configLocator = new ConfigurationLocator();
 
         #region DI Properties for testability
 
@@ -148,10 +149,40 @@
         [STAThread]
         static void Main()
         {
+            // HACK: This technique is quite interesting although it is a hack. The idea is the following,
+            // due to the fact that we want to run a WCF service per user and not per machine, we have to be able 
+            // to determine at runtime the users pipe names. To do so we would use a config file per user
+            // but ofcourse we cannot do that at install time becuase we do not know all the user. 
+            //
+            // Ideally we would not have to do this hack and the ConfiguratonManager would allow to refrest the app
+            // condifuration, but it is not the case!! On top of that you cannot do so by using reflection :(
+            //
+            // The trick is simple, we use the normal app.config to start the program, once the program is started we create
+            // a new app domain where we will be doing all the work. Because we are the ones starting the app domain, we can
+            // tell him to use a diff configuration, which means that we poit to a new config for this user that points to
+            // the correct pipe names :D
+            // This is not cheap, now we have a dummy app domain, the one that start this program, and a second app domain that
+            // is used to load the spring context plus all the WCT setting. The SeriesAppDomain is the one that really does
+            // the job.
+            _logger.Info("Updating config");
             // init the objects container
-            ObjectsContainer.Initialize(new SpringContainer());
-            var program = ObjectsContainer.GetImplementationOf<Program>();
-            program.StartApplication();
+            // Setup information for the new appdomain.
+            var setup = new AppDomainSetup
+            {
+                ConfigurationFile = _configLocator.GetCurrentUserClientConfiguration()
+            };
+
+            // Create the new appdomain with the new config.
+            var executionAppDomain = AppDomain.CreateDomain("ClientAppDomain", AppDomain.CurrentDomain.Evidence, setup);
+
+            // Call the write config method in that appdomain.
+            executionAppDomain.DoCallBack(() =>
+            {
+                ObjectsContainer.Initialize(new SpringContainer());
+                var program = ObjectsContainer.GetImplementationOf<Program>();
+                program.StartApplication();
+            });
+            
         }
     }
 }
 
=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj	2010-10-06 08:48:18 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj	2010-10-08 12:04:40 +0000
@@ -51,6 +51,9 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.ServiceModel">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -90,6 +93,12 @@
     <None Include="Config\log4net.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Config\serviceModel.bindings.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Config\serviceModel.client.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
 
=== modified file 'src/UbuntuOneClient/objects.xml'
--- src/UbuntuOneClient/objects.xml	2010-09-28 08:41:33 +0000
+++ src/UbuntuOneClient/objects.xml	2010-10-08 12:04:40 +0000
@@ -56,4 +56,38 @@
     <property name="Application"
               ref="Application" />
   </object>
+
+  <!-- ############################################################### -->
+  <!-- WCF services configuration                                      -->
+  <!-- ############################################################### -->
+
+  <object id="ConfigurationChannelFactory"
+          type="System.ServiceModel.ChannelFactory&lt;Canonical.UbuntuOne.Common.ISyncConfiguration>, System.ServiceModel">
+    <constructor-arg name="endpointConfigurationName"
+                     value="configurationEndpoint" />
+  </object>
+
+  <object id="SyncDaemonChannelFactory"
+          type="System.ServiceModel.ChannelFactory&lt;Canonical.UbuntuOne.Common.ISyncDaemon>, System.ServiceModel">
+    <constructor-arg name="endpointConfigurationName"
+                     value="syncDaemonEndpoint" />
+  </object>
+  
+  <object id="FileManagerChannelFactory"
+          type="System.ServiceModel.ChannelFactory&lt;Canonical.UbuntuOne.Common.ISyncFileManager>, System.ServiceModel">
+    <constructor-arg name="endpointConfigurationName"
+                     value="fileManagerEndpoint" />
+  </object>
+  
+  <object id="SyncFoldersChannelFactory"
+          type="System.ServiceModel.ChannelFactory&lt;Canonical.UbuntuOne.Common.ISyncFolders>, System.ServiceModel">
+    <constructor-arg name="endpointConfigurationName"
+                     value="syncFoldersEndpoint" />
+  </object>
+  
+  <object id="SyncSharesChannelFactory"
+          type="System.ServiceModel.ChannelFactory&lt;Canonical.UbuntuOne.Common.ISyncShares>, System.ServiceModel">
+    <constructor-arg name="endpointConfigurationName"
+                     value="syncSharesEndpoint" />
+  </object>
 </objects>
 \ No newline at end of file