From b63405c1a796b44b58081857d01f726372467628 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 8 Jan 2010 10:43:34 -0800 Subject: Inching ahead... This compiles, but very likely does not run. --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 8 -------- 1 file changed, 8 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 0f827b0..02ee025 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -85,10 +85,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager MainServer.Instance = m_httpServer; InitialiseCommsManager(openSim); - if (m_commsManager != null) - { - m_openSim.ApplicationRegistry.RegisterInterface(m_commsManager.UserService); - } } public void PostInitialise() @@ -107,10 +103,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager private void RegionCreated(IScene scene) { - if (m_commsManager != null) - { - scene.RegisterModuleInterface(m_commsManager.UserService); - } } protected void InitialiseCommsManager(OpenSimBase openSim) -- cgit v1.1 From 49618dc102c42b7125303511d826f76f0ebaab4c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 19:19:34 -0800 Subject: Moved GridInfo service from where it was to Handlers/Grid --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 6 ------ 1 file changed, 6 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 02ee025..c5a52fa 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -68,7 +68,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager protected BaseHttpServer m_httpServer; protected CommunicationsManager m_commsManager; - protected GridInfoService m_gridInfoService; protected IRegionCreator m_regionCreator; @@ -201,11 +200,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager private void CreateGridInfoService() { - // provide grid info - m_gridInfoService = new GridInfoService(m_openSim.ConfigSource.Source); - m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); - m_httpServer.AddStreamHandler( - new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); } } } -- cgit v1.1 From dc4bbf6065ad4cb914c9d44f2e6496a2e3d99814 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 20:29:09 -0800 Subject: All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService. --- .../ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index c5a52fa..4683f53 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -32,7 +32,6 @@ using log4net; using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Osp; using OpenSim.Framework.Servers; -- cgit v1.1 From 751e70af788bf27fa0401c25d899f73186c8eafa Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 21:37:36 -0800 Subject: NetworkServersInfo removed from CommsManager. --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 4683f53..66a8890 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -36,9 +36,6 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Osp; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Region.Communications.Hypergrid; -using OpenSim.Region.Communications.Local; -using OpenSim.Region.Communications.OGS1; namespace OpenSim.ApplicationPlugins.CreateCommsManager { @@ -155,18 +152,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager /// protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) { - m_commsManager - = new CommunicationsLocal( - m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, - libraryRootFolder); CreateGridInfoService(); } protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) { - m_commsManager - = new CommunicationsOGS1(m_openSim.NetServersInfo, libraryRootFolder); m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); @@ -176,20 +167,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) { - m_commsManager - = new HGCommunicationsStandalone( - m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, - libraryRootFolder, false); - + CreateGridInfoService(); } protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) { - m_commsManager - = new HGCommunicationsGridMode( - m_openSim.NetServersInfo, - m_openSim.SceneManager, libraryRootFolder); m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); -- cgit v1.1 From 7e6980b20d881bc1e441d004ad5e24af63e58c08 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 21:43:41 -0800 Subject: dust --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 42 ++-------------------- 1 file changed, 2 insertions(+), 40 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 66a8890..7fdff60 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -104,35 +104,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager { LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); - bool hgrid = m_openSim.ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false); - - if (hgrid) - { - InitialiseHGServices(openSim, libraryRootFolder); - } - else - { - InitialiseStandardServices(libraryRootFolder); - } + InitialiseStandardServices(libraryRootFolder); openSim.CommunicationsManager = m_commsManager; } - protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder) - { - // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) - if (m_openSim.ConfigurationSettings.Standalone) - { - InitialiseHGStandaloneServices(libraryRootFolder); - } - else - { - // We are in grid mode - InitialiseHGGridServices(libraryRootFolder); - } - } - - protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) + protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) { // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) if (m_openSim.ConfigurationSettings.Standalone) @@ -165,21 +142,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); } - protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) - { - - CreateGridInfoService(); - } - - protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) - { - - m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); - m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); - if (m_openSim.userStatsURI != String.Empty) - m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); - } - private void CreateGridInfoService() { } -- cgit v1.1 From 15a11e9745f180fc637a41970498710b3511a53c Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 11 Jan 2010 05:03:56 +0000 Subject: Refactor. Move MainServer init to a place with greener grass --- .../ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 7fdff60..74f11a4 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -77,7 +77,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager { m_openSim = openSim; m_httpServer = openSim.HttpServer; - MainServer.Instance = m_httpServer; InitialiseCommsManager(openSim); } -- cgit v1.1 From bfddd75ca8946360728787e56a81b2d0f4a880f6 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 11 Jan 2010 05:12:01 +0000 Subject: Refactor. Instantiate sim status handlers in opensim base, not in a plugin --- .../ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 74f11a4..3cd02f4 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -135,10 +135,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) { - m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); - m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); - if (m_openSim.userStatsURI != String.Empty) - m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); } private void CreateGridInfoService() -- cgit v1.1 From ca75ad674315d924397576219f3bd3c5e1a75146 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 11 Jan 2010 05:13:47 +0000 Subject: Remove CreateCommsManagerPlugin --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 144 --------------------- .../Resources/CreateCommsManagerPlugin.addin.xml | 11 -- 2 files changed, 155 deletions(-) delete mode 100644 OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs delete mode 100644 OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs deleted file mode 100644 index 3cd02f4..0000000 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using System.Reflection; -using log4net; -using OpenSim.Data; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Osp; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Servers.HttpServer; - -namespace OpenSim.ApplicationPlugins.CreateCommsManager -{ - public class CreateCommsManagerPlugin : IApplicationPlugin - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - #region IApplicationPlugin Members - - // TODO: required by IPlugin, but likely not at all right - private string m_name = "CreateCommsManagerPlugin"; - private string m_version = "0.0"; - - public string Version - { - get { return m_version; } - } - - public string Name - { - get { return m_name; } - } - - protected OpenSimBase m_openSim; - - protected BaseHttpServer m_httpServer; - - protected CommunicationsManager m_commsManager; - - protected IRegionCreator m_regionCreator; - - public void Initialise() - { - m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!"); - throw new PluginNotInitialisedException(Name); - } - - public void Initialise(OpenSimBase openSim) - { - m_openSim = openSim; - m_httpServer = openSim.HttpServer; - - InitialiseCommsManager(openSim); - } - - public void PostInitialise() - { - if (m_openSim.ApplicationRegistry.TryGet(out m_regionCreator)) - { - m_regionCreator.OnNewRegionCreated += RegionCreated; - } - } - - public void Dispose() - { - } - - #endregion - - private void RegionCreated(IScene scene) - { - } - - protected void InitialiseCommsManager(OpenSimBase openSim) - { - LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); - - InitialiseStandardServices(libraryRootFolder); - - openSim.CommunicationsManager = m_commsManager; - } - - protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) - { - // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) - if (m_openSim.ConfigurationSettings.Standalone) - { - InitialiseStandaloneServices(libraryRootFolder); - } - else - { - // We are in grid mode - InitialiseGridServices(libraryRootFolder); - } - } - - /// - /// Initialises the backend services for standalone mode, and registers some http handlers - /// - /// - protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) - { - - CreateGridInfoService(); - } - - protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) - { - - } - - private void CreateGridInfoService() - { - } - } -} diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml b/OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml deleted file mode 100644 index ec042f3..0000000 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - -- cgit v1.1