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 -- prebuild.xml | 43 ------ 3 files changed, 198 deletions(-) delete mode 100644 OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs delete mode 100644 OpenSim/ApplicationPlugins/CreateCommsManager/Resources/CreateCommsManagerPlugin.addin.xml 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 @@ - - - - - - - - - - - diff --git a/prebuild.xml b/prebuild.xml index 33af554..fbb782a 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1693,49 +1693,6 @@ - - - - ../../../bin/ - - - - - ../../../bin/ - - - - ../../../bin/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1