diff options
author | Charles Krinke | 2008-06-27 02:15:57 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-27 02:15:57 +0000 |
commit | ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03 (patch) | |
tree | 97f8cce96ea2e98b96b36e523c59361bf00f63b8 /OpenSim/ApplicationPlugins | |
parent | Mantis#1610. Thank you, Melanie for a patch that: (diff) | |
download | opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.zip opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.gz opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.bz2 opensim-SC_OLD-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.xz |
Mantis#1591. Thank you graciously, Sempuki for a patch that:
Currently module loading is done ad-hoc. I propose creating a simple
loader class that leverages Mono.Addins (and perhaps the new .NET
addins when they become available in mono). Attached is a basic
patch for review that compiles into HEAD, but doesn't yet replace
any existing ad-hoc loaders.
Diffstat (limited to '')
3 files changed, 46 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 4b11fd4..6743fb4 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -46,6 +46,19 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
46 | 46 | ||
47 | #region IApplicationPlugin Members | 47 | #region IApplicationPlugin Members |
48 | 48 | ||
49 | // TODO: required by IPlugin, but likely not at all right | ||
50 | string m_name = "LoadRegionsPlugin"; | ||
51 | string m_version = "0.0"; | ||
52 | |||
53 | public string Version { get { return m_version; } } | ||
54 | public string Name { get { return m_name; } } | ||
55 | |||
56 | public void Initialise() | ||
57 | { | ||
58 | m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!"); | ||
59 | throw new PluginNotInitialisedException (Name); | ||
60 | } | ||
61 | |||
49 | public void Initialise(OpenSimBase openSim) | 62 | public void Initialise(OpenSimBase openSim) |
50 | { | 63 | { |
51 | m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); | 64 | m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); |
@@ -78,7 +91,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
78 | openSim.ModuleLoader.ClearCache(); | 91 | openSim.ModuleLoader.ClearCache(); |
79 | } | 92 | } |
80 | 93 | ||
81 | public void Close() | 94 | public void Dispose() |
82 | { | 95 | { |
83 | } | 96 | } |
84 | 97 | ||
@@ -113,4 +126,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
113 | } | 126 | } |
114 | } | 127 | } |
115 | } | 128 | } |
116 | } \ No newline at end of file | 129 | } |
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 5063375..d3fe0e0 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -54,6 +54,19 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
54 | private BaseHttpServer m_httpd; | 54 | private BaseHttpServer m_httpd; |
55 | private string requiredPassword = String.Empty; | 55 | private string requiredPassword = String.Empty; |
56 | 56 | ||
57 | // TODO: required by IPlugin, but likely not at all right | ||
58 | string m_name = "RemoteAdminPlugin"; | ||
59 | string m_version = "0.0"; | ||
60 | |||
61 | public string Version { get { return m_version; } } | ||
62 | public string Name { get { return m_name; } } | ||
63 | |||
64 | public void Initialise() | ||
65 | { | ||
66 | m_log.Info("[RADMIN]: " + Name + " cannot be default-initialized!"); | ||
67 | throw new PluginNotInitialisedException (Name); | ||
68 | } | ||
69 | |||
57 | public void Initialise(OpenSimBase openSim) | 70 | public void Initialise(OpenSimBase openSim) |
58 | { | 71 | { |
59 | try | 72 | try |
@@ -607,8 +620,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
607 | return response; | 620 | return response; |
608 | } | 621 | } |
609 | 622 | ||
610 | public void Close() | 623 | public void Dispose() |
611 | { | 624 | { |
612 | } | 625 | } |
613 | } | 626 | } |
614 | } \ No newline at end of file | 627 | } |
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index 4558d4d..78e0e66 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
@@ -188,6 +188,17 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
188 | 188 | ||
189 | 189 | ||
190 | #region methods | 190 | #region methods |
191 | // TODO: required by IPlugin, but likely not at all right | ||
192 | string m_version = "0.0"; | ||
193 | |||
194 | public string Version { get { return m_version; } } | ||
195 | |||
196 | public void Initialise() | ||
197 | { | ||
198 | m_log.Info("[RESTPLUGIN]: " + Name + " cannot be default-initialized!"); | ||
199 | throw new PluginNotInitialisedException (Name); | ||
200 | } | ||
201 | |||
191 | /// <summary> | 202 | /// <summary> |
192 | /// This method is called by OpenSimMain immediately after loading the | 203 | /// This method is called by OpenSimMain immediately after loading the |
193 | /// plugin and after basic server setup, but before running any server commands. | 204 | /// plugin and after basic server setup, but before running any server commands. |
@@ -357,6 +368,11 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
357 | _agents = null; | 368 | _agents = null; |
358 | } | 369 | } |
359 | 370 | ||
371 | public virtual void Dispose() | ||
372 | { | ||
373 | Close(); | ||
374 | } | ||
375 | |||
360 | /// <summary> | 376 | /// <summary> |
361 | /// Return a failure message. | 377 | /// Return a failure message. |
362 | /// </summary> | 378 | /// </summary> |