aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-09 02:49:55 +0000
committerMelanie Thielker2009-05-09 02:49:55 +0000
commitc1e7352d75b62b6c97e79c4fdb37b9493aba697a (patch)
tree0bf2e2b12fafc2fc08dce9c50a0fa198b787979c
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!!!
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs122
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs87
-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
-rw-r--r--bin/OpenSim.ini.example21
-rw-r--r--prebuild.xml2
11 files changed, 384 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 8f4eba8..f1091b4 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -80,7 +80,9 @@ namespace OpenSim
80 { 80 {
81 log4net.Appender.FileAppender appender = 81 log4net.Appender.FileAppender appender =
82 (log4net.Appender.FileAppender)m_logFileAppender; 82 (log4net.Appender.FileAppender)m_logFileAppender;
83 appender.File = startupConfig.GetString("LogFile", "OpenSim.log"); 83 string fileName = startupConfig.GetString("LogFile", String.Empty);
84 if (fileName != String.Empty)
85 appender.File = fileName;
84 m_log.InfoFormat("[LOGGING] Logging started to file {0}", appender.File); 86 m_log.InfoFormat("[LOGGING] Logging started to file {0}", appender.File);
85 } 87 }
86 } 88 }
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 3a47806..b3a9c98 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -13,6 +13,8 @@
13 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> 13 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
14 <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.LocalUserServicesConnector" /> 14 <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.LocalUserServicesConnector" />
15 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.RemoteUserServicesConnector" /> 15 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.RemoteUserServicesConnector" />
16 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.Asset.LocalAssetServicesConnector" />
17 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.Asset.RemoteAssetServicesConnector" />
16 </Extension> 18 </Extension>
17 19
18 <Extension path = "/OpenSim/WindModule"> 20 <Extension path = "/OpenSim/WindModule">
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
new file mode 100644
index 0000000..20e6de5
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -0,0 +1,122 @@
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 log4net;
29using Nini.Config;
30using System;
31using System.Reflection;
32using OpenSim.Servers.Base;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces;
36
37namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
38{
39 public class LocalAssetServicesConnector : ISharedRegionModule
40 {
41 private static readonly ILog m_log =
42 LogManager.GetLogger(
43 MethodBase.GetCurrentMethod().DeclaringType);
44
45 private IAssetService m_AssetService;
46
47 private bool m_Enabled = false;
48
49 public string Name
50 {
51 get { return "LocalAssetServicesConnector"; }
52 }
53
54 public void Initialise(IConfigSource source)
55 {
56 IConfig moduleConfig = source.Configs["Modules"];
57 if (moduleConfig != null)
58 {
59 string name = moduleConfig.GetString("AssetServices", "");
60 if (name == Name)
61 {
62 IConfig assetConfig = source.Configs["AssetService"];
63 if (assetConfig == null)
64 {
65 m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpanSim.ini");
66 return;
67 }
68
69 string serviceDll = assetConfig.GetString("Module",
70 String.Empty);
71
72 if (serviceDll == String.Empty)
73 {
74 m_log.Error("[ASSET CONNECTOR]: No ServiceDll named in section AssetService");
75 return;
76 }
77
78 Object[] args = new Object[] { source };
79 m_AssetService =
80 ServerUtils.LoadPlugin<IAssetService>(serviceDll,
81 args);
82
83 if (m_AssetService == null)
84 {
85 m_log.Error("[ASSET CONNECTOR]: Can't load asset service");
86 return;
87 }
88 m_Enabled = true;
89 m_log.Info("[ASSET CONNECTOR]: Local asset connector enabled");
90 }
91 }
92 }
93
94 public void PostInitialise()
95 {
96 }
97
98 public void Close()
99 {
100 }
101
102 public void AddRegion(Scene scene)
103 {
104 if (!m_Enabled)
105 return;
106
107 scene.RegisterModuleInterface<IAssetService>(m_AssetService);
108 }
109
110 public void RemoveRegion(Scene scene)
111 {
112 if (!m_Enabled)
113 return;
114 }
115
116 public void RegionLoaded(Scene scene)
117 {
118 if (!m_Enabled)
119 return;
120 }
121 }
122}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
new file mode 100644
index 0000000..15e4b5a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
@@ -0,0 +1,87 @@
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 OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
31using OpenSim.Services.Interfaces;
32
33namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
34{
35 public class RemoteAssetServicesConnector : ISharedRegionModule
36 {
37 private bool m_Enabled = false;
38
39 public string Name
40 {
41 get { return "RemoteAssetServicesConnector"; }
42 }
43
44 public void Initialise(IConfigSource source)
45 {
46 IConfig moduleConfig = source.Configs["Modules"];
47 if (moduleConfig != null)
48 {
49 string name = moduleConfig.GetString("AssetServices", "");
50 if (name == Name)
51 {
52 m_Enabled = true;
53 }
54 }
55 }
56
57 public void PostInitialise()
58 {
59 if (!m_Enabled)
60 return;
61 }
62
63 public void Close()
64 {
65 if (!m_Enabled)
66 return;
67 }
68
69 public void AddRegion(Scene scene)
70 {
71 if (!m_Enabled)
72 return;
73 }
74
75 public void RemoveRegion(Scene scene)
76 {
77 if (!m_Enabled)
78 return;
79 }
80
81 public void RegionLoaded(Scene scene)
82 {
83 if (!m_Enabled)
84 return;
85 }
86 }
87}
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}
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ec90488..2aa9d75 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1287,3 +1287,24 @@
1287 ;FullUpdateRate=14 1287 ;FullUpdateRate=14
1288 1288
1289 ;PacketMTU = 1400 1289 ;PacketMTU = 1400
1290
1291 ; The following is the configuration section for the new style gtid servers
1292 ; If you don't know what this is, don't enable it. It will eat your data,
1293 ; format your hard drive and make all meat in your fridge spoil.
1294 ; You have been warned.
1295 ; Some of this may actually work!
1296[Modules]
1297 ; Choose one
1298 ;AssetServices = "LocalAssetServicesConnector"
1299 ;AssetServices = "RemoteAssetServicesConnector"
1300
1301[AssetService]
1302 ; Parameters for local assets
1303 ;Module = "OpenSim.Services.AssetService.dll"
1304 ;StorageProvider = "OpenSim.Data.MySQL.dll"
1305 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;"
1306 ;DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1307 ;AssetLoaderArgs = "assets/AssetSets.xml"
1308
1309 ; Parameters for remote assets
1310 ;AssetServerURI = "http://localhost:8003/"
diff --git a/prebuild.xml b/prebuild.xml
index 8973a6c..b451fec 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1405,7 +1405,6 @@
1405 <Reference name="OpenSim.Servers.Base"/> 1405 <Reference name="OpenSim.Servers.Base"/>
1406 <Reference name="OpenSim.Services.Base" /> 1406 <Reference name="OpenSim.Services.Base" />
1407 <Reference name="OpenSim.Services.Interfaces"/> 1407 <Reference name="OpenSim.Services.Interfaces"/>
1408 <Reference name="OpenSim.Services.AssetService"/>
1409 <Reference name="Nini.dll" /> 1408 <Reference name="Nini.dll" />
1410 <Reference name="log4net.dll"/> 1409 <Reference name="log4net.dll"/>
1411 1410
@@ -1439,6 +1438,7 @@
1439 <Reference name="OpenSim.Framework.Communications"/> 1438 <Reference name="OpenSim.Framework.Communications"/>
1440 <Reference name="OpenSim.Data" /> 1439 <Reference name="OpenSim.Data" />
1441 <Reference name="OpenSim.Region.Framework" /> 1440 <Reference name="OpenSim.Region.Framework" />
1441 <Reference name="OpenSim.Servers.Base" />
1442 <Reference name="OpenSim.Services.Base" /> 1442 <Reference name="OpenSim.Services.Base" />
1443 <Reference name="OpenSim.Services.Interfaces" /> 1443 <Reference name="OpenSim.Services.Interfaces" />
1444 <Reference name="OpenSim.Services.UserService" /> 1444 <Reference name="OpenSim.Services.UserService" />