From ca7ee684730fe0d99a6160659c679c36a1646c88 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Wed, 27 Feb 2013 11:46:48 -0500
Subject: fixed the plugin catalog not loading

---
 MediaBrowser.ServerApplication/ApplicationHost.cs | 34 ++++-------------------
 MediaBrowser.ServerApplication/MainWindow.xaml.cs | 14 ----------
 2 files changed, 6 insertions(+), 42 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index a252d92a64..cfbf761cf8 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -72,7 +72,6 @@ namespace MediaBrowser.ServerApplication
         public ApplicationHost()
             : base()
         {
-            Logger.Info("ApplicationHost!!!!!!!!!!!!!!!!!!!!");
             Kernel = new Kernel(this, ServerApplicationPaths, _xmlSerializer, Logger);
             
             var networkManager = new NetworkManager();
@@ -85,11 +84,9 @@ namespace MediaBrowser.ServerApplication
 
             Logger.Info("Version {0} initializing", ApplicationVersion);
 
-            var httpServer = ServerFactory.CreateServer(this, ProtobufSerializer, Logger, "Media Browser", "index.html");
+            RegisterResources(taskManager, networkManager, serverManager);
 
-            RegisterResources(taskManager, httpServer, networkManager, serverManager);
-
-            FindParts(taskManager, httpServer);
+            FindParts();
         }
 
         /// <summary>
@@ -113,42 +110,23 @@ namespace MediaBrowser.ServerApplication
         /// <summary>
         /// Registers resources that classes will depend on
         /// </summary>
-        private void RegisterResources(ITaskManager taskManager, IHttpServer httpServer, INetworkManager networkManager, IServerManager serverManager)
+        protected override void RegisterResources(ITaskManager taskManager, INetworkManager networkManager, IServerManager serverManager)
         {
+            base.RegisterResources(taskManager, networkManager, serverManager);
+
             RegisterSingleInstance<IKernel>(Kernel);
             RegisterSingleInstance(Kernel);
 
             RegisterSingleInstance<IApplicationHost>(this);
-            RegisterSingleInstance(LogManager);
-            RegisterSingleInstance(Logger);
 
-            RegisterSingleInstance(ApplicationPaths);
             RegisterSingleInstance(ServerApplicationPaths);
-            RegisterSingleInstance(taskManager);
             RegisterSingleInstance<IIsoManager>(new PismoIsoManager(Logger));
             RegisterSingleInstance<IBlurayExaminer>(new BdInfoExaminer());
             RegisterSingleInstance<IHttpClient>(new HttpClientManager(ApplicationPaths, Logger));
             RegisterSingleInstance<IZipClient>(new DotNetZipClient());
-            RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger));
             RegisterSingleInstance(_jsonSerializer);
             RegisterSingleInstance(_xmlSerializer);
-            RegisterSingleInstance(ProtobufSerializer);
-            RegisterSingleInstance<IUdpServer>(new UdpServer(Logger), false);
-            RegisterSingleInstance(httpServer, false);
-
-            RegisterSingleInstance(networkManager);
-
-            RegisterSingleInstance(serverManager);
-        }
-
-        /// <summary>
-        /// Finds the parts.
-        /// </summary>
-        private void FindParts(ITaskManager taskManager, IHttpServer httpServer)
-        {
-            taskManager.AddTasks(GetExports<IScheduledTask>(false));
-
-            httpServer.Init(GetExports<IRestfulService>(false));
+            RegisterSingleInstance(ServerFactory.CreateServer(this, ProtobufSerializer, Logger, "Media Browser", "index.html"), false);
         }
 
         /// <summary>
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index b3b26f57a1..1189e73d7b 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -101,7 +101,6 @@ namespace MediaBrowser.ServerApplication
 
             Kernel.Instance.ReloadCompleted += KernelReloadCompleted;
             _logManager.LoggerLoaded += LoadLogWindow;
-            Kernel.Instance.HasPendingRestartChanged += Instance_HasPendingRestartChanged;
             Kernel.Instance.ConfigurationUpdated += Instance_ConfigurationUpdated;
         }
 
@@ -131,19 +130,6 @@ namespace MediaBrowser.ServerApplication
             });
         }
 
-        /// <summary>
-        /// Sets visibility of the restart message when the kernel value changes
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
-        void Instance_HasPendingRestartChanged(object sender, EventArgs e)
-        {
-            Dispatcher.InvokeAsync(() =>
-            {
-                MbTaskbarIcon.ToolTipText = Kernel.Instance.HasPendingRestart ? "Media Browser Server - Please restart to finish updating." : "Media Browser Server";
-            });
-        }
-
         /// <summary>
         /// Handles the LibraryChanged event of the Instance control.
         /// </summary>
-- 
cgit v1.2.3