ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring of the Grid, User and Messaging servers.

Browse Source
This commit is contained in:
MW
2009-02-25 18:33:15 +00:00
parent 50dcd66896
commit 4db232763f
15 changed files with 395 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs Normal file
View File

@@ -0,0 +1,77 @@
/*
* 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 OpenSim 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.IO;
using System.Reflection;
using log4net;
using log4net.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers;
using OpenSim.Grid.Communications.OGS1;
using OpenSim.Grid.Framework;
namespace OpenSim.Grid.UserServer.Modules
{
public class GridInfoServiceModule
{
protected IUGAIMCore m_core;
protected GridInfoService m_gridInfoService;
protected BaseHttpServer m_httpServer;
public GridInfoServiceModule()
{
}
public void Initialise(IUGAIMCore core)
{
m_core = core;
m_gridInfoService = new GridInfoService();
}
public void PostInitialise()
{
}
public void RegisterHandlers(BaseHttpServer httpServer)
{
m_httpServer = httpServer;
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
m_gridInfoService.RestGetGridInfoMethod));
m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
}
public void Close()
{
}
}
}

15
OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
View File

@@ -35,6 +35,7 @@ using Nwc.XmlRpc;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Grid.Framework;
namespace OpenSim.Grid.UserServer.Modules
{
@@ -78,6 +79,8 @@ namespace OpenSim.Grid.UserServer.Modules
Thread m_NotifyThread;
private IUGAIMCore m_core;
public event AgentLocationDelegate OnAgentLocation;
public event AgentLeavingDelegate OnAgentLeaving;
public event RegionStartupDelegate OnRegionStartup;
@@ -86,18 +89,18 @@ namespace OpenSim.Grid.UserServer.Modules
public MessageServersConnector()
{
MessageServers = new Dictionary<string, MessageServerInfo>();
}
public void Initialise(IUGAIMCore core)
{
m_core = core;
m_core.RegisterInterface<MessageServersConnector>(this);
m_NotifyThread = new Thread(new ThreadStart(NotifyQueueRunner));
m_NotifyThread.Start();
}
public void Initialise()
{
}
public void PostInitialise()
{
}
public void RegisterHandlers(BaseHttpServer httpServer)

3
OpenSim/Grid/UserServer.Modules/UserManager.cs
View File

@@ -35,6 +35,7 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Grid.Framework;
namespace OpenSim.Grid.UserServer.Modules
{
@@ -59,7 +60,7 @@ namespace OpenSim.Grid.UserServer.Modules
m_userDataBaseService = userDataBaseService;
}
public void Initialise()
public void Initialise(IUGAIMCore core)
{
}

5
OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -35,6 +35,7 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Grid.Framework;
namespace OpenSim.Grid.UserServer.Modules
{
@@ -50,7 +51,7 @@ namespace OpenSim.Grid.UserServer.Modules
m_userDataBaseService = userDataBaseService;
}
public void Initialise()
public void Initialise(IUGAIMCore core)
{
}

7
OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -35,6 +35,7 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Grid.Framework;
namespace OpenSim.Grid.UserServer.Modules
{
@@ -51,7 +52,7 @@ namespace OpenSim.Grid.UserServer.Modules
m_userDataBaseService = userDataBaseService;
}
public void Initialise()
public void Initialise(IUGAIMCore core)
{
}
@@ -170,4 +171,4 @@ namespace OpenSim.Grid.UserServer.Modules
return FriendListItemListtoXmlRPCResponse(returndata);
}
}
}
}