diff options
Diffstat (limited to '')
24 files changed, 183 insertions, 79 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 6743fb4..523f9fc 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -28,18 +28,13 @@ | |||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Threading; | 29 | using System.Threading; |
30 | using log4net; | 30 | using log4net; |
31 | using Mono.Addins; | ||
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
34 | using OpenSim.Framework.RegionLoader.Filesystem; | 33 | using OpenSim.Framework.RegionLoader.Filesystem; |
35 | using OpenSim.Framework.RegionLoader.Web; | 34 | using OpenSim.Framework.RegionLoader.Web; |
36 | 35 | ||
37 | [assembly : Addin] | ||
38 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
39 | |||
40 | namespace OpenSim.ApplicationPlugins.LoadRegions | 36 | namespace OpenSim.ApplicationPlugins.LoadRegions |
41 | { | 37 | { |
42 | [Extension("/OpenSim/Startup")] | ||
43 | public class LoadRegionsPlugin : IApplicationPlugin | 38 | public class LoadRegionsPlugin : IApplicationPlugin |
44 | { | 39 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index d61e566..256e862 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -33,19 +33,14 @@ using System.Reflection; | |||
33 | using System.Timers; | 33 | using System.Timers; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | 35 | using log4net; |
36 | using Mono.Addins; | ||
37 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
38 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
40 | using OpenSim.Region.Environment.Modules.World.Terrain; | 39 | using OpenSim.Region.Environment.Modules.World.Terrain; |
41 | using OpenSim.Region.Environment.Scenes; | 40 | using OpenSim.Region.Environment.Scenes; |
42 | 41 | ||
43 | [assembly : Addin] | ||
44 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
45 | |||
46 | namespace OpenSim.ApplicationPlugins.RemoteController | 42 | namespace OpenSim.ApplicationPlugins.RemoteController |
47 | { | 43 | { |
48 | [Extension("/OpenSim/Startup")] | ||
49 | public class RemoteAdminPlugin : IApplicationPlugin | 44 | public class RemoteAdminPlugin : IApplicationPlugin |
50 | { | 45 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 9a1f628..50412c9 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | |||
@@ -32,16 +32,9 @@ using System.Reflection; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
34 | using OpenSim.ApplicationPlugins.Rest; | 34 | using OpenSim.ApplicationPlugins.Rest; |
35 | using Mono.Addins; | ||
36 | |||
37 | [assembly : Addin] | ||
38 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
39 | 35 | ||
40 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 36 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
41 | { | 37 | { |
42 | |||
43 | [Extension("/OpenSim/Startup")] | ||
44 | |||
45 | public class RestHandler : RestPlugin, IHttpAgentHandler | 38 | public class RestHandler : RestPlugin, IHttpAgentHandler |
46 | { | 39 | { |
47 | 40 | ||
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 9d68225..5ec2526 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | |||
@@ -37,7 +37,6 @@ using System.Timers; | |||
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using Mono.Addins; | ||
41 | using Nwc.XmlRpc; | 40 | using Nwc.XmlRpc; |
42 | using Nini.Config; | 41 | using Nini.Config; |
43 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
@@ -47,13 +46,8 @@ using OpenSim.Framework.Communications; | |||
47 | using OpenSim.Region.Environment.Scenes; | 46 | using OpenSim.Region.Environment.Scenes; |
48 | using OpenSim.ApplicationPlugins.Rest; | 47 | using OpenSim.ApplicationPlugins.Rest; |
49 | 48 | ||
50 | [assembly : Addin] | ||
51 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
52 | |||
53 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 49 | namespace OpenSim.ApplicationPlugins.Rest.Regions |
54 | { | 50 | { |
55 | |||
56 | [Extension("/OpenSim/Startup")] | ||
57 | public partial class RestRegionPlugin : RestPlugin | 51 | public partial class RestRegionPlugin : RestPlugin |
58 | { | 52 | { |
59 | private static XmlSerializerNamespaces _xmlNs; | 53 | private static XmlSerializerNamespaces _xmlNs; |
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index 78e0e66..1f633d5 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
@@ -35,7 +35,6 @@ using System.Reflection; | |||
35 | using System.Timers; | 35 | using System.Timers; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using libsecondlife; | 37 | using libsecondlife; |
38 | using Mono.Addins; | ||
39 | using Nwc.XmlRpc; | 38 | using Nwc.XmlRpc; |
40 | using Nini.Config; | 39 | using Nini.Config; |
41 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
@@ -44,13 +43,8 @@ using OpenSim.Framework.Servers; | |||
44 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
45 | using OpenSim.Region.Environment.Scenes; | 44 | using OpenSim.Region.Environment.Scenes; |
46 | 45 | ||
47 | // [assembly : Addin] | ||
48 | // [assembly : AddinDependency("OpenSim", "0.5")] | ||
49 | |||
50 | namespace OpenSim.ApplicationPlugins.Rest | 46 | namespace OpenSim.ApplicationPlugins.Rest |
51 | { | 47 | { |
52 | |||
53 | // [Extension("/OpenSim/Startup")] | ||
54 | public abstract class RestPlugin : IApplicationPlugin | 48 | public abstract class RestPlugin : IApplicationPlugin |
55 | { | 49 | { |
56 | #region properties | 50 | #region properties |
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs index fa24d82..146288f 100644 --- a/OpenSim/Data/IGridData.cs +++ b/OpenSim/Data/IGridData.cs | |||
@@ -26,11 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | using Mono.Addins; | ||
30 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
31 | 30 | ||
32 | [assembly : AddinRoot("OpenSim.Data", "0.5")] | ||
33 | |||
34 | namespace OpenSim.Data | 31 | namespace OpenSim.Data |
35 | { | 32 | { |
36 | public enum DataResponse | 33 | public enum DataResponse |
@@ -44,7 +41,6 @@ namespace OpenSim.Data | |||
44 | /// <summary> | 41 | /// <summary> |
45 | /// A standard grid interface | 42 | /// A standard grid interface |
46 | /// </summary> | 43 | /// </summary> |
47 | [TypeExtensionPoint("/OpenSim/GridDataStore")] | ||
48 | public interface IGridDataPlugin : IPlugin | 44 | public interface IGridDataPlugin : IPlugin |
49 | { | 45 | { |
50 | /// <summary> | 46 | /// <summary> |
@@ -105,10 +101,10 @@ namespace OpenSim.Data | |||
105 | ReservationData GetReservationAtPoint(uint x, uint y); | 101 | ReservationData GetReservationAtPoint(uint x, uint y); |
106 | } | 102 | } |
107 | 103 | ||
108 | public class GridDataStoreInitialiser : PluginInitialiserBase | 104 | public class GridDataInitialiser : PluginInitialiserBase |
109 | { | 105 | { |
110 | private string connect; | 106 | private string connect; |
111 | public GridDataStoreInitialiser (string s) { connect = s; } | 107 | public GridDataInitialiser (string s) { connect = s; } |
112 | public override void Initialise (IPlugin plugin) | 108 | public override void Initialise (IPlugin plugin) |
113 | { | 109 | { |
114 | IGridDataPlugin p = plugin as IGridDataPlugin; | 110 | IGridDataPlugin p = plugin as IGridDataPlugin; |
diff --git a/OpenSim/Data/ILogData.cs b/OpenSim/Data/ILogData.cs index 34657dc..cfbee88 100644 --- a/OpenSim/Data/ILogData.cs +++ b/OpenSim/Data/ILogData.cs | |||
@@ -25,7 +25,6 @@ | |||
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 | ||
28 | using Mono.Addins; | ||
29 | using OpenSim.Framework; | 28 | using OpenSim.Framework; |
30 | 29 | ||
31 | namespace OpenSim.Data | 30 | namespace OpenSim.Data |
@@ -64,7 +63,6 @@ namespace OpenSim.Data | |||
64 | /// <summary> | 63 | /// <summary> |
65 | /// An interface to a LogData storage system | 64 | /// An interface to a LogData storage system |
66 | /// </summary> | 65 | /// </summary> |
67 | [TypeExtensionPoint("/OpenSim/GridLogData")] | ||
68 | public interface ILogDataPlugin : IPlugin | 66 | public interface ILogDataPlugin : IPlugin |
69 | { | 67 | { |
70 | void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, | 68 | void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, |
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index 7de77d1..e1de297 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs | |||
@@ -33,18 +33,13 @@ using System.Security.Cryptography; | |||
33 | using System.Text; | 33 | using System.Text; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | 35 | using log4net; |
36 | using Mono.Addins; | ||
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | 37 | ||
39 | [assembly : Addin] | ||
40 | [assembly : AddinDependency("OpenSim.Data", "0.5")] | ||
41 | |||
42 | namespace OpenSim.Data.MSSQL | 38 | namespace OpenSim.Data.MSSQL |
43 | { | 39 | { |
44 | /// <summary> | 40 | /// <summary> |
45 | /// A grid data interface for MSSQL Server | 41 | /// A grid data interface for MSSQL Server |
46 | /// </summary> | 42 | /// </summary> |
47 | [Extension("/OpenSim/GridDataStore")] | ||
48 | public class MSSQLGridData : GridDataBase | 43 | public class MSSQLGridData : GridDataBase |
49 | { | 44 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs index d0d81b6..d260e8c 100644 --- a/OpenSim/Data/MSSQL/MSSQLLogData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs | |||
@@ -30,19 +30,13 @@ using System.Reflection; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Data; | 31 | using System.Data; |
32 | using log4net; | 32 | using log4net; |
33 | using Mono.Addins; | ||
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
35 | 34 | ||
36 | // Only one attribute per assembly. See: *GridData.cs | ||
37 | // [assembly : Addin] | ||
38 | // [assembly : AddinDependency("OpenSim.Data", "0.5")] | ||
39 | |||
40 | namespace OpenSim.Data.MSSQL | 35 | namespace OpenSim.Data.MSSQL |
41 | { | 36 | { |
42 | /// <summary> | 37 | /// <summary> |
43 | /// An interface to the log database for MSSQL | 38 | /// An interface to the log database for MSSQL |
44 | /// </summary> | 39 | /// </summary> |
45 | [Extension("/OpenSim/GridLogData")] | ||
46 | internal class MSSQLLogData : ILogDataPlugin | 40 | internal class MSSQLLogData : ILogDataPlugin |
47 | { | 41 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 8142c74..fee457a 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
@@ -33,18 +33,13 @@ using System.Security.Cryptography; | |||
33 | using System.Text; | 33 | using System.Text; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | 35 | using log4net; |
36 | using Mono.Addins; | ||
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | 37 | ||
39 | [assembly : Addin] | ||
40 | [assembly : AddinDependency("OpenSim.Data", "0.5")] | ||
41 | |||
42 | namespace OpenSim.Data.MySQL | 38 | namespace OpenSim.Data.MySQL |
43 | { | 39 | { |
44 | /// <summary> | 40 | /// <summary> |
45 | /// A MySQL Interface for the Grid Server | 41 | /// A MySQL Interface for the Grid Server |
46 | /// </summary> | 42 | /// </summary> |
47 | [Extension("/OpenSim/GridDataStore")] | ||
48 | public class MySQLGridData : GridDataBase | 43 | public class MySQLGridData : GridDataBase |
49 | { | 44 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index f11aec5..456cfd2 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs | |||
@@ -28,19 +28,13 @@ using System; | |||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using log4net; | 30 | using log4net; |
31 | using Mono.Addins; | ||
32 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
33 | 32 | ||
34 | // Only one attribute per assembly. See: *GridData.cs | ||
35 | // [assembly : Addin] | ||
36 | // [assembly : AddinDependency("OpenSim.Data", "0.5")] | ||
37 | |||
38 | namespace OpenSim.Data.MySQL | 33 | namespace OpenSim.Data.MySQL |
39 | { | 34 | { |
40 | /// <summary> | 35 | /// <summary> |
41 | /// An interface to the log database for MySQL | 36 | /// An interface to the log database for MySQL |
42 | /// </summary> | 37 | /// </summary> |
43 | [Extension("/OpenSim/GridLogData")] | ||
44 | internal class MySQLLogData : ILogDataPlugin | 38 | internal class MySQLLogData : ILogDataPlugin |
45 | { | 39 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs index 1e07458..8c4574e 100644 --- a/OpenSim/Data/SQLite/SQLiteGridData.cs +++ b/OpenSim/Data/SQLite/SQLiteGridData.cs | |||
@@ -33,18 +33,13 @@ using System.Security.Cryptography; | |||
33 | using System.Text; | 33 | using System.Text; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | 35 | using log4net; |
36 | using Mono.Addins; | ||
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | 37 | ||
39 | [assembly : Addin] | ||
40 | [assembly : AddinDependency("OpenSim.Data", "0.5")] | ||
41 | |||
42 | namespace OpenSim.Data.SQLite | 38 | namespace OpenSim.Data.SQLite |
43 | { | 39 | { |
44 | /// <summary> | 40 | /// <summary> |
45 | /// A Grid Interface to the SQLite database | 41 | /// A Grid Interface to the SQLite database |
46 | /// </summary> | 42 | /// </summary> |
47 | [Extension("/OpenSim/GridDataStore")] | ||
48 | public class SQLiteGridData : GridDataBase | 43 | public class SQLiteGridData : GridDataBase |
49 | { | 44 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs index 2d61b2c..0d21093 100644 --- a/OpenSim/Framework/PluginLoader.cs +++ b/OpenSim/Framework/PluginLoader.cs | |||
@@ -197,7 +197,9 @@ namespace OpenSim.Framework | |||
197 | 197 | ||
198 | private void on_addinloaderror_(object sender, AddinErrorEventArgs args) | 198 | private void on_addinloaderror_(object sender, AddinErrorEventArgs args) |
199 | { | 199 | { |
200 | log.Error ("[PLUGINS]: Plugin Error: " + args.Message); | 200 | log.Error ("[PLUGINS]: Plugin Error: " + args.Message |
201 | + ": " + args.Exception.Message | ||
202 | + "\n"+ args.Exception.StackTrace); | ||
201 | } | 203 | } |
202 | 204 | ||
203 | private void clear_registry_ () | 205 | private void clear_registry_ () |
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index ebc6ac3..0b4b4ac 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -73,18 +73,18 @@ namespace OpenSim.Grid.GridServer | |||
73 | provider = String.Join (".", s); | 73 | provider = String.Join (".", s); |
74 | 74 | ||
75 | PluginLoader<IGridDataPlugin> gridloader = | 75 | PluginLoader<IGridDataPlugin> gridloader = |
76 | new PluginLoader<IGridDataPlugin> (new GridDataStoreInitialiser (connect)); | 76 | new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); |
77 | 77 | ||
78 | PluginLoader<ILogDataPlugin> logloader = | 78 | PluginLoader<ILogDataPlugin> logloader = |
79 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); | 79 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); |
80 | 80 | ||
81 | gridloader.AddExtensionPoint ("/OpenSim/GridDataStore"); | 81 | gridloader.AddExtensionPoint ("/OpenSim/GridData"); |
82 | logloader.AddExtensionPoint ("/OpenSim/GridLogData"); | 82 | logloader.AddExtensionPoint ("/OpenSim/LogData"); |
83 | 83 | ||
84 | // loader will try to load all providers (MySQL, MSSQL, etc) | 84 | // loader will try to load all providers (MySQL, MSSQL, etc) |
85 | // unless it is constrainted to the correct "id" | 85 | // unless it is constrainted to the correct "id" |
86 | gridloader.AddFilter ("/OpenSim/GridDataStore", new PluginIdFilter (provider + "GridData")); | 86 | //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData")); |
87 | logloader.AddFilter ("/OpenSim/GridLogData", new PluginIdFilter (provider + "LogData")); | 87 | //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData")); |
88 | 88 | ||
89 | gridloader.Load(); | 89 | gridloader.Load(); |
90 | logloader.Load(); | 90 | logloader.Load(); |
@@ -111,7 +111,7 @@ namespace OpenSim.Grid.GridServer | |||
111 | } | 111 | } |
112 | catch (Exception) | 112 | catch (Exception) |
113 | { | 113 | { |
114 | m_log.Warn("[storage]: Unable to write log via "); | 114 | m_log.Warn("[storage]: Unable to write log via " + plugin.Name); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | } | 117 | } |
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs index 418caec..71c357b 100644 --- a/OpenSim/Grid/GridServer/IGridPlugin.cs +++ b/OpenSim/Grid/GridServer/IGridPlugin.cs | |||
@@ -26,14 +26,10 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using Mono.Addins; | ||
30 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
31 | 30 | ||
32 | [assembly : AddinRoot("OpenSim.Grid.GridServer", "0.5")] | ||
33 | |||
34 | namespace OpenSim.Grid.GridServer | 31 | namespace OpenSim.Grid.GridServer |
35 | { | 32 | { |
36 | [TypeExtensionPoint("/OpenSim/GridServer")] | ||
37 | public interface IGridPlugin : IPlugin | 33 | public interface IGridPlugin : IPlugin |
38 | { | 34 | { |
39 | void Initialise(GridServerBase gridServer); | 35 | void Initialise(GridServerBase gridServer); |
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs index f122925..2e3122f 100644 --- a/OpenSim/Region/Application/IApplicationPlugin.cs +++ b/OpenSim/Region/Application/IApplicationPlugin.cs | |||
@@ -25,14 +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 | ||
28 | using Mono.Addins; | ||
29 | using OpenSim.Framework; | 28 | using OpenSim.Framework; |
30 | 29 | ||
31 | [assembly : AddinRoot("OpenSim", "0.5")] | ||
32 | |||
33 | namespace OpenSim | 30 | namespace OpenSim |
34 | { | 31 | { |
35 | [TypeExtensionPoint("/OpenSim/Startup")] | ||
36 | public interface IApplicationPlugin : IPlugin | 32 | public interface IApplicationPlugin : IPlugin |
37 | { | 33 | { |
38 | void Initialise(OpenSimBase openSim); | 34 | void Initialise(OpenSimBase openSim); |
diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml new file mode 100644 index 0000000..f2bb2c9 --- /dev/null +++ b/bin/LoadRegionsPlugin.addin.xml | |||
@@ -0,0 +1,22 @@ | |||
1 | <Addin> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/Startup"> | ||
9 | <Type type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||
12 | <Addin> | ||
13 | <Runtime> | ||
14 | <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/> | ||
15 | </Runtime> | ||
16 | <Dependencies> | ||
17 | <Addin id="OpenSim" version="0.5" /> | ||
18 | </Dependencies> | ||
19 | <Extension path = "/OpenSim/Startup"> | ||
20 | <Type type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" /> | ||
21 | </Extension> | ||
22 | </Addin> | ||
diff --git a/bin/OpenSim.Data.MySQL.addin.xml b/bin/OpenSim.Data.MySQL.addin.xml new file mode 100644 index 0000000..70a26d7 --- /dev/null +++ b/bin/OpenSim.Data.MySQL.addin.xml | |||
@@ -0,0 +1,28 @@ | |||
1 | <Addin> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Data.MySQL.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim.Data" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/GridData"> | ||
9 | <Type type="OpenSim.Data.MySQL.MySQLGridData" /> | ||
10 | </Extension> | ||
11 | <Extension path = "/OpenSim/LogData"> | ||
12 | <Type type="OpenSim.Data.MySQL.MySQLLogData" /> | ||
13 | </Extension> | ||
14 | </Addin> | ||
15 | <Addin> | ||
16 | <Runtime> | ||
17 | <Import assembly="OpenSim.Data.MySQL.dll"/> | ||
18 | </Runtime> | ||
19 | <Dependencies> | ||
20 | <Addin id="OpenSim.Data" version="0.5" /> | ||
21 | </Dependencies> | ||
22 | <Extension path = "/OpenSim/GridData"> | ||
23 | <Type type="OpenSim.Data.MySQL.MySQLGridData" /> | ||
24 | </Extension> | ||
25 | <Extension path = "/OpenSim/LogData"> | ||
26 | <Type type="OpenSim.Data.MySQL.MySQLLogData" /> | ||
27 | </Extension> | ||
28 | </Addin> | ||
diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml new file mode 100644 index 0000000..d2cc6bb --- /dev/null +++ b/bin/OpenSim.Data.addin.xml | |||
@@ -0,0 +1,24 @@ | |||
1 | <Addin id="OpenSim.Data" isroot="true" version="0.5"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Grid.GridServer.exe"/> | ||
4 | <Import assembly="OpenSim.Data.dll"/> | ||
5 | </Runtime> | ||
6 | <ExtensionPoint path = "/OpenSim/GridData"> | ||
7 | <ExtensionNode objectType="OpenSim.Data.IGridDataPlugin"/> | ||
8 | </ExtensionPoint> | ||
9 | <ExtensionPoint path = "/OpenSim/LogData"> | ||
10 | <ExtensionNode objectType="OpenSim.Data.ILogDataPlugin"/> | ||
11 | </ExtensionPoint> | ||
12 | </Addin> | ||
13 | <Addin id="OpenSim.Data" isroot="true" version="0.5"> | ||
14 | <Runtime> | ||
15 | <Import assembly="OpenSim.Grid.GridServer.exe"/> | ||
16 | <Import assembly="OpenSim.Data.dll"/> | ||
17 | </Runtime> | ||
18 | <ExtensionPoint path = "/OpenSim/GridData"> | ||
19 | <ExtensionNode objectType="OpenSim.Data.IGridDataPlugin"/> | ||
20 | </ExtensionPoint> | ||
21 | <ExtensionPoint path = "/OpenSim/LogData"> | ||
22 | <ExtensionNode objectType="OpenSim.Data.ILogDataPlugin"/> | ||
23 | </ExtensionPoint> | ||
24 | </Addin> | ||
diff --git a/bin/OpenSim.Grid.GridServer.addin.xml b/bin/OpenSim.Grid.GridServer.addin.xml new file mode 100644 index 0000000..ae993d2 --- /dev/null +++ b/bin/OpenSim.Grid.GridServer.addin.xml | |||
@@ -0,0 +1,16 @@ | |||
1 | <Addin id="OpenSim.Grid.GridServer" isroot="true" version="0.5"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Grid.GridServer.exe"/> | ||
4 | </Runtime> | ||
5 | <ExtensionPoint path = "/OpenSim/GridServer"> | ||
6 | <ExtensionNode objectType="OpenSim.Grid.GridServer.IGridPlugin"/> | ||
7 | </ExtensionPoint> | ||
8 | </Addin> | ||
9 | <Addin id="OpenSim.Grid.GridServer" isroot="true" version="0.5"> | ||
10 | <Runtime> | ||
11 | <Import assembly="OpenSim.Grid.GridServer.exe"/> | ||
12 | </Runtime> | ||
13 | <ExtensionPoint path = "/OpenSim/GridServer"> | ||
14 | <ExtensionNode objectType="OpenSim.Grid.GridServer.IGridPlugin"/> | ||
15 | </ExtensionPoint> | ||
16 | </Addin> | ||
diff --git a/bin/OpenSim.addin.xml b/bin/OpenSim.addin.xml new file mode 100644 index 0000000..48bd744 --- /dev/null +++ b/bin/OpenSim.addin.xml | |||
@@ -0,0 +1,16 @@ | |||
1 | <Addin id="OpenSim" isroot="true" version="0.5"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.exe"/> | ||
4 | </Runtime> | ||
5 | <ExtensionPoint path = "/OpenSim/Startup"> | ||
6 | <ExtensionNode objectType="OpenSim.Region.Application.IApplicationPlugin"/> | ||
7 | </ExtensionPoint> | ||
8 | </Addin> | ||
9 | <Addin id="OpenSim" isroot="true" version="0.5"> | ||
10 | <Runtime> | ||
11 | <Import assembly="OpenSim.exe"/> | ||
12 | </Runtime> | ||
13 | <ExtensionPoint path = "/OpenSim/Startup"> | ||
14 | <ExtensionNode objectType="OpenSim.Region.Application.IApplicationPlugin"/> | ||
15 | </ExtensionPoint> | ||
16 | </Addin> | ||
diff --git a/bin/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml new file mode 100644 index 0000000..7dc79c6 --- /dev/null +++ b/bin/RemoteAdminPlugin.addin.xml | |||
@@ -0,0 +1,22 @@ | |||
1 | <Addin> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/Startup"> | ||
9 | <Type type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||
12 | <Addin> | ||
13 | <Runtime> | ||
14 | <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/> | ||
15 | </Runtime> | ||
16 | <Dependencies> | ||
17 | <Addin id="OpenSim" version="0.5" /> | ||
18 | </Dependencies> | ||
19 | <Extension path = "/OpenSim/Startup"> | ||
20 | <Type type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" /> | ||
21 | </Extension> | ||
22 | </Addin> | ||
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml new file mode 100644 index 0000000..fd2f692 --- /dev/null +++ b/bin/RestHandler.addin.xml | |||
@@ -0,0 +1,22 @@ | |||
1 | <Addin> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/Startup"> | ||
9 | <Type type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||
12 | <Addin> | ||
13 | <Runtime> | ||
14 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/> | ||
15 | </Runtime> | ||
16 | <Dependencies> | ||
17 | <Addin id="OpenSim" version="0.5" /> | ||
18 | </Dependencies> | ||
19 | <Extension path = "/OpenSim/Startup"> | ||
20 | <Type type="OpenSim.ApplicationPlugins.Rest.Inventory.RestHandler" /> | ||
21 | </Extension> | ||
22 | </Addin> | ||
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml new file mode 100644 index 0000000..1b7305b --- /dev/null +++ b/bin/RestRegionPlugin.addin.xml | |||
@@ -0,0 +1,22 @@ | |||
1 | <Addin> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/Startup"> | ||
9 | <Type type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||
12 | <Addin> | ||
13 | <Runtime> | ||
14 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/> | ||
15 | </Runtime> | ||
16 | <Dependencies> | ||
17 | <Addin id="OpenSim" version="0.5" /> | ||
18 | </Dependencies> | ||
19 | <Extension path = "/OpenSim/Startup"> | ||
20 | <Type type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" /> | ||
21 | </Extension> | ||
22 | </Addin> | ||