Renamed IMessageUserServerService to IInterServiceUserService.cs
Renamed MessageUserServerModule to InterMessageUserServerModuleGenericGridServerConcept
parent
36e648a37a
commit
07ee252cf3
|
@ -28,7 +28,7 @@
|
|||
using System;
|
||||
namespace OpenSim.Grid.Framework
|
||||
{
|
||||
public interface IMessageUserServerService
|
||||
public interface IInterServiceUserService
|
||||
{
|
||||
bool SendToUserServer(System.Collections.Hashtable request, string method);
|
||||
}
|
|
@ -42,7 +42,7 @@ using Timer = System.Timers.Timer;
|
|||
|
||||
namespace OpenSim.Grid.MessagingServer.Modules
|
||||
{
|
||||
public class MessageUserServerModule : IMessageUserServerService
|
||||
public class InterMessageUserServerModule : IInterServiceUserService
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
|
@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
|
|||
|
||||
private Timer reconnectTimer = new Timer(300000); // 5 mins
|
||||
|
||||
public MessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore)
|
||||
public InterMessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore)
|
||||
{
|
||||
m_cfg = config;
|
||||
m_messageCore = messageCore;
|
||||
|
@ -63,7 +63,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
|
|||
|
||||
public void Initialise()
|
||||
{
|
||||
m_messageCore.RegisterInterface<IMessageUserServerService>(this);
|
||||
m_messageCore.RegisterInterface<IInterServiceUserService>(this);
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
|
@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
|
|||
|
||||
private MessageServerConfig m_cfg;
|
||||
|
||||
private IMessageUserServerService m_userServerModule;
|
||||
private IInterServiceUserService m_userServerModule;
|
||||
|
||||
private IGridServiceCore m_messageCore;
|
||||
|
||||
|
@ -68,8 +68,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
|
|||
|
||||
public void PostInitialise()
|
||||
{
|
||||
IMessageUserServerService messageUserServer;
|
||||
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
|
||||
IInterServiceUserService messageUserServer;
|
||||
if (m_messageCore.TryGet<IInterServiceUserService>(out messageUserServer))
|
||||
{
|
||||
m_userServerModule = messageUserServer;
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
|
|||
|
||||
private IGridServiceCore m_messageCore;
|
||||
|
||||
private IMessageUserServerService m_userServerModule;
|
||||
private IInterServiceUserService m_userServerModule;
|
||||
private IMessageRegionLookup m_regionModule;
|
||||
|
||||
// a dictionary of all current presences this server knows about
|
||||
|
@ -76,8 +76,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
|
|||
|
||||
public void PostInitialise()
|
||||
{
|
||||
IMessageUserServerService messageUserServer;
|
||||
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
|
||||
IInterServiceUserService messageUserServer;
|
||||
if (m_messageCore.TryGet<IInterServiceUserService>(out messageUserServer))
|
||||
{
|
||||
m_userServerModule = messageUserServer;
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace OpenSim.Grid.MessagingServer
|
|||
private MessageService msgsvc;
|
||||
|
||||
private MessageRegionModule m_regionModule;
|
||||
private MessageUserServerModule m_userServerModule;
|
||||
private InterMessageUserServerModule m_userServerModule;
|
||||
|
||||
private UserDataBaseService m_userDataBaseService;
|
||||
|
||||
|
@ -132,7 +132,7 @@ namespace OpenSim.Grid.MessagingServer
|
|||
//Register the database access service so modules can fetch it
|
||||
// RegisterInterface<UserDataBaseService>(m_userDataBaseService);
|
||||
|
||||
m_userServerModule = new MessageUserServerModule(Cfg, this);
|
||||
m_userServerModule = new InterMessageUserServerModule(Cfg, this);
|
||||
m_userServerModule.Initialise();
|
||||
|
||||
msgsvc = new MessageService(Cfg, this, m_userDataBaseService);
|
||||
|
|
Loading…
Reference in New Issue