OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enhance the submodule loader and port the enhancements to the services base

0.6.5-rc1
Melanie Thielker 2009-05-10 22:31:10 +00:00
parent 54ab7d7ceb
commit b2111f6a19
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Servers/Base/ServerUtils.cs
View File

@ -95,6 +95,20 @@ namespace OpenSim.Servers.Base
} }
public static T LoadPlugin<T>(string dllName, Object[] args) where T:class public static T LoadPlugin<T>(string dllName, Object[] args) where T:class
{
string[] parts = dllName.Split(new char[] {':'});
dllName = parts[0];
string className = String.Empty;
if (parts.Length > 1)
className = parts[1];
return LoadPlugin<T>(dllName, className, args);
}
public static T LoadPlugin<T>(string dllName, string className, Object[] args) where T:class
{ {
string interfaceName = typeof(T).ToString(); string interfaceName = typeof(T).ToString();
@ -106,6 +120,11 @@ namespace OpenSim.Servers.Base
{ {
if (pluginType.IsPublic) if (pluginType.IsPublic)
{ {
if (className != String.Empty &&
pluginType.ToString() !=
pluginType.Namespace + "." + className)
continue;
Type typeInterface = Type typeInterface =
pluginType.GetInterface(interfaceName, true); pluginType.GetInterface(interfaceName, true);
if (typeInterface != null) if (typeInterface != null)

29
OpenSim/Services/Base/ServiceBase.cs
View File

@ -35,6 +35,25 @@ namespace OpenSim.Services.Base
public class ServiceBase public class ServiceBase
{ {
public T LoadPlugin<T>(string dllName) where T:class public T LoadPlugin<T>(string dllName) where T:class
{
return LoadPlugin<T>(dllName, new Object[0]);
}
public T LoadPlugin<T>(string dllName, Object[] args) where T:class
{
string[] parts = dllName.Split(new char[] {':'});
dllName = parts[0];
string className = String.Empty;
if (parts.Length > 1)
className = parts[1];
return LoadPlugin<T>(dllName, className, args);
}
public T LoadPlugin<T>(string dllName, string className, Object[] args) where T:class
{ {
string interfaceName = typeof(T).ToString(); string interfaceName = typeof(T).ToString();
@ -46,13 +65,17 @@ namespace OpenSim.Services.Base
{ {
if (pluginType.IsPublic) if (pluginType.IsPublic)
{ {
if (className != String.Empty &&
pluginType.ToString() !=
pluginType.Namespace + "." + className)
continue;
Type typeInterface = Type typeInterface =
pluginType.GetInterface(interfaceName, true); pluginType.GetInterface(interfaceName, true);
if (typeInterface != null) if (typeInterface != null)
{ {
T plug = (T)Activator.CreateInstance( T plug = (T)Activator.CreateInstance(pluginType,
pluginAssembly.GetType( args);
pluginType.ToString()));
return plug; return plug;
} }