From 99c85b5ef541b83dc09e93c66232c3893e348e4b Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 6 Oct 2009 20:32:33 +0100 Subject: [PATCH] * Change some more default ports to the robust default of 8003 * Make these use existing constants rather than hardcoding * These will probably go away soon anyway once all services are under ROBUST --- OpenSim/Framework/ConfigSettings.cs | 4 ++-- OpenSim/Framework/InventoryConfig.cs | 6 +++--- OpenSim/Tests/Clients/Grid/GridClient.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 93efffae4b..32415e03e1 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs @@ -168,7 +168,7 @@ namespace OpenSim.Framework public const bool DefaultUserServerHttpSSL = false; public const uint DefaultMessageServerHttpPort = 8006; public const bool DefaultMessageServerHttpSSL = false; - public const uint DefaultGridServerHttpPort = 8001; - public const uint DefaultInventoryServerHttpPort = 8004; + public const uint DefaultGridServerHttpPort = 8003; + public const uint DefaultInventoryServerHttpPort = 8003; } } diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs index f539d556d7..dd207ada1b 100644 --- a/OpenSim/Framework/InventoryConfig.cs +++ b/OpenSim/Framework/InventoryConfig.cs @@ -56,15 +56,15 @@ namespace OpenSim.Framework m_configMember.addConfigurationOption("default_inventory_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Inventory Server URI (this server's external name)", - "http://127.0.0.1:8004", false); + "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort, false); m_configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", - "http://127.0.0.1:8002", false); + "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort, false); m_configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", - "http://127.0.0.1:8003", false); + "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort, false); m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Data.MySQL.dll", false); m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs index 8798c5ed5b..23d8593e40 100644 --- a/OpenSim/Tests/Clients/Grid/GridClient.cs +++ b/OpenSim/Tests/Clients/Grid/GridClient.cs @@ -55,7 +55,7 @@ namespace OpenSim.Tests.Clients.GridClient new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"); log4net.Config.BasicConfigurator.Configure(consoleAppender); - string serverURI = "http://127.0.0.1:8001"; + string serverURI = "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort; GridServicesConnector m_Connector = new GridServicesConnector(serverURI); GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000);