From 801da4346aeb3c08969c4845f5c595135a64470a Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 12 Feb 2009 09:53:12 +0000 Subject: * optimized usings. --- OpenSim/Framework/Servers/BaseHTTPHandler.cs | 1 - OpenSim/Framework/Servers/BaseHttpServer.cs | 16 ++++++++-------- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 5 +++-- OpenSim/Framework/Servers/BaseStreamHandler.cs | 1 - OpenSim/Framework/Servers/BinaryStreamHandler.cs | 1 - OpenSim/Framework/Servers/IHttpAgentHandler.cs | 4 ---- OpenSim/Framework/Servers/IStreamHandler.cs | 1 - OpenSim/Framework/Servers/OSHttpRequest.cs | 2 +- OpenSim/Framework/Servers/OSHttpResponse.cs | 2 -- OpenSim/Framework/Servers/RestDeserialiseHandler.cs | 1 - OpenSim/Framework/Servers/RestHTTPHandler.cs | 1 - OpenSim/Framework/Servers/RestSessionService.cs | 2 -- OpenSim/Framework/Servers/RestStreamHandler.cs | 1 - OpenSim/Framework/Servers/Tests/OSHttpTests.cs | 9 ++------- 14 files changed, 14 insertions(+), 33 deletions(-) (limited to 'OpenSim/Framework/Servers') diff --git a/OpenSim/Framework/Servers/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/BaseHTTPHandler.cs index a7c3562..2aa37fb 100644 --- a/OpenSim/Framework/Servers/BaseHTTPHandler.cs +++ b/OpenSim/Framework/Servers/BaseHTTPHandler.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections; namespace OpenSim.Framework.Servers diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index d69b2c0..620a7f6 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -35,12 +35,12 @@ using System.Reflection; using System.Text; using System.Threading; using System.Xml; -using OpenMetaverse.StructuredData; +using HttpServer; using log4net; using Nwc.XmlRpc; +using OpenMetaverse.StructuredData; using CoolHTTPListener = HttpServer.HttpListener; -using IHttpClientContext = HttpServer.IHttpClientContext; -using IHttpRequest = HttpServer.IHttpRequest; +using HttpListener=System.Net.HttpListener; namespace OpenSim.Framework.Servers { @@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request) { OSHttpRequest req = new OSHttpRequest(context, request); - OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(context, request)); + OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request)); //resp.KeepAlive = req.KeepAlive; //m_log.Info("[Debug BASE HTTP SERVER]: Got Request"); //HttpServerContextObj objstate= new HttpServerContextObj(req,resp); @@ -1373,7 +1373,7 @@ namespace OpenSim.Framework.Servers { //m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/"); - m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port); + m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port); m_httpListener2.ExceptionThrown += httpServerException; m_httpListener2.LogWriter = httpserverlog; @@ -1408,7 +1408,7 @@ namespace OpenSim.Framework.Servers } } - public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) + public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err) { switch (err) { @@ -1564,11 +1564,11 @@ namespace OpenSim.Framework.Servers /// Relays HttpServer log messages to our own logging mechanism. /// /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information - public class HttpServerLogWriter : HttpServer.ILogWriter + public class HttpServerLogWriter : ILogWriter { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public void Write(object source, HttpServer.LogPrio priority, string message) + public void Write(object source, LogPrio priority, string message) { /* switch (priority) diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index ff53e1a..4cbbecc 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -38,6 +38,7 @@ using log4net.Core; using log4net.Repository; using OpenSim.Framework.Console; using OpenSim.Framework.Statistics; +using Timer=System.Timers.Timer; namespace OpenSim.Framework.Servers { @@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers /// This will control a periodic log printout of the current 'show stats' (if they are active) for this /// server. /// - private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000); + private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); protected ConsoleBase m_console; @@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers // If there is no threshold set then the threshold is effectively everything. Level thresholdLevel - = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); + = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All); Notice(String.Format("Console log level is {0}", thresholdLevel)); } diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs index 6b0614f..771def4 100644 --- a/OpenSim/Framework/Servers/BaseStreamHandler.cs +++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs @@ -26,7 +26,6 @@ */ using System.IO; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs index 26a6f10..6540798 100644 --- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs +++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs @@ -27,7 +27,6 @@ using System.IO; using System.Text; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/IHttpAgentHandler.cs index ff3a5b9..e6ad57e 100644 --- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs +++ b/OpenSim/Framework/Servers/IHttpAgentHandler.cs @@ -25,10 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections; -using System.IO; -using System.Net; - namespace OpenSim.Framework.Servers { public interface IHttpAgentHandler diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs index b3ce34d..76bf4d5 100644 --- a/OpenSim/Framework/Servers/IStreamHandler.cs +++ b/OpenSim/Framework/Servers/IStreamHandler.cs @@ -27,7 +27,6 @@ using System.Collections; using System.IO; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index 4c7d7ce..8e0cb38 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs @@ -29,8 +29,8 @@ using System; using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; -using System.Net; using System.IO; +using System.Net; using System.Reflection; using System.Text; using HttpServer; diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs index 4947156..ff02edd 100644 --- a/OpenSim/Framework/Servers/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/OSHttpResponse.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections; using System.IO; using System.Net; using System.Text; diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs index 5c2dd4a..41d86e5 100644 --- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs @@ -26,7 +26,6 @@ */ using System.IO; -using System.Net; using System.Xml; using System.Xml.Serialization; diff --git a/OpenSim/Framework/Servers/RestHTTPHandler.cs b/OpenSim/Framework/Servers/RestHTTPHandler.cs index 2974c56..5722885 100644 --- a/OpenSim/Framework/Servers/RestHTTPHandler.cs +++ b/OpenSim/Framework/Servers/RestHTTPHandler.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections; namespace OpenSim.Framework.Servers diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs index 958ee26..60da05e 100644 --- a/OpenSim/Framework/Servers/RestSessionService.cs +++ b/OpenSim/Framework/Servers/RestSessionService.cs @@ -28,12 +28,10 @@ using System; using System.IO; using System.Net; -using System.Collections.Generic; using System.Reflection; using System.Text; using System.Xml; using System.Xml.Serialization; - using log4net; namespace OpenSim.Framework.Servers diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs index 44c9dfc..afd7fe5 100644 --- a/OpenSim/Framework/Servers/RestStreamHandler.cs +++ b/OpenSim/Framework/Servers/RestStreamHandler.cs @@ -27,7 +27,6 @@ using System.IO; using System.Text; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs index fe553c9..3a297bf 100644 --- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs +++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs @@ -31,23 +31,18 @@ using System.IO; using System.Net; using System.Net.Sockets; using System.Text; - using HttpServer; -using HttpServer.Exceptions; using HttpServer.FormDecoders; - using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework.Servers; - namespace OpenSim.Framework.Servers.Tests { [TestFixture] public class OSHttpTests { // we need an IHttpClientContext for our tests - public class TestHttpClientContext: HttpServer.IHttpClientContext + public class TestHttpClientContext: IHttpClientContext { private bool _secured; public bool Secured @@ -68,7 +63,7 @@ namespace OpenSim.Framework.Servers.Tests public void Send(byte[] buffer, int offset, int size) {} } - public class TestHttpRequest: HttpServer.IHttpRequest + public class TestHttpRequest: IHttpRequest { public bool BodyIsComplete { -- cgit v1.1