From c856da2ee6634762951312b160ef1f85634d6c89 Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 25 Feb 2009 19:39:56 +0000 Subject: [PATCH] Renamed IUGAIMCore to IGridServiceCore, still not really happy with this name as it could be confused with the Grid Server namespace or with the IGridService in the region servers. --- .../{IUGAIMCore.cs => IGridServiceCore.cs} | 80 +++++++++---------- OpenSim/Grid/Framework/IGridServiceModule.cs | 2 +- .../GridServer.Modules/GridMessagingModule.cs | 4 +- .../Grid/GridServer.Modules/GridRestModule.cs | 4 +- .../GridServer.Modules/GridXmlRpcModule.cs | 4 +- OpenSim/Grid/GridServer/GridServerBase.cs | 2 +- .../MessageRegionModule.cs | 4 +- .../MessagingServer.Modules/MessageService.cs | 4 +- .../MessageUserServerModule.cs | 4 +- OpenSim/Grid/MessagingServer/Main.cs | 2 +- .../GridInfoServiceModule.cs | 4 +- .../MessageServersConnector.cs | 4 +- .../UserServer.Modules/UserDataBaseService.cs | 4 +- .../Grid/UserServer.Modules/UserManager.cs | 2 +- .../UserServerAvatarAppearanceModule.cs | 2 +- .../UserServerFriendsModule.cs | 2 +- OpenSim/Grid/UserServer/Main.cs | 3 +- .../UserServer/UserServerCommandModule.cs | 4 +- .../UserServerEventDispatchModule.cs | 2 +- 19 files changed, 69 insertions(+), 68 deletions(-) rename OpenSim/Grid/Framework/{IUGAIMCore.cs => IGridServiceCore.cs} (95%) diff --git a/OpenSim/Grid/Framework/IUGAIMCore.cs b/OpenSim/Grid/Framework/IGridServiceCore.cs similarity index 95% rename from OpenSim/Grid/Framework/IUGAIMCore.cs rename to OpenSim/Grid/Framework/IGridServiceCore.cs index 46fde8c636..894ea14989 100644 --- a/OpenSim/Grid/Framework/IUGAIMCore.cs +++ b/OpenSim/Grid/Framework/IGridServiceCore.cs @@ -1,40 +1,40 @@ -/* - * 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 OpenSim.Framework.Servers; - -namespace OpenSim.Grid.Framework -{ - public interface IUGAIMCore - { - T Get(); - void RegisterInterface(T iface); - bool TryGet(out T iface); - BaseHttpServer GetHttpServer(); - } -} +/* + * 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 OpenSim.Framework.Servers; + +namespace OpenSim.Grid.Framework +{ + public interface IGridServiceCore + { + T Get(); + void RegisterInterface(T iface); + bool TryGet(out T iface); + BaseHttpServer GetHttpServer(); + } +} diff --git a/OpenSim/Grid/Framework/IGridServiceModule.cs b/OpenSim/Grid/Framework/IGridServiceModule.cs index 6891bebc36..b44bd40553 100644 --- a/OpenSim/Grid/Framework/IGridServiceModule.cs +++ b/OpenSim/Grid/Framework/IGridServiceModule.cs @@ -6,7 +6,7 @@ namespace OpenSim.Grid.Framework public interface IGridServiceModule { void Close(); - void Initialise(IUGAIMCore core); + void Initialise(IGridServiceCore core); void PostInitialise(); void RegisterHandlers(BaseHttpServer httpServer); } diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs index 1d2c5292e7..c3b722c824 100644 --- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Grid.GridServer.Modules private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected GridDBService m_gridDBService; - protected IUGAIMCore m_gridCore; + protected IGridServiceCore m_gridCore; protected GridConfig m_config; @@ -61,7 +61,7 @@ namespace OpenSim.Grid.GridServer.Modules { } - public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) + public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) { m_opensimVersion = opensimVersion; m_gridDBService = gridDBService; diff --git a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs index 716f9234cd..95fa706721 100644 --- a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs @@ -46,7 +46,7 @@ namespace OpenSim.Grid.GridServer.Modules private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private GridDBService m_gridDBService; - private IUGAIMCore m_gridCore; + private IGridServiceCore m_gridCore; protected GridConfig m_config; @@ -67,7 +67,7 @@ namespace OpenSim.Grid.GridServer.Modules { } - public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) + public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) { m_opensimVersion = opensimVersion; m_gridDBService = gridDBService; diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs index 62101e56a9..2f5144315f 100644 --- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs @@ -47,7 +47,7 @@ namespace OpenSim.Grid.GridServer.Modules private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private GridDBService m_gridDBService; - private IUGAIMCore m_gridCore; + private IGridServiceCore m_gridCore; protected GridConfig m_config; @@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules { } - public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) + public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) { m_opensimVersion = opensimVersion; m_gridDBService = gridDBService; diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 54a94433dc..1bc39557af 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs @@ -41,7 +41,7 @@ namespace OpenSim.Grid.GridServer { /// /// - public class GridServerBase : BaseOpenSimServer, IUGAIMCore + public class GridServerBase : BaseOpenSimServer, IGridServiceCore { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs index 7002a2e862..b751d371c5 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs @@ -50,12 +50,12 @@ namespace OpenSim.Grid.MessagingServer.Modules private IMessageUserServerService m_userServerModule; - private IUGAIMCore m_messageCore; + private IGridServiceCore m_messageCore; // a dictionary of all current regions this server knows about private Dictionary m_regionInfoCache = new Dictionary(); - public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore) + public MessageRegionModule(MessageServerConfig config, IGridServiceCore messageCore) { m_cfg = config; m_messageCore = messageCore; diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs index e79e5b4742..0a37bb5cd6 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs @@ -49,7 +49,7 @@ namespace OpenSim.Grid.MessagingServer.Modules private MessageServerConfig m_cfg; private UserDataBaseService m_userDataBaseService; - private IUGAIMCore m_messageCore; + private IGridServiceCore m_messageCore; private IMessageUserServerService m_userServerModule; private IMessageRegionLookup m_regionModule; @@ -57,7 +57,7 @@ namespace OpenSim.Grid.MessagingServer.Modules // a dictionary of all current presences this server knows about private Dictionary m_presences = new Dictionary(); - public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService) + public MessageService(MessageServerConfig cfg, IGridServiceCore messageCore, UserDataBaseService userDataBaseService) { m_cfg = cfg; m_messageCore = messageCore; diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs index e153c39207..f4d5792ada 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs @@ -48,11 +48,11 @@ namespace OpenSim.Grid.MessagingServer.Modules private MessageServerConfig m_cfg; - private IUGAIMCore m_messageCore; + private IGridServiceCore m_messageCore; private Timer reconnectTimer = new Timer(300000); // 5 mins - public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore) + public MessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore) { m_cfg = config; m_messageCore = messageCore; diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index 53c5e28808..2893528068 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -41,7 +41,7 @@ namespace OpenSim.Grid.MessagingServer { /// /// - public class OpenMessage_Main : BaseOpenSimServer , IUGAIMCore + public class OpenMessage_Main : BaseOpenSimServer , IGridServiceCore { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs index a6fdee0545..e79e786b78 100644 --- a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Grid.UserServer.Modules { public class GridInfoServiceModule { - protected IUGAIMCore m_core; + protected IGridServiceCore m_core; protected GridInfoService m_gridInfoService; protected BaseHttpServer m_httpServer; @@ -51,7 +51,7 @@ namespace OpenSim.Grid.UserServer.Modules { } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { m_core = core; m_gridInfoService = new GridInfoService(); diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs index 5b245ee79e..f9e7889203 100644 --- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs @@ -79,7 +79,7 @@ namespace OpenSim.Grid.UserServer.Modules Thread m_NotifyThread; - private IUGAIMCore m_core; + private IGridServiceCore m_core; public event AgentLocationDelegate OnAgentLocation; public event AgentLeavingDelegate OnAgentLeaving; @@ -91,7 +91,7 @@ namespace OpenSim.Grid.UserServer.Modules MessageServers = new Dictionary(); } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { m_core = core; m_core.RegisterInterface(this); diff --git a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs index 80f2f7b8ef..485dd46ba4 100644 --- a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs @@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules { public class UserDataBaseService : UserManagerBase { - protected IUGAIMCore m_core; + protected IGridServiceCore m_core; public UserDataBaseService() : base(null) @@ -53,7 +53,7 @@ namespace OpenSim.Grid.UserServer.Modules { } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { m_core = core; diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs index 34daff2596..c40201e753 100644 --- a/OpenSim/Grid/UserServer.Modules/UserManager.cs +++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs @@ -60,7 +60,7 @@ namespace OpenSim.Grid.UserServer.Modules m_userDataBaseService = userDataBaseService; } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { } diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index e68752d7cd..a5a630e6d2 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs @@ -51,7 +51,7 @@ namespace OpenSim.Grid.UserServer.Modules m_userDataBaseService = userDataBaseService; } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { } diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs index 6c1daead16..49e94ee2af 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs @@ -52,7 +52,7 @@ namespace OpenSim.Grid.UserServer.Modules m_userDataBaseService = userDataBaseService; } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { } diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 63d788d286..dc38a3fedf 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -48,7 +48,7 @@ namespace OpenSim.Grid.UserServer /// /// Grid user server main class /// - public class OpenUser_Main : BaseOpenSimServer, IUGAIMCore + public class OpenUser_Main : BaseOpenSimServer, IGridServiceCore { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -128,6 +128,7 @@ namespace OpenSim.Grid.UserServer RegisterInterface(m_console); RegisterInterface(Cfg); + //Should be in modules? IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); // IRegionProfileService regionProfileService = new RegionProfileServiceProxy(); diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs index a6f8af29d4..7f7108c0e8 100644 --- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs +++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs @@ -57,13 +57,13 @@ namespace OpenSim.Grid.UserServer protected UUID m_lastCreatedUser = UUID.Random(); - protected IUGAIMCore m_core; + protected IGridServiceCore m_core; public UserServerCommandModule() { } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { m_core = core; } diff --git a/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs b/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs index e23a7d19b8..2d3f414a43 100644 --- a/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs +++ b/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs @@ -60,7 +60,7 @@ namespace OpenSim.Grid.UserServer m_loginService = loginService; } - public void Initialise(IUGAIMCore core) + public void Initialise(IGridServiceCore core) { }