From 4f67fc4aefc11c1a4293227c70de922dbe03c652 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Thu, 7 Mar 2013 00:34:00 -0500
Subject: removed base kernel and ikernel

---
 .../Configuration/BaseApplicationConfiguration.cs  | 26 ----------------------
 .../Configuration/ServerConfiguration.cs           | 25 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'MediaBrowser.Model/Configuration')

diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 74241ac021..9fc8d824f1 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -18,20 +18,6 @@ namespace MediaBrowser.Model.Configuration
         [ProtoMember(1)]
         public bool EnableDebugLevelLogging { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable HTTP level logging].
-        /// </summary>
-        /// <value><c>true</c> if [enable HTTP level logging]; otherwise, <c>false</c>.</value>
-        [ProtoMember(56)]
-        public bool EnableHttpLevelLogging { get; set; }
-
-        /// <summary>
-        /// Gets or sets the HTTP server port number.
-        /// </summary>
-        /// <value>The HTTP server port number.</value>
-        [ProtoMember(2)]
-        public int HttpServerPortNumber { get; set; }
-
         /// <summary>
         /// Enable automatically and silently updating of the application
         /// </summary>
@@ -59,13 +45,6 @@ namespace MediaBrowser.Model.Configuration
         [ProtoMember(58)]
         public bool RunAtStartup { get; set; }
 
-        /// <summary>
-        /// Gets or sets the legacy web socket port number.
-        /// </summary>
-        /// <value>The legacy web socket port number.</value>
-        [ProtoMember(59)]
-        public int LegacyWebSocketPortNumber { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether this instance is first run.
         /// </summary>
@@ -78,14 +57,9 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         public BaseApplicationConfiguration()
         {
-            HttpServerPortNumber = 8096;
-            LegacyWebSocketPortNumber = 8945;
-
             EnableAutoUpdate = true;
             LogFileRetentionDays = 14;
 
-            EnableHttpLevelLogging = true;
-
 #if (DEBUG)
             EnableDebugLevelLogging = true;
 #endif
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index ff7f5221ba..0ddafe19a5 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -12,6 +12,27 @@ namespace MediaBrowser.Model.Configuration
     [ProtoContract]
     public class ServerConfiguration : BaseApplicationConfiguration
     {
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable HTTP level logging].
+        /// </summary>
+        /// <value><c>true</c> if [enable HTTP level logging]; otherwise, <c>false</c>.</value>
+        [ProtoMember(56)]
+        public bool EnableHttpLevelLogging { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP server port number.
+        /// </summary>
+        /// <value>The HTTP server port number.</value>
+        [ProtoMember(2)]
+        public int HttpServerPortNumber { get; set; }
+
+        /// <summary>
+        /// Gets or sets the legacy web socket port number.
+        /// </summary>
+        /// <value>The legacy web socket port number.</value>
+        [ProtoMember(59)]
+        public int LegacyWebSocketPortNumber { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [enable internet providers].
         /// </summary>
@@ -255,6 +276,10 @@ namespace MediaBrowser.Model.Configuration
         public ServerConfiguration()
             : base()
         {
+            HttpServerPortNumber = 8096;
+            LegacyWebSocketPortNumber = 8945;
+            EnableHttpLevelLogging = true;
+
 #if (DEBUG)
             EnableDeveloperTools = true;
 #endif
-- 
cgit v1.2.3