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

[Manuel de la Peña]

Provides the IoC Spring configuration to be used in the Canonical.Ubuntu.SSO assembly.

[John Lenton (chipaca)]

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj'
--- src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-05 10:23:40 +0000
+++ src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-05 10:23:41 +0000
@@ -127,6 +127,9 @@
       <Name>Canonical.UbuntuOne.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="objects.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

=== modified file 'src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs'
--- src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs	2010-10-05 10:23:40 +0000
+++ src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs	2010-10-05 10:23:41 +0000
@@ -18,7 +18,6 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
-using System.Collections.Generic;
 using Canonical.UbuntuOne.Common.Aop;
 
 namespace Canonical.Ubuntu.SSO

=== added file 'src/Canonical.Ubuntu.SSO/objects.xml'
--- src/Canonical.Ubuntu.SSO/objects.xml	1970-01-01 00:00:00 +0000
+++ src/Canonical.Ubuntu.SSO/objects.xml	2010-10-05 10:23:41 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <object id="Authentications"
+          type="Canonical.Ubuntu.SSO.Service.Authentications , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+
+  <object id="DataProtector"
+          type="Canonical.Ubuntu.SSO.DPAPIDataProtector , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+  
+  <object id="Keyring"
+          type="Canonical.Ubuntu.SSO.Keyring , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+  
+  <!-- Use the json encoder since it is less error prone -->
+  
+  <object id="SSOCredentialsEncoder"
+          type="Canonical.Ubuntu.SSO.JsonSSOCredentialsEncoder , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+
+  <object id="OAuth"
+          type="Canonical.Ubuntu.SSO.OAuth , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+  
+  <!-- The actual interesting objects to perform the SSO -->
+
+  <object id="SSOLoginProcessor"
+          type="Canonical.Ubuntu.SSO.SSOLoginProcessor , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+
+
+  <object id="SSOCredentialsProvider"
+          type="Canonical.Ubuntu.SSO.SSOCredentialsProvider , Canonical.Ubuntu.SSO"
+          autowire="autodetect"/>
+  
+</objects>
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Common/objects.xml'
--- src/Canonical.UbuntuOne.Common/objects.xml	2010-08-19 16:54:46 +0000
+++ src/Canonical.UbuntuOne.Common/objects.xml	2010-10-05 10:23:41 +0000
@@ -44,6 +44,13 @@
 
   <object id="Application"
           type="Canonical.UbuntuOne.Common.Utils.ApplicationWrapper, Canonical.UbuntuOne.Common" />
+
+  <!-- ######################################################################################## -->
+  <!--                             Net Objects                                                  -->
+  <!-- ######################################################################################## -->
+
+  <object id="HttpWebRequestFactory"
+          type="Canonical.UbuntuOne.Common.Net.HttpWebRequestFactory, Canonical.UbuntuOne.Common" />
   
 </objects>
   
\ No newline at end of file

=== modified file 'src/UbuntuOneClient/App.config'
--- src/UbuntuOneClient/App.config	2010-09-16 16:15:32 +0000
+++ src/UbuntuOneClient/App.config	2010-10-05 10:23:41 +0000
@@ -33,6 +33,7 @@
   <spring>
     <context>
       <resource uri="assembly://UbuntuOneClient/UbuntuOneClient/objects.xml" />
+      <resource uri="assembly://Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO/objects.xml" />
       <resource uri="assembly://Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client/objects.xml" />
       <resource uri="assembly://Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views/objects.xml" />
       <resource uri="assembly://Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common/objects.xml" />

=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj	2010-08-09 16:15:16 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj	2010-10-05 10:23:41 +0000
@@ -96,6 +96,10 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Canonical.Ubuntu.SSO\Canonical.Ubuntu.SSO.csproj">
+      <Project>{9460A771-2589-45DA-9618-9FE8BB7D16E8}</Project>
+      <Name>Canonical.Ubuntu.SSO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Canonical.UbuntuOne.Client.Views\Canonical.UbuntuOne.Client.Views.csproj">
       <Project>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</Project>
       <Name>Canonical.UbuntuOne.Client.Views</Name>