diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-26 16:05:52 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-26 16:05:52 -0500 |
| commit | 51b3c32e2cc84778212531d72665d2c5f567f34a (patch) | |
| tree | 68fe93852dd6b3dffac09b3d7917dd6370b2784b /MediaBrowser.ServerApplication | |
| parent | fbac08feada72c198cd5151e25008bca2b435cda (diff) | |
a little more consolidation
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 2fe257aaf1..e98fd8d565 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -1,11 +1,16 @@ using BDInfo; using MediaBrowser.ClickOnce; using MediaBrowser.Common.Implementations; +using MediaBrowser.Common.Implementations.HttpClientManager; +using MediaBrowser.Common.Implementations.HttpServer; using MediaBrowser.Common.Implementations.Logging; +using MediaBrowser.Common.Implementations.NetworkManagement; using MediaBrowser.Common.Implementations.ScheduledTasks; using MediaBrowser.Common.Implementations.Serialization; using MediaBrowser.Common.IO; -using MediaBrowser.Common.Implementations.Server; +using MediaBrowser.Common.Implementations.ServerManager; +using MediaBrowser.Common.Implementations.Udp; +using MediaBrowser.Common.Implementations.WebSocket; using MediaBrowser.Common.Kernel; using MediaBrowser.Common.Net; using MediaBrowser.Common.ScheduledTasks; @@ -17,11 +22,6 @@ using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.Serialization; using MediaBrowser.Model.System; using MediaBrowser.Model.Updates; -using MediaBrowser.Networking.HttpManager; -using MediaBrowser.Networking.HttpServer; -using MediaBrowser.Networking.Management; -using MediaBrowser.Networking.Udp; -using MediaBrowser.Networking.WebSocket; using MediaBrowser.Server.Implementations; using MediaBrowser.ServerApplication.Implementations; using System; @@ -126,7 +126,7 @@ namespace MediaBrowser.ServerApplication RegisterSingleInstance(taskManager); RegisterSingleInstance<IIsoManager>(new PismoIsoManager(Logger)); RegisterSingleInstance<IBlurayExaminer>(new BdInfoExaminer()); - RegisterSingleInstance<IHttpClient>(new HttpManager(ApplicationPaths, Logger)); + RegisterSingleInstance<IHttpClient>(new HttpClientManager(ApplicationPaths, Logger)); RegisterSingleInstance<IZipClient>(new DotNetZipClient()); RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger)); RegisterSingleInstance(_jsonSerializer); diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 9492fcfe0f..51ee731f07 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -282,10 +282,6 @@ <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project> <Name>MediaBrowser.Model</Name> </ProjectReference> - <ProjectReference Include="..\MediaBrowser.Networking\MediaBrowser.Networking.csproj"> - <Project>{7c11010e-179a-49b7-bfb2-f1656f5e71ad}</Project> - <Name>MediaBrowser.Networking</Name> - </ProjectReference> <ProjectReference Include="..\MediaBrowser.Server.Implementations\MediaBrowser.Server.Implementations.csproj"> <Project>{2e781478-814d-4a48-9d80-bff206441a65}</Project> <Name>MediaBrowser.Server.Implementations</Name> |