From 631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 12 Oct 2011 21:51:34 +0100 Subject: Get rid of some traces of the old pre-ROBUST grid architecture config --- OpenSim/Framework/ConfigSettings.cs | 7 ----- OpenSim/Framework/NetworkServersInfo.cs | 31 ---------------------- .../Linden/UDP/Tests/BasicCircuitTests.cs | 2 +- .../Shared/Api/Implementation/LSL_Api.cs | 2 -- OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 18 ++++--------- 5 files changed, 6 insertions(+), 54 deletions(-) diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 50328d7..b0bdebe 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs @@ -37,13 +37,6 @@ namespace OpenSim.Framework public bool PhysicalPrim { get; set; } public string LibrariesXMLFile { get; set; } - public const uint DefaultAssetServerHttpPort = 8003; public const uint DefaultRegionHttpPort = 9000; - public const uint DefaultUserServerHttpPort = 8002; - public const bool DefaultUserServerHttpSSL = false; - public const uint DefaultMessageServerHttpPort = 8006; - public const bool DefaultMessageServerHttpSSL = false; - public const uint DefaultGridServerHttpPort = 8003; - public const uint DefaultInventoryServerHttpPort = 8003; } } \ No newline at end of file diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index 5bb4111..4b7d4c7 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs @@ -32,19 +32,9 @@ namespace OpenSim.Framework { public class NetworkServersInfo { - public string AssetSendKey = String.Empty; - public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/"; - - public string GridRecvKey = String.Empty; - public string GridSendKey = String.Empty; - public string GridURL = String.Empty; public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort; - public string InventoryURL = String.Empty; public bool secureInventoryServer = false; public bool isSandbox; - public string UserRecvKey = String.Empty; - public string UserSendKey = String.Empty; - public string UserURL = String.Empty; public bool HttpUsesSSL = false; public string HttpSSLCN = ""; public uint httpSSLPort = 9001; @@ -55,8 +45,6 @@ namespace OpenSim.Framework public string cert_path = String.Empty; public string cert_pass = String.Empty; - public string MessagingURL = String.Empty; - public NetworkServersInfo() { } @@ -65,33 +53,14 @@ namespace OpenSim.Framework { } - public void loadFromConfiguration(IConfigSource config) { - HttpListenerPort = (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort); httpSSLPort = (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1)); HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); - GridURL = - config.Configs["Network"].GetString("grid_server_url", - "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); - GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); - GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); - UserURL = - config.Configs["Network"].GetString("user_server_url", - "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); - UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); - UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); - AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); - InventoryURL = config.Configs["Network"].GetString("inventory_server_url", - "http://127.0.0.1:" + - ConfigSettings.DefaultInventoryServerHttpPort.ToString()); - secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); - - MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty); // "Out of band management https" ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false); diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs index b8a4e8e..9d37cdf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs @@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests // /// // /// Test adding a client to the stack // /// -// [Test, LongRunning] +// [Test] // public void TestAddClient() // { // TestHelper.InMethod(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0820d01..53c9297 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -9842,8 +9842,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IConfigSource config = m_ScriptEngine.ConfigSource; if (config.Configs["Network"] != null) { - shard = config.Configs["Network"].GetString( - "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); shard = config.Configs["Network"].GetString("shard", shard); } diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index 0da9fc1..afe2f27 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs @@ -67,12 +67,9 @@ namespace OpenSim.Server.Handlers.Grid _info["platform"] = "OpenSim"; try { - IConfig startupCfg = configSource.Configs["Startup"]; IConfig gridCfg = configSource.Configs["GridInfoService"]; IConfig netCfg = configSource.Configs["Network"]; - bool grid = startupCfg.GetBoolean("gridmode", false); - if (null != gridCfg) { foreach (string k in gridCfg.GetKeys()) @@ -82,16 +79,11 @@ namespace OpenSim.Server.Handlers.Grid } else if (null != netCfg) { - if (grid) - _info["login"] - = netCfg.GetString( - "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); - else - _info["login"] - = String.Format( - "http://127.0.0.1:{0}/", - netCfg.GetString( - "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString())); + _info["login"] + = String.Format( + "http://127.0.0.1:{0}/", + netCfg.GetString( + "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString())); IssueWarning(); } -- cgit v1.1