aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers/AssetServer/Handlers
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-18 12:10:56 +0000
committerMelanie Thielker2009-05-18 12:10:56 +0000
commit72adbd976cce9c20e908e4e9046d8b039194851c (patch)
treedfd21d2af0c84e5502575c16513202390a9c41d0 /OpenSim/Servers/AssetServer/Handlers
parentLogically group the server connector with it's handlers (diff)
downloadopensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.zip
opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.gz
opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.bz2
opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.xz
Nonowrking intermadiate commit,, DO NOT USE
Diffstat (limited to 'OpenSim/Servers/AssetServer/Handlers')
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs62
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs75
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs110
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs81
4 files changed, 0 insertions, 328 deletions
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
deleted file mode 100644
index 8606d38..0000000
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
+++ /dev/null
@@ -1,62 +0,0 @@
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 System;
29using Nini.Config;
30using OpenSim.Servers.Base;
31using OpenSim.Servers.AssetServer.Handlers;
32using OpenSim.Services.Interfaces;
33using OpenSim.Framework.Servers.HttpServer;
34
35namespace OpenSim.Servers.AssetServer.Handlers
36{
37 public class AssetServiceConnector
38 {
39 private IAssetService m_AssetService;
40
41 public AssetServiceConnector(IConfigSource config, IHttpServer server)
42 {
43 IConfig serverConfig = config.Configs["AssetService"];
44 if (serverConfig == null)
45 throw new Exception("No section 'Server' in config file");
46
47 string assetService = serverConfig.GetString("LocalServiceModule",
48 String.Empty);
49
50 if (assetService == String.Empty)
51 throw new Exception("No AssetService in config file");
52
53 Object[] args = new Object[] { config };
54 m_AssetService =
55 ServerUtils.LoadPlugin<IAssetService>(assetService, args);
56
57 server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
58 server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
59 server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService));
60 }
61 }
62}
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
deleted file mode 100644
index e90353b..0000000
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
+++ /dev/null
@@ -1,75 +0,0 @@
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.Handlers
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/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
deleted file mode 100644
index 7bb3364..0000000
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
+++ /dev/null
@@ -1,110 +0,0 @@
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.IO;
32using System.Reflection;
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.Handlers
44{
45 public class AssetServerGetHandler : 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 AssetServerGetHandler(IAssetService service) :
54 base("GET", "/assets")
55 {
56 m_AssetService = service;
57 }
58
59 public override byte[] Handle(string path, Stream request,
60 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
61 {
62 byte[] result = new byte[0];
63
64 string[] p = SplitParams(path);
65
66 if (p.Length == 0)
67 return result;
68
69 if (p.Length > 1 && p[1] == "data")
70 {
71 result = m_AssetService.GetData(p[0]);
72 if (result == null)
73 result = new byte[0];
74
75 httpResponse.StatusCode = (int)HttpStatusCode.OK;
76 httpResponse.ContentType = "application/octet-stream";
77 }
78 else if(p.Length > 1 && p[1] == "metadata")
79 {
80 AssetMetadata metadata = m_AssetService.GetMetadata(p[0]);
81
82 if (metadata != null)
83 {
84 XmlSerializer xs =
85 new XmlSerializer(typeof(AssetMetadata));
86 result = ServerUtils.SerializeResult(xs, metadata);
87
88 httpResponse.StatusCode = (int)HttpStatusCode.OK;
89 httpResponse.ContentType =
90 ServerUtils.SLAssetTypeToContentType(metadata.Type);
91 }
92 }
93 else
94 {
95 AssetBase asset = m_AssetService.Get(p[0]);
96
97 if (asset != null)
98 {
99 XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
100 result = ServerUtils.SerializeResult(xs, asset);
101
102 httpResponse.StatusCode = (int)HttpStatusCode.OK;
103 httpResponse.ContentType =
104 ServerUtils.SLAssetTypeToContentType(asset.Type);
105 }
106 }
107 return result;
108 }
109 }
110}
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
deleted file mode 100644
index 5a05101..0000000
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
+++ /dev/null
@@ -1,81 +0,0 @@
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.Handlers
44{
45 public class AssetServerPostHandler : 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 AssetServerPostHandler(IAssetService service) :
54 base("POST", "/assets")
55 {
56 m_AssetService = service;
57 }
58
59 public override byte[] Handle(string path, Stream request,
60 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
61 {
62 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
63 AssetBase asset = (AssetBase) xs.Deserialize(request);
64
65 string[] p = SplitParams(path);
66 if (p.Length > 1)
67 {
68 bool result =
69 m_AssetService.UpdateContent(p[1], asset.Data);
70
71 xs = new XmlSerializer(typeof(bool));
72 return ServerUtils.SerializeResult(xs, result);
73 }
74
75 string id = m_AssetService.Store(asset);
76
77 xs = new XmlSerializer(typeof(string));
78 return ServerUtils.SerializeResult(xs, id);
79 }
80 }
81}
generated by cgit v1.1 at 2024-12-22 14:04:25 +0000