From 1b877234dada9f14cebc486cc426db892beae152 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 4 May 2009 12:15:55 +0000 Subject: Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple console capable of processing commands. Create LocalConsole as a console that uses cursor control and context help. Precursor to a distributed console system for the new grid services. No functional change intended :) --- OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs | 2 +- OpenSim/Grid/AssetServer/Main.cs | 2 +- OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs | 2 +- OpenSim/Grid/GridServer/GridServerBase.cs | 2 +- OpenSim/Grid/InventoryServer/Main.cs | 2 +- OpenSim/Grid/MessagingServer/Main.cs | 2 +- OpenSim/Grid/UserServer/Main.cs | 4 ++-- OpenSim/Grid/UserServer/UserServerCommandModule.cs | 8 ++++---- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs index 2687af6..8f4b9a0 100644 --- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs +++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs @@ -55,7 +55,7 @@ namespace OpenSim.Grid.AssetInventoryServer { ConfigFile = config; - m_console = new ConsoleBase("AssetInventory"); + m_console = new LocalConsole("AssetInventory"); MainConsole.Instance = m_console; } diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 5b23d5a..82a6078 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs @@ -76,7 +76,7 @@ namespace OpenSim.Grid.AssetServer public OpenAsset_Main() { - m_console = new ConsoleBase("Asset"); + m_console = new LocalConsole("Asset"); MainConsole.Instance = m_console; } diff --git a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs index 1a4fe72..420249d 100644 --- a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs +++ b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs @@ -53,7 +53,7 @@ namespace OpenSim.Grid.GridServer.Modules protected IGridServiceCore m_core; - protected ConsoleBase m_console; + protected CommandConsole m_console; #region IGridPlugin Members diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index a1170f8..a281a37 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs @@ -70,7 +70,7 @@ namespace OpenSim.Grid.GridServer public GridServerBase() { - m_console = new ConsoleBase("Grid"); + m_console = new LocalConsole("Grid"); MainConsole.Instance = m_console; } diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index fa316b1..b2ed6d3 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs @@ -60,7 +60,7 @@ namespace OpenSim.Grid.InventoryServer public OpenInventory_Main() { - m_console = new ConsoleBase("Inventory"); + m_console = new LocalConsole("Inventory"); MainConsole.Instance = m_console; } diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index c92dd6e..6fe0c8f 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -69,7 +69,7 @@ namespace OpenSim.Grid.MessagingServer public OpenMessage_Main() { - m_console = new ConsoleBase("Messaging"); + m_console = new LocalConsole("Messaging"); MainConsole.Instance = m_console; } diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 0a5abd3..d9185cb 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -84,7 +84,7 @@ namespace OpenSim.Grid.UserServer public OpenUser_Main() { - m_console = new ConsoleBase("User"); + m_console = new LocalConsole("User"); MainConsole.Instance = m_console; } @@ -126,7 +126,7 @@ namespace OpenSim.Grid.UserServer m_httpServer = new BaseHttpServer(Cfg.HttpPort); - RegisterInterface(m_console); + RegisterInterface(m_console); RegisterInterface(Cfg); //Should be in modules? diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs index f73b3de..1d74c80 100644 --- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs +++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs @@ -49,7 +49,7 @@ namespace OpenSim.Grid.UserServer { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - protected ConsoleBase m_console; + protected CommandConsole m_console; protected UserConfig m_cfg; protected UserDataBaseService m_userDataBaseService; @@ -88,8 +88,8 @@ namespace OpenSim.Grid.UserServer m_loginService = loginService; } - ConsoleBase console; - if ((m_core.TryGet(out console)) && (m_cfg != null) + CommandConsole console; + if ((m_core.TryGet(out console)) && (m_cfg != null) && (m_userDataBaseService != null) && (m_loginService != null)) { RegisterConsoleCommands(console); @@ -101,7 +101,7 @@ namespace OpenSim.Grid.UserServer } - private void RegisterConsoleCommands(ConsoleBase console) + private void RegisterConsoleCommands(CommandConsole console) { m_console = console; m_console.Commands.AddCommand("userserver", false, "create user", -- cgit v1.1