diff options
author | Justin Clarke Casey | 2009-03-19 19:21:17 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-19 19:21:17 +0000 |
commit | 8f1844665ba9f1fa1ee7e16ed137d112497473b7 (patch) | |
tree | fe1dbaaee66ea7620b780de3918fef8fcb26ca72 | |
parent | * refactor: Create IHttpServer interface instead of accessing BaseHttpServer ... (diff) | |
download | opensim-SC_OLD-8f1844665ba9f1fa1ee7e16ed137d112497473b7.zip opensim-SC_OLD-8f1844665ba9f1fa1ee7e16ed137d112497473b7.tar.gz opensim-SC_OLD-8f1844665ba9f1fa1ee7e16ed137d112497473b7.tar.bz2 opensim-SC_OLD-8f1844665ba9f1fa1ee7e16ed137d112497473b7.tar.xz |
* Group OpenSim.Framework.Servers interfaces together
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/BaseStreamHandler.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs (renamed from OpenSim/Framework/Servers/IHttpAgentHandler.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs (renamed from OpenSim/Framework/Servers/IStreamHandler.cs) | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/RestDeserialiseHandler.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/RestSessionService.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer.Modules/OpenIdService.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 1 |
10 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 81801df..f0a5308 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
32 | using OpenSim.Framework.Servers.Interfaces; | ||
32 | 33 | ||
33 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 34 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
34 | { | 35 | { |
@@ -51,7 +52,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
51 | 52 | ||
52 | public class RestHandler : RestPlugin, IRestHandler, IHttpAgentHandler | 53 | public class RestHandler : RestPlugin, IRestHandler, IHttpAgentHandler |
53 | { | 54 | { |
54 | |||
55 | // Handler tables: both stream and REST are supported. The path handlers and their | 55 | // Handler tables: both stream and REST are supported. The path handlers and their |
56 | // respective allocators are stored in separate tables. | 56 | // respective allocators are stored in separate tables. |
57 | 57 | ||
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index f3c3016..727ccfe 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
@@ -35,6 +35,7 @@ using Nini.Config; | |||
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Servers.Interfaces; | ||
38 | 39 | ||
39 | namespace OpenSim.ApplicationPlugins.Rest | 40 | namespace OpenSim.ApplicationPlugins.Rest |
40 | { | 41 | { |
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs index 771def4..836872c 100644 --- a/OpenSim/Framework/Servers/BaseStreamHandler.cs +++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.IO; | 28 | using System.IO; |
29 | using OpenSim.Framework.Servers.Interfaces; | ||
29 | 30 | ||
30 | namespace OpenSim.Framework.Servers | 31 | namespace OpenSim.Framework.Servers |
31 | { | 32 | { |
diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs index e6ad57e..e6ad57e 100644 --- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs +++ b/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs | |||
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs index 76bf4d5..0783dfa 100644 --- a/OpenSim/Framework/Servers/IStreamHandler.cs +++ b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs | |||
@@ -53,6 +53,7 @@ namespace OpenSim.Framework.Servers | |||
53 | // Handle request stream, return byte array | 53 | // Handle request stream, return byte array |
54 | void Handle(string path, Stream request, Stream response, OSHttpRequest httpReqbuest, OSHttpResponse httpResponse); | 54 | void Handle(string path, Stream request, Stream response, OSHttpRequest httpReqbuest, OSHttpResponse httpResponse); |
55 | } | 55 | } |
56 | |||
56 | public interface IGenericHTTPHandler : IRequestHandler | 57 | public interface IGenericHTTPHandler : IRequestHandler |
57 | { | 58 | { |
58 | Hashtable Handle(string path, Hashtable request); | 59 | Hashtable Handle(string path, Hashtable request); |
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs index 41d86e5..1fba785 100644 --- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using System.Xml; | 29 | using System.Xml; |
30 | using System.Xml.Serialization; | 30 | using System.Xml.Serialization; |
31 | using OpenSim.Framework.Servers.Interfaces; | ||
31 | 32 | ||
32 | namespace OpenSim.Framework.Servers | 33 | namespace OpenSim.Framework.Servers |
33 | { | 34 | { |
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs index 60da05e..6a8b614 100644 --- a/OpenSim/Framework/Servers/RestSessionService.cs +++ b/OpenSim/Framework/Servers/RestSessionService.cs | |||
@@ -33,6 +33,7 @@ using System.Text; | |||
33 | using System.Xml; | 33 | using System.Xml; |
34 | using System.Xml.Serialization; | 34 | using System.Xml.Serialization; |
35 | using log4net; | 35 | using log4net; |
36 | using OpenSim.Framework.Servers.Interfaces; | ||
36 | 37 | ||
37 | namespace OpenSim.Framework.Servers | 38 | namespace OpenSim.Framework.Servers |
38 | { | 39 | { |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs index 3db073d..c823359 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs | |||
@@ -33,6 +33,7 @@ using OpenMetaverse; | |||
33 | using OpenMetaverse.StructuredData; | 33 | using OpenMetaverse.StructuredData; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework.Servers.Interfaces; | ||
36 | using log4net; | 37 | using log4net; |
37 | 38 | ||
38 | namespace OpenSim.Grid.AssetInventoryServer.Plugins | 39 | namespace OpenSim.Grid.AssetInventoryServer.Plugins |
diff --git a/OpenSim/Grid/UserServer.Modules/OpenIdService.cs b/OpenSim/Grid/UserServer.Modules/OpenIdService.cs index 28a8fdb..0dd4f22 100644 --- a/OpenSim/Grid/UserServer.Modules/OpenIdService.cs +++ b/OpenSim/Grid/UserServer.Modules/OpenIdService.cs | |||
@@ -35,6 +35,7 @@ using DotNetOpenId; | |||
35 | using DotNetOpenId.Provider; | 35 | using DotNetOpenId.Provider; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Servers.Interfaces; | ||
38 | 39 | ||
39 | namespace OpenSim.Grid.UserServer.Modules | 40 | namespace OpenSim.Grid.UserServer.Modules |
40 | { | 41 | { |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b979bdc..941a7d2 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Framework.Communications; | |||
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Servers; | 41 | using OpenSim.Framework.Servers; |
42 | using OpenSim.Framework.Servers.Interfaces; | ||
42 | using OpenSim.Framework.Statistics; | 43 | using OpenSim.Framework.Statistics; |
43 | using OpenSim.Region.ClientStack; | 44 | using OpenSim.Region.ClientStack; |
44 | using OpenSim.Region.Framework; | 45 | using OpenSim.Region.Framework; |