aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-09 02:49:55 +0000
committerMelanie Thielker2009-05-09 02:49:55 +0000
commitc1e7352d75b62b6c97e79c4fdb37b9493aba697a (patch)
tree0bf2e2b12fafc2fc08dce9c50a0fa198b787979c /OpenSim/Servers
parentFInish basic asset server functionality on the new asset server (diff)
downloadopensim-SC_OLD-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.zip
opensim-SC_OLD-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.tar.gz
opensim-SC_OLD-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.tar.bz2
opensim-SC_OLD-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.tar.xz
Add the asset service connectors and sample config. READ WARNINGS!!!
Diffstat (limited to 'OpenSim/Servers')
-rw-r--r--OpenSim/Servers/Asset/AssetServerConnector.cs19
-rw-r--r--OpenSim/Servers/Asset/AssetServerDeleteHandler.cs75
-rw-r--r--OpenSim/Servers/Asset/AssetServerGetHandler.cs7
-rw-r--r--OpenSim/Servers/Asset/AssetServerPostHandler.cs19
-rw-r--r--OpenSim/Servers/Base/ServerUtils.cs35
5 files changed, 148 insertions, 7 deletions
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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using Nini.Config; 29using Nini.Config;
30using OpenSim.Servers.Base;
29using OpenSim.Services.Interfaces; 31using OpenSim.Services.Interfaces;
30using OpenSim.Services.AssetService;
31using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
32 33
33namespace OpenSim.Servers.AssetServer 34namespace OpenSim.Servers.AssetServer
@@ -38,9 +39,23 @@ namespace OpenSim.Servers.AssetServer
38 39
39 public AssetServiceConnector(IConfigSource config, IHttpServer server) 40 public AssetServiceConnector(IConfigSource config, IHttpServer server)
40 { 41 {
41 m_AssetService = new AssetService(config); 42 IConfig serverConfig = config.Configs["AssetService"];
43 if (serverConfig == null)
44 throw new Exception("No section 'Server' in config file");
45
46 string assetService = serverConfig.GetString("Module",
47 String.Empty);
48
49 if (assetService == String.Empty)
50 throw new Exception("No AssetService in config file");
51
52 Object[] args = new Object[] { config };
53 m_AssetService =
54 ServerUtils.LoadPlugin<IAssetService>(assetService, args);
42 55
43 server.AddStreamHandler(new AssetServerGetHandler(m_AssetService)); 56 server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
57 server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
58 server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService));
44 } 59 }
45 } 60 }
46} 61}
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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using Nini.Config;
29using log4net;
30using System;
31using System.Reflection;
32using System.IO;
33using System.Net;
34using System.Text;
35using System.Text.RegularExpressions;
36using System.Xml;
37using System.Xml.Serialization;
38using OpenSim.Servers.Base;
39using OpenSim.Services.Interfaces;
40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer;
42
43namespace OpenSim.Servers.AssetServer
44{
45 public class AssetServerDeleteHandler : BaseStreamHandler
46 {
47 private static readonly ILog m_log =
48 LogManager.GetLogger(
49 MethodBase.GetCurrentMethod().DeclaringType);
50
51 private IAssetService m_AssetService;
52
53 public AssetServerDeleteHandler(IAssetService service) :
54 base("DELETE", "/assets")
55 {
56 m_AssetService = service;
57 }
58
59 public override byte[] Handle(string path, Stream request,
60 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
61 {
62 bool result = false;
63
64 string[] p = SplitParams(path);
65
66 if (p.Length > 0)
67 {
68 result = m_AssetService.Delete(p[0]);
69 }
70
71 XmlSerializer xs = new XmlSerializer(typeof(bool));
72 return ServerUtils.SerializeResult(xs, result);
73 }
74 }
75}
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 @@
26 */ 26 */
27 27
28using Nini.Config; 28using Nini.Config;
29using log4net;
29using System; 30using System;
30using System.IO; 31using System.IO;
32using System.Reflection;
31using System.Net; 33using System.Net;
32using System.Text; 34using System.Text;
33using System.Text.RegularExpressions; 35using System.Text.RegularExpressions;
@@ -35,7 +37,6 @@ using System.Xml;
35using System.Xml.Serialization; 37using System.Xml.Serialization;
36using OpenSim.Servers.Base; 38using OpenSim.Servers.Base;
37using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
38using OpenSim.Services.AssetService;
39using OpenSim.Framework; 40using OpenSim.Framework;
40using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
41 42
@@ -43,6 +44,10 @@ namespace OpenSim.Servers.AssetServer
43{ 44{
44 public class AssetServerGetHandler : BaseStreamHandler 45 public class AssetServerGetHandler : BaseStreamHandler
45 { 46 {
47 private static readonly ILog m_log =
48 LogManager.GetLogger(
49 MethodBase.GetCurrentMethod().DeclaringType);
50
46 private IAssetService m_AssetService; 51 private IAssetService m_AssetService;
47 52
48 public AssetServerGetHandler(IAssetService service) : 53 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 @@
26 */ 26 */
27 27
28using Nini.Config; 28using Nini.Config;
29using log4net;
29using System; 30using System;
31using System.Reflection;
30using System.IO; 32using System.IO;
31using System.Net; 33using System.Net;
32using System.Text; 34using System.Text;
@@ -35,7 +37,6 @@ using System.Xml;
35using System.Xml.Serialization; 37using System.Xml.Serialization;
36using OpenSim.Servers.Base; 38using OpenSim.Servers.Base;
37using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
38using OpenSim.Services.AssetService;
39using OpenSim.Framework; 40using OpenSim.Framework;
40using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
41 42
@@ -43,6 +44,10 @@ namespace OpenSim.Servers.AssetServer
43{ 44{
44 public class AssetServerPostHandler : BaseStreamHandler 45 public class AssetServerPostHandler : BaseStreamHandler
45 { 46 {
47 private static readonly ILog m_log =
48 LogManager.GetLogger(
49 MethodBase.GetCurrentMethod().DeclaringType);
50
46 private IAssetService m_AssetService; 51 private IAssetService m_AssetService;
47 52
48 public AssetServerPostHandler(IAssetService service) : 53 public AssetServerPostHandler(IAssetService service) :
@@ -54,11 +59,19 @@ namespace OpenSim.Servers.AssetServer
54 public override byte[] Handle(string path, Stream request, 59 public override byte[] Handle(string path, Stream request,
55 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 60 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
56 { 61 {
57 byte[] result = new byte[0];
58
59 XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); 62 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
60 AssetBase asset = (AssetBase) xs.Deserialize(request); 63 AssetBase asset = (AssetBase) xs.Deserialize(request);
61 64
65 string[] p = SplitParams(path);
66 if (p.Length > 1)
67 {
68 bool result =
69 m_AssetService.UpdateContent(asset.ID, asset.Data);
70
71 xs = new XmlSerializer(typeof(bool));
72 return ServerUtils.SerializeResult(xs, result);
73 }
74
62 string id = m_AssetService.Store(asset); 75 string id = m_AssetService.Store(asset);
63 76
64 xs = new XmlSerializer(typeof(string)); 77 xs = new XmlSerializer(typeof(string));
diff --git a/OpenSim/Servers/Base/ServerUtils.cs b/OpenSim/Servers/Base/ServerUtils.cs
index 58d2b2b..4e8f472 100644
--- a/OpenSim/Servers/Base/ServerUtils.cs
+++ b/OpenSim/Servers/Base/ServerUtils.cs
@@ -27,11 +27,12 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using System.Xml; 31using System.Xml;
31using System.Xml.Serialization; 32using System.Xml.Serialization;
32using System.Text; 33using System.Text;
33 34
34namespace OpenSim.Servers.AssetServer 35namespace OpenSim.Servers.Base
35{ 36{
36 public static class ServerUtils 37 public static class ServerUtils
37 { 38 {
@@ -92,5 +93,37 @@ namespace OpenSim.Servers.AssetServer
92 93
93 return ret; 94 return ret;
94 } 95 }
96
97 public static T LoadPlugin<T>(string dllName, Object[] args) where T:class
98 {
99 string interfaceName = typeof(T).ToString();
100
101 try
102 {
103 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
104
105 foreach (Type pluginType in pluginAssembly.GetTypes())
106 {
107 if (pluginType.IsPublic)
108 {
109 Type typeInterface =
110 pluginType.GetInterface(interfaceName, true);
111 if (typeInterface != null)
112 {
113 T plug = (T)Activator.CreateInstance(pluginType,
114 args);
115
116 return plug;
117 }
118 }
119 }
120
121 return null;
122 }
123 catch (Exception e)
124 {
125 return null;
126 }
127 }
95 } 128 }
96} 129}