From e24be9aac9e86cd542a784b3c8955a23d31a1d31 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 18 May 2009 11:50:17 +0000 Subject: Logically group the server connector with it's handlers --- .../Servers/AssetServer/AssetServerConnector.cs | 62 ---------------------- OpenSim/Servers/AssetServer/AssetServerMain.cs | 1 + .../AssetServer/Handlers/AssetServerConnector.cs | 62 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 62 deletions(-) delete mode 100644 OpenSim/Servers/AssetServer/AssetServerConnector.cs create mode 100644 OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs (limited to 'OpenSim') diff --git a/OpenSim/Servers/AssetServer/AssetServerConnector.cs b/OpenSim/Servers/AssetServer/AssetServerConnector.cs deleted file mode 100644 index 1801e68..0000000 --- a/OpenSim/Servers/AssetServer/AssetServerConnector.cs +++ /dev/null @@ -1,62 +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; -using Nini.Config; -using OpenSim.Servers.Base; -using OpenSim.Servers.AssetServer.Handlers; -using OpenSim.Services.Interfaces; -using OpenSim.Framework.Servers.HttpServer; - -namespace OpenSim.Servers.AssetServer -{ - public class AssetServiceConnector - { - private IAssetService m_AssetService; - - public AssetServiceConnector(IConfigSource config, IHttpServer server) - { - IConfig serverConfig = config.Configs["AssetService"]; - if (serverConfig == null) - throw new Exception("No section 'Server' in config file"); - - string assetService = serverConfig.GetString("LocalServiceModule", - String.Empty); - - if (assetService == String.Empty) - throw new Exception("No AssetService in config file"); - - Object[] args = new Object[] { config }; - m_AssetService = - ServerUtils.LoadPlugin(assetService, args); - - server.AddStreamHandler(new AssetServerGetHandler(m_AssetService)); - server.AddStreamHandler(new AssetServerPostHandler(m_AssetService)); - server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService)); - } - } -} diff --git a/OpenSim/Servers/AssetServer/AssetServerMain.cs b/OpenSim/Servers/AssetServer/AssetServerMain.cs index bc738d7..8e3bc14 100644 --- a/OpenSim/Servers/AssetServer/AssetServerMain.cs +++ b/OpenSim/Servers/AssetServer/AssetServerMain.cs @@ -27,6 +27,7 @@ using System; using OpenSim.Servers.Base; +using OpenSim.Servers.AssetServer.Handlers; namespace OpenSim.Servers.AssetServer { diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs new file mode 100644 index 0000000..8606d38 --- /dev/null +++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs @@ -0,0 +1,62 @@ +/* + * 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; +using Nini.Config; +using OpenSim.Servers.Base; +using OpenSim.Servers.AssetServer.Handlers; +using OpenSim.Services.Interfaces; +using OpenSim.Framework.Servers.HttpServer; + +namespace OpenSim.Servers.AssetServer.Handlers +{ + public class AssetServiceConnector + { + private IAssetService m_AssetService; + + public AssetServiceConnector(IConfigSource config, IHttpServer server) + { + IConfig serverConfig = config.Configs["AssetService"]; + if (serverConfig == null) + throw new Exception("No section 'Server' in config file"); + + string assetService = serverConfig.GetString("LocalServiceModule", + String.Empty); + + if (assetService == String.Empty) + throw new Exception("No AssetService in config file"); + + Object[] args = new Object[] { config }; + m_AssetService = + ServerUtils.LoadPlugin(assetService, args); + + server.AddStreamHandler(new AssetServerGetHandler(m_AssetService)); + server.AddStreamHandler(new AssetServerPostHandler(m_AssetService)); + server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService)); + } + } +} -- cgit v1.1