aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers
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
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')
-rw-r--r--OpenSim/Servers/AssetServer/AssetServerMain.cs50
-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
-rw-r--r--OpenSim/Servers/Base/HttpServerBase.cs86
-rw-r--r--OpenSim/Servers/Base/ServerUtils.cs148
-rw-r--r--OpenSim/Servers/Base/ServicesServerBase.cs233
8 files changed, 0 insertions, 845 deletions
diff --git a/OpenSim/Servers/AssetServer/AssetServerMain.cs b/OpenSim/Servers/AssetServer/AssetServerMain.cs
deleted file mode 100644
index 8e3bc14..0000000
--- a/OpenSim/Servers/AssetServer/AssetServerMain.cs
+++ /dev/null
@@ -1,50 +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 OpenSim.Servers.Base;
30using OpenSim.Servers.AssetServer.Handlers;
31
32namespace OpenSim.Servers.AssetServer
33{
34 public class AssetServer
35 {
36 protected static HttpServerBase m_Server = null;
37
38 protected static AssetServiceConnector m_AssetServiceConnector;
39
40 static int Main(string[] args)
41 {
42 m_Server = new HttpServerBase("Asset", args);
43
44 m_AssetServiceConnector = new AssetServiceConnector(m_Server.Config,
45 m_Server.HttpServer);
46
47 return m_Server.Run();
48 }
49 }
50}
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}
diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Servers/Base/HttpServerBase.cs
deleted file mode 100644
index 5286744..0000000
--- a/OpenSim/Servers/Base/HttpServerBase.cs
+++ /dev/null
@@ -1,86 +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 System.Threading;
30using System.Reflection;
31using OpenSim.Framework.Console;
32using OpenSim.Framework.Servers.HttpServer;
33using log4net;
34using Nini.Config;
35
36namespace OpenSim.Servers.Base
37{
38 public class HttpServerBase : ServicesServerBase
39 {
40 // Logger
41 //
42 private static readonly ILog m_log =
43 LogManager.GetLogger(
44 MethodBase.GetCurrentMethod().DeclaringType);
45
46 // The http server instance
47 //
48 protected BaseHttpServer m_HttpServer = null;
49
50 public IHttpServer HttpServer
51 {
52 get { return m_HttpServer; }
53 }
54
55 // Handle all the automagical stuff
56 //
57 public HttpServerBase(string prompt, string[] args) : base(prompt, args)
58 {
59 }
60
61 protected override void ReadConfig()
62 {
63 IConfig networkConfig = m_Config.Configs["Network"];
64
65 if (networkConfig == null)
66 {
67 System.Console.WriteLine("Section 'Network' not found, server can't start");
68 Thread.CurrentThread.Abort();
69 }
70 uint port = (uint)networkConfig.GetInt("port", 0);
71
72 if (port == 0)
73 {
74 System.Console.WriteLine("Port number not specified or 0, server can't start");
75 Thread.CurrentThread.Abort();
76 }
77
78 m_HttpServer = new BaseHttpServer(port);
79 }
80
81 protected override void Initialise()
82 {
83 m_HttpServer.Start();
84 }
85 }
86}
diff --git a/OpenSim/Servers/Base/ServerUtils.cs b/OpenSim/Servers/Base/ServerUtils.cs
deleted file mode 100644
index 834576b..0000000
--- a/OpenSim/Servers/Base/ServerUtils.cs
+++ /dev/null
@@ -1,148 +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 System.IO;
30using System.Reflection;
31using System.Xml;
32using System.Xml.Serialization;
33using System.Text;
34
35namespace OpenSim.Servers.Base
36{
37 public static class ServerUtils
38 {
39 public static string SLAssetTypeToContentType(int assetType)
40 {
41 switch (assetType)
42 {
43 case 0:
44 return "image/jp2";
45 case 1:
46 return "application/ogg";
47 case 2:
48 return "application/x-metaverse-callingcard";
49 case 3:
50 return "application/x-metaverse-landmark";
51 case 5:
52 return "application/x-metaverse-clothing";
53 case 6:
54 return "application/x-metaverse-primitive";
55 case 7:
56 return "application/x-metaverse-notecard";
57 case 8:
58 return "application/x-metaverse-folder";
59 case 10:
60 return "application/x-metaverse-lsl";
61 case 11:
62 return "application/x-metaverse-lso";
63 case 12:
64 return "image/tga";
65 case 13:
66 return "application/x-metaverse-bodypart";
67 case 17:
68 return "audio/x-wav";
69 case 19:
70 return "image/jpeg";
71 case 20:
72 return "application/x-metaverse-animation";
73 case 21:
74 return "application/x-metaverse-gesture";
75 case 22:
76 return "application/x-metaverse-simstate";
77 default:
78 return "application/octet-stream";
79 }
80 }
81
82 public static byte[] SerializeResult(XmlSerializer xs, object data)
83 {
84 MemoryStream ms = new MemoryStream();
85 XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
86 xw.Formatting = Formatting.Indented;
87 xs.Serialize(xw, data);
88 xw.Flush();
89
90 ms.Seek(0, SeekOrigin.Begin);
91 byte[] ret = ms.GetBuffer();
92 Array.Resize<byte>(ref ret, (int)ms.Length);
93
94 return ret;
95 }
96
97 public static T LoadPlugin<T>(string dllName, Object[] args) where T:class
98 {
99 string[] parts = dllName.Split(new char[] {':'});
100
101 dllName = parts[0];
102
103 string className = String.Empty;
104
105 if (parts.Length > 1)
106 className = parts[1];
107
108 return LoadPlugin<T>(dllName, className, args);
109 }
110
111 public static T LoadPlugin<T>(string dllName, string className, Object[] args) where T:class
112 {
113 string interfaceName = typeof(T).ToString();
114
115 try
116 {
117 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
118
119 foreach (Type pluginType in pluginAssembly.GetTypes())
120 {
121 if (pluginType.IsPublic)
122 {
123 if (className != String.Empty &&
124 pluginType.ToString() !=
125 pluginType.Namespace + "." + className)
126 continue;
127
128 Type typeInterface =
129 pluginType.GetInterface(interfaceName, true);
130 if (typeInterface != null)
131 {
132 T plug = (T)Activator.CreateInstance(pluginType,
133 args);
134
135 return plug;
136 }
137 }
138 }
139
140 return null;
141 }
142 catch (Exception e)
143 {
144 return null;
145 }
146 }
147 }
148}
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs
deleted file mode 100644
index 6129407..0000000
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ /dev/null
@@ -1,233 +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 System.Xml;
30using System.Threading;
31using System.Reflection;
32using OpenSim.Framework.Console;
33using log4net;
34using log4net.Config;
35using log4net.Appender;
36using log4net.Core;
37using log4net.Repository;
38using Nini.Config;
39
40namespace OpenSim.Servers.Base
41{
42 public class ServicesServerBase
43 {
44 // Logger
45 //
46 private static readonly ILog m_log =
47 LogManager.GetLogger(
48 MethodBase.GetCurrentMethod().DeclaringType);
49
50 // Command line args
51 //
52 protected string[] m_Arguments;
53
54 // Configuration
55 //
56 protected IConfigSource m_Config = null;
57
58 public IConfigSource Config
59 {
60 get { return m_Config; }
61 }
62
63 // Run flag
64 //
65 private bool m_Running = true;
66
67 // Handle all the automagical stuff
68 //
69 public ServicesServerBase(string prompt, string[] args)
70 {
71 // Save raw arguments
72 //
73 m_Arguments = args;
74
75 // Read command line
76 //
77 ArgvConfigSource argvConfig = new ArgvConfigSource(args);
78
79 argvConfig.AddSwitch("Startup", "console", "c");
80 argvConfig.AddSwitch("Startup", "logfile", "l");
81 argvConfig.AddSwitch("Startup", "inifile", "i");
82
83 // Automagically create the ini file name
84 //
85 string fullName = Assembly.GetEntryAssembly().FullName;
86 AssemblyName assemblyName = new AssemblyName(fullName);
87
88 string iniFile = assemblyName.Name + ".ini";
89
90 // Check if a file name was given on the command line
91 //
92 IConfig startupConfig = argvConfig.Configs["Startup"];
93 if (startupConfig != null)
94 iniFile = startupConfig.GetString("inifile", iniFile);
95
96 // Find out of the file name is a URI and remote load it
97 // if it's possible. Load it as a local file otherwise.
98 //
99 Uri configUri;
100
101 try
102 {
103 if (Uri.TryCreate(iniFile, UriKind.Absolute, out configUri) &&
104 configUri.Scheme == Uri.UriSchemeHttp)
105 {
106 XmlReader r = XmlReader.Create(iniFile);
107 m_Config = new XmlConfigSource(r);
108 }
109 else
110 {
111 m_Config = new IniConfigSource(iniFile);
112 }
113 }
114 catch (Exception)
115 {
116 System.Console.WriteLine("Error reading from config source {0}",
117 iniFile);
118 Thread.CurrentThread.Abort();
119 }
120
121 // Merge the configuration from the command line into the
122 // loaded file
123 //
124 m_Config.Merge(argvConfig);
125
126 // Refresh the startupConfig post merge
127 //
128 if (m_Config.Configs["Startup"] != null)
129 {
130 startupConfig = m_Config.Configs["Startup"];
131 }
132
133 // Allow derived classes to load config before the console is
134 // opened.
135 //
136 ReadConfig();
137
138 // Create main console
139 //
140 string consoleType = "local";
141 if (startupConfig != null)
142 consoleType = startupConfig.GetString("console", consoleType);
143
144 if (consoleType == "basic")
145 {
146 MainConsole.Instance = new CommandConsole(prompt);
147 }
148 else
149 {
150 MainConsole.Instance = new LocalConsole(prompt);
151 }
152
153 // Configure the appenders for log4net
154 //
155 OpenSimAppender consoleAppender = null;
156 FileAppender fileAppender = null;
157
158 XmlConfigurator.Configure();
159
160 ILoggerRepository repository = LogManager.GetRepository();
161 IAppender[] appenders = repository.GetAppenders();
162
163 foreach (IAppender appender in appenders)
164 {
165 if (appender.Name == "Console")
166 {
167 consoleAppender = (OpenSimAppender)appender;
168 }
169 if (appender.Name == "LogFileAppender")
170 {
171 fileAppender = (FileAppender)appender;
172 }
173 }
174
175 if (consoleAppender == null)
176 {
177 System.Console.WriteLine("No console appender found. Server can't start");
178 Thread.CurrentThread.Abort();
179 }
180 else
181 {
182 consoleAppender.Console = MainConsole.Instance;
183
184 if (null == consoleAppender.Threshold)
185 consoleAppender.Threshold = Level.All;
186 }
187
188 // Set log file
189 //
190 if (fileAppender != null)
191 {
192 if (startupConfig != null)
193 fileAppender.File = startupConfig.GetString("logfile",
194 assemblyName.Name + ".log");
195 }
196
197 // Register the quit command
198 //
199 MainConsole.Instance.Commands.AddCommand("base", false, "quit",
200 "quit",
201 "Quit the application", HandleQuit);
202
203 // Allow derived classes to perform initialization that
204 // needs to be done after the console has opened
205 //
206 Initialise();
207 }
208
209 public virtual int Run()
210 {
211 while (m_Running)
212 {
213 MainConsole.Instance.Prompt();
214 }
215
216 return 0;
217 }
218
219 protected virtual void HandleQuit(string module, string[] args)
220 {
221 m_Running = false;
222 m_log.Info("[CONSOLE] Quitting");
223 }
224
225 protected virtual void ReadConfig()
226 {
227 }
228
229 protected virtual void Initialise()
230 {
231 }
232 }
233}
generated by cgit v1.1 at 2024-12-30 12:33:25 +0000