From 8f1844665ba9f1fa1ee7e16ed137d112497473b7 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 19 Mar 2009 19:21:17 +0000 Subject: [PATCH] * Group OpenSim.Framework.Servers interfaces together --- OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 2 +- OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 1 + OpenSim/Framework/Servers/BaseStreamHandler.cs | 1 + OpenSim/Framework/Servers/{ => Interfaces}/IHttpAgentHandler.cs | 0 OpenSim/Framework/Servers/{ => Interfaces}/IStreamHandler.cs | 1 + OpenSim/Framework/Servers/RestDeserialiseHandler.cs | 1 + OpenSim/Framework/Servers/RestSessionService.cs | 1 + .../AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs | 1 + OpenSim/Grid/UserServer.Modules/OpenIdService.cs | 1 + OpenSim/Region/Application/OpenSimBase.cs | 1 + 10 files changed, 9 insertions(+), 1 deletion(-) rename OpenSim/Framework/Servers/{ => Interfaces}/IHttpAgentHandler.cs (100%) rename OpenSim/Framework/Servers/{ => Interfaces}/IStreamHandler.cs (99%) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 81801df4d5..f0a53083c7 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs @@ -29,6 +29,7 @@ using System; using System.Collections.Generic; using System.Reflection; using OpenSim.Framework.Servers; +using OpenSim.Framework.Servers.Interfaces; namespace OpenSim.ApplicationPlugins.Rest.Inventory { @@ -51,7 +52,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory public class RestHandler : RestPlugin, IRestHandler, IHttpAgentHandler { - // Handler tables: both stream and REST are supported. The path handlers and their // respective allocators are stored in separate tables. diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index f3c3016f1e..727ccfe650 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs @@ -35,6 +35,7 @@ using Nini.Config; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Servers; +using OpenSim.Framework.Servers.Interfaces; namespace OpenSim.ApplicationPlugins.Rest { diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs index 771def4304..836872c34a 100644 --- a/OpenSim/Framework/Servers/BaseStreamHandler.cs +++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs @@ -26,6 +26,7 @@ */ using System.IO; +using OpenSim.Framework.Servers.Interfaces; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs similarity index 100% rename from OpenSim/Framework/Servers/IHttpAgentHandler.cs rename to OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs similarity index 99% rename from OpenSim/Framework/Servers/IStreamHandler.cs rename to OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs index 76bf4d57d2..0783dfa5bf 100644 --- a/OpenSim/Framework/Servers/IStreamHandler.cs +++ b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs @@ -53,6 +53,7 @@ namespace OpenSim.Framework.Servers // Handle request stream, return byte array void Handle(string path, Stream request, Stream response, OSHttpRequest httpReqbuest, OSHttpResponse httpResponse); } + public interface IGenericHTTPHandler : IRequestHandler { Hashtable Handle(string path, Hashtable request); diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs index 41d86e5e89..1fba785290 100644 --- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs @@ -28,6 +28,7 @@ using System.IO; using System.Xml; using System.Xml.Serialization; +using OpenSim.Framework.Servers.Interfaces; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs index 60da05e6c0..6a8b6143e0 100644 --- a/OpenSim/Framework/Servers/RestSessionService.cs +++ b/OpenSim/Framework/Servers/RestSessionService.cs @@ -33,6 +33,7 @@ using System.Text; using System.Xml; using System.Xml.Serialization; using log4net; +using OpenSim.Framework.Servers.Interfaces; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs index 3db073dff9..c8233599b5 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs @@ -33,6 +33,7 @@ using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; using OpenSim.Framework.Servers; +using OpenSim.Framework.Servers.Interfaces; using log4net; namespace OpenSim.Grid.AssetInventoryServer.Plugins diff --git a/OpenSim/Grid/UserServer.Modules/OpenIdService.cs b/OpenSim/Grid/UserServer.Modules/OpenIdService.cs index 28a8fdb478..0dd4f222f2 100644 --- a/OpenSim/Grid/UserServer.Modules/OpenIdService.cs +++ b/OpenSim/Grid/UserServer.Modules/OpenIdService.cs @@ -35,6 +35,7 @@ using DotNetOpenId; using DotNetOpenId.Provider; using OpenSim.Framework; using OpenSim.Framework.Servers; +using OpenSim.Framework.Servers.Interfaces; namespace OpenSim.Grid.UserServer.Modules { diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b979bdc7c7..941a7d2f6c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -39,6 +39,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; +using OpenSim.Framework.Servers.Interfaces; using OpenSim.Framework.Statistics; using OpenSim.Region.ClientStack; using OpenSim.Region.Framework;