ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis#1682. Revert temporarily, Sempuki's mono addins patch

Browse Source 
while he studies the issues in Windows a little bit.
This commit is contained in:
Charles Krinke
2008-07-11 02:04:02 +00:00
parent 14a6656948
commit cda5269391
21 changed files with 67 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
OpenSim/Framework/PluginLoader.cs
View File

@@ -55,7 +55,6 @@ namespace OpenSim.Framework
}
/// <summary>
/// Generic Plugin Loader
/// </summary>
public class PluginLoader <T> : IDisposable where T : IPlugin
@@ -67,17 +66,16 @@ namespace OpenSim.Framework
private PluginInitialiserBase initialiser;
private Dictionary<string,IPluginConstraint> constraints
= new Dictionary<string,IPluginConstraint>();
private static bool runonce = false;
private static readonly ILog log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public PluginInitialiserBase Initialiser
{
set { initialiser = value; }
get { return initialiser; }
}
public List<T> Plugins
{
get { return loaded; }
@@ -86,19 +84,25 @@ namespace OpenSim.Framework
public PluginLoader ()
{
Initialiser = new PluginInitialiserBase();
initialise_plugin_dir_ (".");
}
public PluginLoader (PluginInitialiserBase init)
{
Initialiser = init;
initialise_plugin_dir_ (".");
Initialiser = init;
}
public PluginLoader (PluginInitialiserBase init, string dir)
{
Initialiser = init;
initialise_plugin_dir_ (dir);
Initialiser = init;
AddPluginDir (dir);
}
public void AddPluginDir (string dir)
{
suppress_console_output_ (true);
AddinManager.Initialize (dir);
AddinManager.Registry.Update (null);
suppress_console_output_ (false);
}
public void AddExtensionPoint (string extpoint)
@@ -110,21 +114,22 @@ namespace OpenSim.Framework
{
constraints.Add (extpoint, cons);
}
public void Load (string extpoint)
public void Load (string extpoint, string dir)
{
AddPluginDir (dir);
AddExtensionPoint (extpoint);
Load();
}
public void Load ()
{
log.Info("[PLUGINS]: Begin Loading " + AddinManager.Registry.RegistryPath);
suppress_console_output_ (true);
AddinManager.Registry.Update (null);
suppress_console_output_ (false);
foreach (string ext in extpoints)
{
log.Info("[PLUGINS]: Loading extension point " + ext);
if (constraints.ContainsKey (ext))
{
IPluginConstraint cons = constraints [ext];
@@ -150,25 +155,9 @@ namespace OpenSim.Framework
p.Dispose ();
}
private void initialise_plugin_dir_ (string dir)
public void ClearCache()
{
if (runonce == true)
return;
log.Info("[PLUGINS]: Initialzing " + dir);
clear_registry_();
suppress_console_output_ (true);
AddinManager.Initialize (dir);
AddinManager.Registry.Update (null);
suppress_console_output_ (false);
runonce = true;
}
private void clear_registry_ ()
{
// The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
// occasionally seems to corrupt its addin cache
// The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) occasionally seems to corrupt its addin cache
// Hence, as a temporary solution we'll remove it before each startup
if (Directory.Exists("addin-db-000"))
Directory.Delete("addin-db-000", true);
@@ -236,7 +225,7 @@ namespace OpenSim.Framework
public PluginFilenameConstraint (string name)
{
filename = name;
}
public string Message
@@ -256,7 +245,7 @@ namespace OpenSim.Framework
string[] path = ns[0].Path.Split('/');
if (path [path.Length-1] == filename)
return false;
return true;
}
}