From acfb5051cd328ab21aba5bfc2878ce84d496a7f1 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 4 May 2009 20:15:39 +0000 Subject: Intermediate commit. WILL NOT COMPILE! --- .../Servers/Interfaces/IHttpAgentHandler.cs | 35 ------ .../Framework/Servers/Interfaces/IHttpServer.cs | 127 --------------------- .../Framework/Servers/Interfaces/IStreamHandler.cs | 61 ---------- 3 files changed, 223 deletions(-) delete mode 100644 OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs delete mode 100644 OpenSim/Framework/Servers/Interfaces/IHttpServer.cs delete mode 100644 OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs (limited to 'OpenSim/Framework/Servers/Interfaces') diff --git a/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs deleted file mode 100644 index e6ad57e..0000000 --- a/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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. - */ - -namespace OpenSim.Framework.Servers -{ - public interface IHttpAgentHandler - { - bool Handle(OSHttpRequest req, OSHttpResponse resp); - bool Match(OSHttpRequest req, OSHttpResponse resp); - } -} diff --git a/OpenSim/Framework/Servers/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/Interfaces/IHttpServer.cs deleted file mode 100644 index ea2c8f1..0000000 --- a/OpenSim/Framework/Servers/Interfaces/IHttpServer.cs +++ /dev/null @@ -1,127 +0,0 @@ -/* - * 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 Nwc.XmlRpc; -using OpenSim.Framework.Servers; - -namespace OpenSim.Framework.Servers.Interfaces -{ - /// - /// Interface to OpenSimulator's built in HTTP server. Use this to register handlers (http, llsd, xmlrpc, etc.) - /// for given URLs. - /// - public interface IHttpServer - { - uint SSLPort { get; } - string SSLCommonName { get; } - - uint Port { get; } - bool UseSSL { get; } - - // Note that the agent string is provided simply to differentiate - // the handlers - it is NOT required to be an actual agent header - // value. - bool AddAgentHandler(string agent, IHttpAgentHandler handler); - - /// - /// Add a handler for an HTTP request - /// - /// - /// This handler can actually be invoked either as - /// - /// http://:/?method= - /// - /// or - /// - /// http://: - /// - /// if the method name starts with a slash. For example, AddHTTPHandler("/object/", ...) on a standalone region - /// server will register a handler that can be invoked with either - /// - /// http://localhost:9000/?method=/object/ - /// - /// or - /// - /// http://localhost:9000/object/ - /// - /// - /// - /// - /// true if the handler was successfully registered, false if a handler with the same name already existed. - /// - bool AddHTTPHandler(string methodName, GenericHTTPMethod handler); - - /// - /// Adds a LLSD handler, yay. - /// - /// /resource/ path - /// handle the LLSD response - /// - bool AddLLSDHandler(string path, LLSDMethod handler); - - /// - /// Add a stream handler to the http server. If the handler already exists, then nothing happens. - /// - /// - void AddStreamHandler(IRequestHandler handler); - - bool AddXmlRPCHandler(string method, XmlRpcMethod handler); - bool AddXmlRPCHandler(string method, XmlRpcMethod handler, bool keepAlive); - - /// - /// Gets the XML RPC handler for given method name - /// - /// Name of the method - /// Returns null if not found - XmlRpcMethod GetXmlRPCHandler(string method); - - bool SetDefaultLLSDHandler(DefaultLLSDMethod handler); - - /// - /// Remove the agent if it is registered. - /// - /// - /// - /// - bool RemoveAgentHandler(string agent, IHttpAgentHandler handler); - - /// - /// Remove an HTTP handler - /// - /// - /// - void RemoveHTTPHandler(string httpMethod, string path); - - bool RemoveLLSDHandler(string path, LLSDMethod handler); - - void RemoveStreamHandler(string httpMethod, string path); - - string GetHTTP404(string host); - - string GetHTTP500(); - } -} \ No newline at end of file diff --git a/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs deleted file mode 100644 index 0783dfa..0000000 --- a/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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.Collections; -using System.IO; - -namespace OpenSim.Framework.Servers -{ - public interface IRequestHandler - { - // Return response content type - string ContentType { get; } - - // Return required http method - string HttpMethod { get; } - - // Return path - string Path { get; } - } - - public interface IStreamedRequestHandler : IRequestHandler - { - // Handle request stream, return byte array - byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse); - } - - public interface IStreamHandler : IRequestHandler - { - // 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); - } -} -- cgit v1.1