Skip to content

Commit

Permalink
#50. Final touch up for JenkinsTray.
Browse files Browse the repository at this point in the history
  • Loading branch information
zionyx committed Sep 15, 2015
1 parent 90ce5da commit 532c40f
Show file tree
Hide file tree
Showing 75 changed files with 163 additions and 163 deletions.
2 changes: 1 addition & 1 deletion JenkinsTray.Tests/Utils/StringUtilsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Text;
using NUnit.Framework;
using Jenkins.Tray.Utils;
using JenkinsTray.Utils;

namespace JenkinsTray.Tests.Utils
{
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</common>
<spring>
<context type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
<resource uri="assembly://JenkinsTray/Jenkins.Tray/Configuration.xml"/>
<resource uri="assembly://JenkinsTray/JenkinsTray/Configuration.xml"/>
</context>
</spring>
</configuration>
8 changes: 4 additions & 4 deletions JenkinsTray/BusinessComponents/AllServersStatus.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Collections.Generic;
using Jenkins.Tray.Entities;
using Jenkins.Tray.Utils;
using Jenkins.Tray.Utils.Collections;
using JenkinsTray.Entities;
using JenkinsTray.Utils;
using JenkinsTray.Utils.Collections;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class AllServersStatus
{
Expand Down
8 changes: 4 additions & 4 deletions JenkinsTray/BusinessComponents/ApplicationUpdateService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
using Common.Logging;
using System.Reflection;
using System.Threading;
using Jenkins.Tray.Utils.Logging;
using JenkinsTray.Utils.Logging;
using System.ComponentModel;
using System.Net;
using Jenkins.Tray.Utils.IO;
using Jenkins.Tray.Utils.Collections;
using JenkinsTray.Utils.IO;
using JenkinsTray.Utils.Collections;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class ApplicationUpdateService
{
Expand Down
6 changes: 3 additions & 3 deletions JenkinsTray/BusinessComponents/ClaimService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
using System.IO;
using System.Runtime.Serialization.Json;
using System.Web;
using Jenkins.Tray.Entities;
using Jenkins.Tray.Utils;
using JenkinsTray.Entities;
using JenkinsTray.Utils;
using System.Xml;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class ClaimService
{
Expand Down
6 changes: 3 additions & 3 deletions JenkinsTray/BusinessComponents/ConfigurationService.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using Jenkins.Tray.Entities;
using JenkinsTray.Entities;
using Iesi.Collections.Generic;
using Jenkins.Tray.Utils.IO;
using JenkinsTray.Utils.IO;
using System.IO;
using System.Reflection;
using Common.Logging;
using Newtonsoft.Json;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class ConfigurationService
{
Expand Down
10 changes: 5 additions & 5 deletions JenkinsTray/BusinessComponents/JenkinsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
using System.Net;
using System.Web;
using System.Xml;
using Jenkins.Tray.Entities;
using Jenkins.Tray.Utils;
using JenkinsTray.Entities;
using JenkinsTray.Utils;
using Common.Logging;
using System.Reflection;
using Jenkins.Tray.Utils.Logging;
using JenkinsTray.Utils.Logging;
using Iesi.Collections.Generic;
using Jenkins.Tray.Utils.Web;
using JenkinsTray.Utils.Web;
using System.Threading;
using System.Security.Cryptography.X509Certificates;
using System.Net.Security;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class JenkinsService
{
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/BusinessComponents/NotificationService.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.ComponentModel;
using Jenkins.Tray.Entities;
using JenkinsTray.Entities;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class NotificationService : Component
{
Expand Down
6 changes: 3 additions & 3 deletions JenkinsTray/BusinessComponents/ProjectsUpdateService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using System.Threading;
using Common.Logging;
using System.Reflection;
using Jenkins.Tray.Entities;
using JenkinsTray.Entities;
using System.ComponentModel;
using Jenkins.Tray.Utils.Logging;
using JenkinsTray.Utils.Logging;
using Iesi.Collections.Generic;
using Amib.Threading;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public class ProjectsUpdateService
{
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/BusinessComponents/SoundPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Common.Logging;
using System.Reflection;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
public static class SoundPlayer
{
Expand Down
28 changes: 14 additions & 14 deletions JenkinsTray/Configuration.xml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8" ?>
<objects xmlns="http://www.springframework.net">

<object id="NotificationSettings" type="Jenkins.Tray.Entities.NotificationSettings"/>
<object id="GeneralSettings" type="Jenkins.Tray.Entities.GeneralSettings"/>
<object id="NotificationSettings" type="JenkinsTray.Entities.NotificationSettings"/>
<object id="GeneralSettings" type="JenkinsTray.Entities.GeneralSettings"/>

<object id="ConfigurationService" type="Jenkins.Tray.BusinessComponents.ConfigurationService" autowire="byType" init-method="Initialize"/>
<object id="JenkinsService" type="Jenkins.Tray.BusinessComponents.JenkinsService" autowire="byType"/>
<object id="ProjectsUpdateService" type="Jenkins.Tray.BusinessComponents.ProjectsUpdateService" autowire="byType" init-method="Initialize"/>
<object id="ApplicationUpdateService" type="Jenkins.Tray.BusinessComponents.ApplicationUpdateService" autowire="byType" init-method="Initialize"/>
<object id="NotificationService" type="Jenkins.Tray.BusinessComponents.NotificationService" autowire="byType" init-method="Initialize"/>
<object id="ClaimService" type="Jenkins.Tray.BusinessComponents.ClaimService" autowire="byType"/>
<object id="ConfigurationService" type="JenkinsTray.BusinessComponents.ConfigurationService" autowire="byType" init-method="Initialize"/>
<object id="JenkinsService" type="JenkinsTray.BusinessComponents.JenkinsService" autowire="byType"/>
<object id="ProjectsUpdateService" type="JenkinsTray.BusinessComponents.ProjectsUpdateService" autowire="byType" init-method="Initialize"/>
<object id="ApplicationUpdateService" type="JenkinsTray.BusinessComponents.ApplicationUpdateService" autowire="byType" init-method="Initialize"/>
<object id="NotificationService" type="JenkinsTray.BusinessComponents.NotificationService" autowire="byType" init-method="Initialize"/>
<object id="ClaimService" type="JenkinsTray.BusinessComponents.ClaimService" autowire="byType"/>

<object id="ApplicationUpdateHandler" type="Jenkins.Tray.Utils.ApplicationUpdateHandler" autowire="byType" init-method="Initialize"/>
<object id="ApplicationUpdateHandler" type="JenkinsTray.Utils.ApplicationUpdateHandler" autowire="byType" init-method="Initialize"/>

<object id="MainForm" type="Jenkins.Tray.UI.MainForm">
<object id="MainForm" type="JenkinsTray.UI.MainForm">
<property name="ConfigurationService" ref="ConfigurationService"/>
<property name="JenkinsService" ref="JenkinsService"/>
<property name="ProjectsUpdateService" ref="ProjectsUpdateService"/>
<property name="ApplicationUpdateService" ref="ApplicationUpdateService"/>
</object>
<object id="AboutForm" type="Jenkins.Tray.UI.AboutForm"/>
<object id="AuthenticationTokenForm" type="Jenkins.Tray.UI.AuthenticationTokenForm"/>
<object id="SettingsForm" type="Jenkins.Tray.UI.SettingsForm">
<object id="AboutForm" type="JenkinsTray.UI.AboutForm"/>
<object id="AuthenticationTokenForm" type="JenkinsTray.UI.AuthenticationTokenForm"/>
<object id="SettingsForm" type="JenkinsTray.UI.SettingsForm">
<property name="ConfigurationService" ref="ConfigurationService"/>
<property name="JenkinsService" ref="JenkinsService"/>
</object>
<object id="TrayNotifier" type="Jenkins.Tray.UI.TrayNotifier" init-method="Initialize">
<object id="TrayNotifier" type="JenkinsTray.UI.TrayNotifier" init-method="Initialize">
<property name="ConfigurationService" ref="ConfigurationService"/>
<property name="JenkinsService" ref="JenkinsService"/>
<property name="UpdateService" ref="ProjectsUpdateService"/>
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/AllBuildDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public class AllBuildDetails
{
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/BuildCause.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Xml;
using Iesi.Collections.Generic;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public enum BuildCauseEnum
{
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/BuildDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Diagnostics;
using Iesi.Collections.Generic;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
[DebuggerDisplay("BuildNumber={Number}, Result={Result}")]
public class BuildDetails
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/BuildStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using System.Diagnostics;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public enum BuildStatusEnum
{
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/BuildTransition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Windows.Forms;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public class BuildTransition
{
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/ClaimDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using Iesi.Collections.Generic;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public class ClaimDetails
{
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/Entities/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using System.Text;
using Iesi.Collections.Generic;
using Newtonsoft.Json;
using Jenkins.Tray.Utils.Serialization;
using JenkinsTray.Utils.Serialization;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
[JsonObject(MemberSerialization.OptIn)]
public class Configuration
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/Credentials.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public class Credentials
{
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/Entities/GeneralSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Linq;
using System.Text;
using Newtonsoft.Json;
using Jenkins.Tray.BusinessComponents;
using JenkinsTray.BusinessComponents;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
[JsonObject(MemberSerialization.OptIn)]
public class GeneralSettings
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/NotificationSettings.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Newtonsoft.Json;
namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
[JsonObject(MemberSerialization.OptIn)]
public class NotificationSettings
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Entities/Project.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text;
using Newtonsoft.Json;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
[JsonObject(MemberSerialization.OptIn)]
public class Project : IComparable<Project>
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/Entities/ProjectActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Diagnostics;
using Common.Logging;
using System.Reflection;
using Jenkins.Tray.Utils;
using JenkinsTray.Utils;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
public class CaptionAndMessage
{
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/Entities/Server.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Text;
using Iesi.Collections.Generic;
using Newtonsoft.Json;
using Jenkins.Tray.Utils.Serialization;
using JenkinsTray.Utils.Serialization;

namespace Jenkins.Tray.Entities
namespace JenkinsTray.Entities
{
[JsonObject(MemberSerialization.OptIn)]
public class Server
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/JenkinsTray.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<ProjectGuid>{A54602CA-6823-4F2C-870F-1D464D9F4814}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Jenkins.Tray</RootNamespace>
<RootNamespace>JenkinsTray</RootNamespace>
<AssemblyName>JenkinsTray</AssemblyName>
<StartupObject>Jenkins.Tray.Program</StartupObject>
<StartupObject>JenkinsTray.Program</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
Expand Down
4 changes: 2 additions & 2 deletions JenkinsTray/JenkinsTrayResources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
using Jenkins.Tray.Entities;
using JenkinsTray.Entities;
using Iesi.Collections.Generic;
using Jenkins.Tray.Utils.IO;
using JenkinsTray.Utils.IO;
using System.IO;
using System.Reflection;
using Common.Logging;

namespace Jenkins.Tray.BusinessComponents
namespace JenkinsTray.BusinessComponents
{
[Obsolete]
public class LegacyConfigurationService
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Legacy/Collections/DualPropertiesContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;

namespace Jenkins.Tray.Utils.Collections
namespace JenkinsTray.Utils.Collections
{
[Obsolete]
public class DualPropertiesContainer : IPropertiesContainer
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Legacy/Collections/IPropertiesContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.IO;
using System.Reflection;

namespace Jenkins.Tray.Utils.Collections
namespace JenkinsTray.Utils.Collections
{
// reads a properties file
[Obsolete]
Expand Down
2 changes: 1 addition & 1 deletion JenkinsTray/Legacy/Collections/PropertiesContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.Globalization;
using System.Text.RegularExpressions;

namespace Jenkins.Tray.Utils.Collections
namespace JenkinsTray.Utils.Collections
{
// reads a properties file
[Obsolete]
Expand Down
Loading

0 comments on commit 532c40f

Please sign in to comment.