Ubuntu One Windows Installer

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

  1. systray_integrate_spring
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Stuart Colville
Approved revision: 48
Merged at revision: 45
Proposed branch: lp:~mandel/ubuntuone-windows-installer/systray_integrate_spring
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/systray_icon_core
Diff against target: 148 lines (+84/-1)
5 files modified
src/UbuntuOneClient/App.config (+23/-0)
src/UbuntuOneClient/Config/log4net.config (+29/-0)
src/UbuntuOneClient/Program.cs (+7/-1)
src/UbuntuOneClient/UbuntuOneClient.csproj (+19/-0)
src/UbuntuOneClient/objects.xml (+6/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/systray_integrate_spring
Reviewer Review Type Date Requested Status
Stuart Colville (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+31123@code.launchpad.net

Description of the change

This branch adds the use of Spring.Net as the IoC used in the client (NotifyIcon).

To post a comment you must log in.
lp:~mandel/ubuntuone-windows-installer/systray_integrate_spring updated
48. By Manuel de la Peña

Adapt the name of the log file used.

Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
Stuart Colville (muffinresearch) wrote :

Few warnings:

  [msbuild] (CoreCompile target) ->
  [msbuild] Notification\NotificationIconPresenter.cs(50,58): warning CS0067:
The event 'Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter.OnN
otificationChanged' is never used
  [msbuild] Notification\NotificationIconPresenter.cs(51,51): warning CS0067:
The event 'Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter.OnS
tateChanged' is never used
  [msbuild] Notification\NotificationIconPresenter.cs(52,67): warning CS0067:
The event 'Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter.OnC
ompletenessChanged' is never used
  [msbuild] Notification\NotificationIconPresenter.cs(53,62): warning CS0067:
The event 'Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter.OnR
ecentlyModifiedChanged' is never used
  [msbuild]
  [msbuild] 4 Warning(s)
  [msbuild] 0 Error(s)
  [msbuild]
  [msbuild] Time Elapsed 00:00:17.95

BUILD SUCCEEDED

Otherwise builds and tests ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'src/UbuntuOneClient/App.config'
--- src/UbuntuOneClient/App.config 1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/App.config 2010-07-28 07:58:44 +0000
@@ -0,0 +1,23 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <sectionGroup name="spring">
5 <section name="parsers"
6 type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
7 <section name="context"
8 type="Spring.Context.Support.ContextHandler, Spring.Core"/>
9 <section name="objects"
10 type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
11 </sectionGroup>
12 <sectionGroup name="common">
13 <section name="logging"
14 type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
15 </sectionGroup>
16 </configSections>
17 <spring>
18 <context>
19 <resource uri="assembly://UbuntuOneClient/UbuntuOneClient/objects.xml" />
20 </context>
21
22 </spring>
23</configuration>
0\ No newline at end of file24\ No newline at end of file
125
=== added directory 'src/UbuntuOneClient/Config'
=== added file 'src/UbuntuOneClient/Config/log4net.config'
--- src/UbuntuOneClient/Config/log4net.config 1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/Config/log4net.config 2010-07-28 07:58:44 +0000
@@ -0,0 +1,29 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<log4net>
3 <appender name="RollingFileAppender"
4 type="log4net.Appender.RollingFileAppender">
5 <file value="Logs/Client.log" />
6 <appendToFile value="true" />
7 <rollingStyle value="Size" />
8 <maxSizeRollBackups value="10" />
9 <maximumFileSize value="2MB" />
10 <staticLogFileName value="true" />
11 <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
12 <layout type="log4net.Layout.PatternLayout">
13 <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} [%4thread] [%5level] %logger - %message%newline" />
14 </layout>
15 </appender>
16
17 <root>
18 <level value="ALL" />
19 <appender-ref ref="RollingFileAppender" />
20 </root>
21 <logger name="Spring">
22 <level value="WARN" />
23 <appender-ref ref="RollingFileAppender" />
24 </logger>
25 <logger name="NHibernate">
26 <level value="WARN" />
27 <appender-ref ref="RollingFileAppender" />
28 </logger>
29</log4net>
0\ No newline at end of file30\ No newline at end of file
131
=== modified file 'src/UbuntuOneClient/Program.cs'
--- src/UbuntuOneClient/Program.cs 2010-07-28 07:58:44 +0000
+++ src/UbuntuOneClient/Program.cs 2010-07-28 07:58:44 +0000
@@ -20,16 +20,22 @@
20using System;20using System;
21using System.Windows;21using System.Windows;
22using Canonical.UbuntuOne.Client.Views;22using Canonical.UbuntuOne.Client.Views;
23using Canonical.UbuntuOne.Common.Container;
24using log4net;
2325
24namespace UbuntuOneClient26namespace UbuntuOneClient
25{27{
26 class Program28 class Program
27 {29 {
30 private static ILog _logger = LogManager.GetLogger(typeof(Program));
31
28 [STAThread]32 [STAThread]
29 static void Main()33 static void Main()
30 {34 {
35 _logger.Debug("Starting client application.");
36 ObjectsContainer.Initialize(new SpringContainer());
37 var notifyIcon = ObjectsContainer.GetImplementationOf<UbuntuOneNotifyIcon>();
31 var app = new Application {ShutdownMode = ShutdownMode.OnExplicitShutdown};38 var app = new Application {ShutdownMode = ShutdownMode.OnExplicitShutdown};
32 var notifyIcon = new UbuntuOneNotifyIcon();
33 app.Run(notifyIcon);39 app.Run(notifyIcon);
34 }40 }
35 }41 }
3642
=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj 2010-07-28 07:58:44 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj 2010-07-28 07:58:44 +0000
@@ -37,6 +37,14 @@
37 <SpecificVersion>False</SpecificVersion>37 <SpecificVersion>False</SpecificVersion>
38 <HintPath>..\..\lib\WPFContrib\AvalonLibrary.dll</HintPath>38 <HintPath>..\..\lib\WPFContrib\AvalonLibrary.dll</HintPath>
39 </Reference>39 </Reference>
40 <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
41 <SpecificVersion>False</SpecificVersion>
42 <HintPath>..\..\lib\Spring.Net\Common.Logging.Log4Net.dll</HintPath>
43 </Reference>
44 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
45 <SpecificVersion>False</SpecificVersion>
46 <HintPath>..\..\lib\log4net\log4net.dll</HintPath>
47 </Reference>
40 <Reference Include="System" />48 <Reference Include="System" />
41 <Reference Include="System.Core">49 <Reference Include="System.Core">
42 <RequiredTargetFramework>3.5</RequiredTargetFramework>50 <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -73,6 +81,10 @@
73 <LastGenOutput>Resources.Designer.cs</LastGenOutput>81 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
74 <SubType>Designer</SubType>82 <SubType>Designer</SubType>
75 </EmbeddedResource>83 </EmbeddedResource>
84 <None Include="App.config" />
85 <None Include="Config\log4net.config">
86 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
87 </None>
76 <None Include="Properties\Settings.settings">88 <None Include="Properties\Settings.settings">
77 <Generator>SettingsSingleFileGenerator</Generator>89 <Generator>SettingsSingleFileGenerator</Generator>
78 <LastGenOutput>Settings.Designer.cs</LastGenOutput>90 <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -84,6 +96,13 @@
84 <Project>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</Project>96 <Project>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</Project>
85 <Name>Canonical.UbuntuOne.Client.Views</Name>97 <Name>Canonical.UbuntuOne.Client.Views</Name>
86 </ProjectReference>98 </ProjectReference>
99 <ProjectReference Include="..\Canonical.UbuntuOne.Common\Canonical.UbuntuOne.Common.csproj">
100 <Project>{11353FF8-8E5A-488E-9CB1-873DADD232B9}</Project>
101 <Name>Canonical.UbuntuOne.Common</Name>
102 </ProjectReference>
103 </ItemGroup>
104 <ItemGroup>
105 <EmbeddedResource Include="objects.xml" />
87 </ItemGroup>106 </ItemGroup>
88 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />107 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
89 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 108 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
90109
=== added file 'src/UbuntuOneClient/objects.xml'
--- src/UbuntuOneClient/objects.xml 1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/objects.xml 2010-07-28 07:58:44 +0000
@@ -0,0 +1,6 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<objects xmlns="http://www.springframework.net">
3 <!-- Define window that will be used as the start point of the app -->
4 <object id="UbuntuOneNotifyIcon"
5 type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" />
6</objects>
0\ No newline at end of file7\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: