From 8956f6ff4a44284957623310bc48be558ecd529f Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Tue, 26 Feb 2013 16:40:05 -0500 Subject: [PATCH 1/2] Move ResourcePool to common --- .../MediaBrowser.Common.Implementations.csproj | 3 +++ .../Library => MediaBrowser.Common/Kernel}/ResourcePool.cs | 4 ++-- MediaBrowser.Common/MediaBrowser.Common.csproj | 1 + MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) rename {MediaBrowser.Controller/Library => MediaBrowser.Common/Kernel}/ResourcePool.cs (97%) diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index 44b4e7df76..6f28a6c9a2 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -162,6 +162,9 @@ + + + diff --git a/MediaBrowser.Controller/Library/ResourcePool.cs b/MediaBrowser.Common/Kernel/ResourcePool.cs similarity index 97% rename from MediaBrowser.Controller/Library/ResourcePool.cs rename to MediaBrowser.Common/Kernel/ResourcePool.cs index 3e4d532041..8a2ab8af8e 100644 --- a/MediaBrowser.Controller/Library/ResourcePool.cs +++ b/MediaBrowser.Common/Kernel/ResourcePool.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Threading; -namespace MediaBrowser.Controller.Library +namespace MediaBrowser.Common.Kernel { /// /// This is just a collection of semaphores to control the number of concurrent executions of various resources diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index a10f36da00..709d6c0165 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -95,6 +95,7 @@ + diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index ff2bcb213f..6ab70f47c1 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -177,7 +177,6 @@ - From 4c1c7178241b664ccbf6afcef164fbf1e5128529 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Tue, 26 Feb 2013 16:48:43 -0500 Subject: [PATCH 2/2] Move ResourcePools to BaseKernel/IKernel --- MediaBrowser.Common/Kernel/BaseKernel.cs | 7 +++++++ MediaBrowser.Common/Kernel/IKernel.cs | 6 ++++++ MediaBrowser.Controller/Kernel.cs | 6 ------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 184cef98b8..962c740c3d 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -455,5 +455,12 @@ namespace MediaBrowser.Common.Kernel { return GetXmlConfiguration(typeof(T), path) as T; } + + /// + /// Limits simultaneous access to various resources + /// + /// The resource pools. + public ResourcePool ResourcePools { get; set; } + } } diff --git a/MediaBrowser.Common/Kernel/IKernel.cs b/MediaBrowser.Common/Kernel/IKernel.cs index a4ff16afb5..dce744c0a7 100644 --- a/MediaBrowser.Common/Kernel/IKernel.cs +++ b/MediaBrowser.Common/Kernel/IKernel.cs @@ -117,5 +117,11 @@ namespace MediaBrowser.Common.Kernel /// The path. /// System.Object. object GetXmlConfiguration(Type type, string path); + + /// + /// Limits simultaneous access to various resources + /// + /// The resource pools. + ResourcePool ResourcePools { get; set; } } } diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index a4af76805b..521bf92c65 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -278,12 +278,6 @@ namespace MediaBrowser.Controller /// The user data repository. public IUserDataRepository UserDataRepository { get; private set; } - /// - /// Limits simultaneous access to various resources - /// - /// The resource pools. - public ResourcePool ResourcePools { get; set; } - /// /// Gets the UDP server port number. ///