From c1e7352d75b62b6c97e79c4fdb37b9493aba697a Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 9 May 2009 02:49:55 +0000 Subject: Add the asset service connectors and sample config. READ WARNINGS!!! --- OpenSim/Servers/Asset/AssetServerConnector.cs | 19 +++++- OpenSim/Servers/Asset/AssetServerDeleteHandler.cs | 75 +++++++++++++++++++++++ OpenSim/Servers/Asset/AssetServerGetHandler.cs | 7 ++- OpenSim/Servers/Asset/AssetServerPostHandler.cs | 19 +++++- 4 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 OpenSim/Servers/Asset/AssetServerDeleteHandler.cs (limited to 'OpenSim/Servers/Asset') diff --git a/OpenSim/Servers/Asset/AssetServerConnector.cs b/OpenSim/Servers/Asset/AssetServerConnector.cs index c9d2300..32e27c5 100644 --- a/OpenSim/Servers/Asset/AssetServerConnector.cs +++ b/OpenSim/Servers/Asset/AssetServerConnector.cs @@ -25,9 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using Nini.Config; +using OpenSim.Servers.Base; using OpenSim.Services.Interfaces; -using OpenSim.Services.AssetService; using OpenSim.Framework.Servers.HttpServer; namespace OpenSim.Servers.AssetServer @@ -38,9 +39,23 @@ namespace OpenSim.Servers.AssetServer public AssetServiceConnector(IConfigSource config, IHttpServer server) { - m_AssetService = new AssetService(config); + IConfig serverConfig = config.Configs["AssetService"]; + if (serverConfig == null) + throw new Exception("No section 'Server' in config file"); + + string assetService = serverConfig.GetString("Module", + 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/Asset/AssetServerDeleteHandler.cs b/OpenSim/Servers/Asset/AssetServerDeleteHandler.cs new file mode 100644 index 0000000..010d7a7 --- /dev/null +++ b/OpenSim/Servers/Asset/AssetServerDeleteHandler.cs @@ -0,0 +1,75 @@ +/* + * 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 Nini.Config; +using log4net; +using System; +using System.Reflection; +using System.IO; +using System.Net; +using System.Text; +using System.Text.RegularExpressions; +using System.Xml; +using System.Xml.Serialization; +using OpenSim.Servers.Base; +using OpenSim.Services.Interfaces; +using OpenSim.Framework; +using OpenSim.Framework.Servers.HttpServer; + +namespace OpenSim.Servers.AssetServer +{ + public class AssetServerDeleteHandler : BaseStreamHandler + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + private IAssetService m_AssetService; + + public AssetServerDeleteHandler(IAssetService service) : + base("DELETE", "/assets") + { + m_AssetService = service; + } + + public override byte[] Handle(string path, Stream request, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) + { + bool result = false; + + string[] p = SplitParams(path); + + if (p.Length > 0) + { + result = m_AssetService.Delete(p[0]); + } + + XmlSerializer xs = new XmlSerializer(typeof(bool)); + return ServerUtils.SerializeResult(xs, result); + } + } +} diff --git a/OpenSim/Servers/Asset/AssetServerGetHandler.cs b/OpenSim/Servers/Asset/AssetServerGetHandler.cs index 1535fb5..935a07c 100644 --- a/OpenSim/Servers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Servers/Asset/AssetServerGetHandler.cs @@ -26,8 +26,10 @@ */ using Nini.Config; +using log4net; using System; using System.IO; +using System.Reflection; using System.Net; using System.Text; using System.Text.RegularExpressions; @@ -35,7 +37,6 @@ using System.Xml; using System.Xml.Serialization; using OpenSim.Servers.Base; using OpenSim.Services.Interfaces; -using OpenSim.Services.AssetService; using OpenSim.Framework; using OpenSim.Framework.Servers.HttpServer; @@ -43,6 +44,10 @@ namespace OpenSim.Servers.AssetServer { public class AssetServerGetHandler : BaseStreamHandler { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + private IAssetService m_AssetService; public AssetServerGetHandler(IAssetService service) : diff --git a/OpenSim/Servers/Asset/AssetServerPostHandler.cs b/OpenSim/Servers/Asset/AssetServerPostHandler.cs index fb626c6..70cb16a 100644 --- a/OpenSim/Servers/Asset/AssetServerPostHandler.cs +++ b/OpenSim/Servers/Asset/AssetServerPostHandler.cs @@ -26,7 +26,9 @@ */ using Nini.Config; +using log4net; using System; +using System.Reflection; using System.IO; using System.Net; using System.Text; @@ -35,7 +37,6 @@ using System.Xml; using System.Xml.Serialization; using OpenSim.Servers.Base; using OpenSim.Services.Interfaces; -using OpenSim.Services.AssetService; using OpenSim.Framework; using OpenSim.Framework.Servers.HttpServer; @@ -43,6 +44,10 @@ namespace OpenSim.Servers.AssetServer { public class AssetServerPostHandler : BaseStreamHandler { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + private IAssetService m_AssetService; public AssetServerPostHandler(IAssetService service) : @@ -54,11 +59,19 @@ namespace OpenSim.Servers.AssetServer public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { - byte[] result = new byte[0]; - XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); AssetBase asset = (AssetBase) xs.Deserialize(request); + string[] p = SplitParams(path); + if (p.Length > 1) + { + bool result = + m_AssetService.UpdateContent(asset.ID, asset.Data); + + xs = new XmlSerializer(typeof(bool)); + return ServerUtils.SerializeResult(xs, result); + } + string id = m_AssetService.Store(asset); xs = new XmlSerializer(typeof(string)); -- cgit v1.1