ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove all references to HttpServer from CommsManager (all incarnations)

Browse Source 
Change all uses of the HttpServer properties to use the new singleton
This commit is contained in:
Melanie Thielker
2009-07-10 02:22:26 +00:00
parent 7b457805a3
commit c310fb11f4
39 changed files with 83 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
View File

@@ -103,8 +103,8 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
Caps caps
= new Caps(
m_scene.AssetService, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName,
m_scene.CommsManager.HttpServer.Port,
m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
MainServer.Instance.Port,
capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName);
caps.RegisterHandlers();

4
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@@ -117,8 +117,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{
if (m_scenes.Count == 0)
{
scene.CommsManager.HttpServer.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
scene.CommsManager.HttpServer.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
MainServer.Instance.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
MainServer.Instance.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max
m_initialScene = scene;
}

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
{
if (m_Scenes.Count == 0)
{
scene.CommsManager.HttpServer.AddXmlRPCHandler(
MainServer.Instance.AddXmlRPCHandler(
"grid_instant_message", processXMLRPCGridInstantMessage);
}

4
OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
View File

@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
foreach (UUID ky in removeitems)
{
m_AvatarQueueUUIDMapping.Remove(ky);
m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
MainServer.Instance.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
}
}
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
}));
// This will persist this beyond the expiry of the caps handlers
m_scene.CommsManager.HttpServer.AddHTTPHandler(
MainServer.Instance.AddHTTPHandler(
capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
Random rnd = new Random(Environment.TickCount);

2
OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
View File

@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services
// IAssetDataPlugin m_assetProvider
// = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
IHttpServer httpServer = m_scene.CommsManager.HttpServer;
IHttpServer httpServer = MainServer.Instance;
httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod);
//m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod);
//m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod);

2
OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
View File

@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
//TODO: fix casting.
LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;
IHttpServer httpServer = MainServer.Instance;
//TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
m_loginService

2
OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
View File

@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
if (m_settings.Configs["Startup"].GetBoolean("gridmode", false))
{
m_com = m_scenes[0].CommsManager;
m_com.HttpServer.AddXmlRPCHandler("grid_message", GridWideMessage);
MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage);
}
}

6
OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
View File

@@ -143,8 +143,8 @@ namespace OpenSim.Region.CoreModules.InterGrid
{
if (m_scene.Count == 0)
{
scene.CommsManager.HttpServer.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
scene.CommsManager.HttpServer.AddLLSDHandler("/", ProcessRegionDomainSeed);
MainServer.Instance.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
MainServer.Instance.AddLLSDHandler("/", ProcessRegionDomainSeed);
try
{
ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
// a zero length region name would conflict with are base region seed cap
if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0)
{
scene.CommsManager.HttpServer.AddLLSDHandler(
MainServer.Instance.AddLLSDHandler(
"/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
ProcessRegionDomainSeed);
}

2
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
{
// There can only be one
//
m_HttpServer = scene.CommsManager.HttpServer;
m_HttpServer = MainServer.Instance;
}
scene.RegisterModuleInterface<IUrlModule>(this);

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
m_log.Info("[RegionAssetService]: Starting...");
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
Object[] args = new Object[] { m_Config, MainServer.Instance };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
}

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
View File

@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
if (!m_Registered)
{
m_Registered = true;
new HGAuthServiceInConnector(m_Config, scene.CommsManager.HttpServer);
new HGAuthServiceInConnector(m_Config, MainServer.Instance);
//Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
//ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
m_log.Info("[RegionInventoryService]: Starting...");
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
Object[] args = new Object[] { m_Config, MainServer.Instance };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
}

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
View File

@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
if (!m_Registered)
{
m_Registered = true;
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene };
Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args);
}

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
View File

@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
if (!m_Registered)
{
m_Registered = true;
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene };
Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args);
}

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
m_log.Info("[SIM SERVICE]: Starting...");
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene };
Object[] args = new Object[] { m_Config, MainServer.Instance, scene };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args);
}

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
View File

@@ -128,8 +128,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
protected virtual void AddHTTPHandlers()
{
m_aScene.CommsManager.HttpServer.AddHTTPHandler("/agent/", AgentHandler);
m_aScene.CommsManager.HttpServer.AddHTTPHandler("/object/", ObjectHandler);
MainServer.Instance.AddHTTPHandler("/agent/", AgentHandler);
MainServer.Instance.AddHTTPHandler("/object/", ObjectHandler);
}
#endregion /* IRegionModule */

8
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@@ -144,8 +144,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
regionimage = regionimage.Replace("-", "");
m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
m_scene.CommsManager.HttpServer.AddLLSDHandler(
MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
MainServer.Instance.AddLLSDHandler(
"/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
@@ -166,9 +166,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
regionimage = regionimage.Replace("-", "");
m_scene.CommsManager.HttpServer.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(),
MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(),
HandleRemoteMapItemRequest);
m_scene.CommsManager.HttpServer.RemoveHTTPHandler("", regionimage);
MainServer.Instance.RemoveHTTPHandler("", regionimage);
}
public void OnRegisterCaps(UUID agentID, Caps caps)