Thanks, sempuki, for a patch that moves all grid plugins to new PluginLoader (issue 1763).

10 files changed, 145 insertions, 74 deletions

diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 0c9d24a..6480f84 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.cs
@@ -29,19 +29,21 @@ using libsecondlife;
 
 namespace OpenSim.Data
 {
-    public abstract class GridDataBase : IGridData
+    public abstract class GridDataBase : IGridDataPlugin
     {
         public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
         public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID);
         public abstract RegionProfileData GetProfileByString(string regionName);
         public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
         public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
-        public abstract void Initialise(string connect);
-        public abstract void Close();
-        public abstract string getName();
-        public abstract string getVersion();
         public abstract DataResponse AddProfile(RegionProfileData profile);
         public abstract ReservationData GetReservationAtPoint(uint x, uint y);
         public abstract DataResponse UpdateProfile(RegionProfileData profile);
+        
+        public abstract void Initialise();
+        public abstract void Initialise(string connect);
+        public abstract void Dispose();
+        public abstract string Name { get; }
+        public abstract string Version { get; }
     }
 }
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index e242312..fa24d82 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -26,6 +26,10 @@
  */
 
 using libsecondlife;
+using Mono.Addins;
+using OpenSim.Framework;
+
+[assembly : AddinRoot("OpenSim.Data", "0.5")]
 
 namespace OpenSim.Data
 {
@@ -40,9 +44,15 @@ namespace OpenSim.Data
     /// <summary>
     /// A standard grid interface
     /// </summary>
-    public interface IGridData
+    [TypeExtensionPoint("/OpenSim/GridDataStore")]
+    public interface IGridDataPlugin : IPlugin
     {
         /// <summary>
+        /// Initialises the interface
+        /// </summary>
+        void Initialise(string connect);
+        
+        /// <summary>
         /// Returns a sim profile from a regionHandle
         /// </summary>
         /// <param name="regionHandle">A 64bit Region Handle</param>
@@ -84,28 +94,6 @@ namespace OpenSim.Data
         bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
 
         /// <summary>
-        /// Initialises the interface
-        /// </summary>
-        void Initialise(string connect);
-
-        /// <summary>
-        /// Closes the interface
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        string getName();
-
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        string getVersion();
-
-        /// <summary>
         /// Adds a new profile to the database
         /// </summary>
         /// <param name="profile">The profile to add</param>
@@ -116,4 +104,15 @@ namespace OpenSim.Data
 
         ReservationData GetReservationAtPoint(uint x, uint y);
     }
+    
+    public class GridDataStoreInitialiser : PluginInitialiserBase
+    {
+        private string connect;
+        public GridDataStoreInitialiser (string s) { connect = s; }
+        public override void Initialise (IPlugin plugin)
+        {
+            IGridDataPlugin p = plugin as IGridDataPlugin;
+            p.Initialise (connect);
+        }
+    }
 }
diff --git a/OpenSim/Data/ILogData.cs b/OpenSim/Data/ILogData.cs
index 7275637..34657dc 100644
--- a/OpenSim/Data/ILogData.cs
+++ b/OpenSim/Data/ILogData.cs
@@ -25,6 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using Mono.Addins;
+using OpenSim.Framework;
+
 namespace OpenSim.Data
 {
     /// <summary>
@@ -61,7 +64,8 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface to a LogData storage system
     /// </summary>
-    public interface ILogData
+    [TypeExtensionPoint("/OpenSim/GridLogData")]
+    public interface ILogDataPlugin : IPlugin
     {
         void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,
                      string logMessage);
@@ -70,22 +74,16 @@ namespace OpenSim.Data
         /// Initialises the interface
         /// </summary>
         void Initialise(string connect);
-
-        /// <summary>
-        /// Closes the interface
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        string getName();
-
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        string getVersion();
+    }
+    
+    public class LogDataInitialiser : PluginInitialiserBase
+    {
+        private string connect;
+        public LogDataInitialiser (string s) { connect = s; }
+        public override void Initialise (IPlugin plugin)
+        {
+            ILogDataPlugin p = plugin as ILogDataPlugin;
+            p.Initialise (connect);
+        }
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 0abd0d0..7de77d1 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -33,12 +33,18 @@ using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
 using log4net;
+using Mono.Addins;
+using OpenSim.Framework;
+
+[assembly : Addin]
+[assembly : AddinDependency("OpenSim.Data", "0.5")]
 
 namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// A grid data interface for MSSQL Server
     /// </summary>
+    [Extension("/OpenSim/GridDataStore")]
     public class MSSQLGridData : GridDataBase
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,6 +56,12 @@ namespace OpenSim.Data.MSSQL
 
         private string m_regionsTableName;
 
+        override public void Initialise() 
+        { 
+            m_log.Info("[MSSQLGridData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException (Name);
+        }
+
         /// <summary>
         /// Initialises the Grid Interface
         /// </summary>
@@ -101,7 +113,7 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// Shuts down the grid interface
         /// </summary>
-        override public void Close()
+        override public void Dispose()
         {
             // nothing to close
         }
@@ -110,18 +122,18 @@ namespace OpenSim.Data.MSSQL
         /// The name of this DB provider. 
         /// </summary>
         /// <returns>A string containing the storage system name</returns>
-        override public string getName()
+        override public string Name
         {
-            return "Sql OpenGridData";
+            get { return "Sql OpenGridData"; }
         }
 
         /// <summary>
         /// Database provider version. 
         /// </summary>
         /// <returns>A string containing the storage system version</returns>
-        override public string getVersion()
+        override public string Version
         {
-            return "0.1";
+            get { return "0.1"; }
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
index 849d0fb..d0d81b6 100644
--- a/OpenSim/Data/MSSQL/MSSQLLogData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs
@@ -25,21 +25,39 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Reflection;
 using System.Collections.Generic;
 using System.Data;
+using log4net;
+using Mono.Addins;
+using OpenSim.Framework;
+
+// Only one attribute per assembly. See: *GridData.cs
+// [assembly : Addin]
+// [assembly : AddinDependency("OpenSim.Data", "0.5")]
 
 namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// An interface to the log database for MSSQL
     /// </summary>
-    internal class MSSQLLogData : ILogData
+    [Extension("/OpenSim/GridLogData")]
+    internal class MSSQLLogData : ILogDataPlugin
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         /// <summary>
         /// The database manager
         /// </summary>
         public MSSQLManager database;
 
+        public void Initialise() 
+        { 
+            m_log.Info("[MSSQLLogData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException (Name);
+        }
+
         /// <summary>
         /// Artificial constructor called when the plugin is loaded
         /// </summary>
@@ -97,15 +115,15 @@ namespace OpenSim.Data.MSSQL
         /// Returns the name of this DB provider
         /// </summary>
         /// <returns>A string containing the DB provider name</returns>
-        public string getName()
+        public string Name
         {
-            return "MSSQL Logdata Interface";
+            get { return "MSSQL Logdata Interface"; }
         }
 
         /// <summary>
         /// Closes the database provider
         /// </summary>
-        public void Close()
+        public void Dispose()
         {
             // Do nothing.
         }
@@ -114,9 +132,9 @@ namespace OpenSim.Data.MSSQL
         /// Returns the version of this DB provider
         /// </summary>
         /// <returns>A string containing the provider version</returns>
-        public string getVersion()
+        public string Version
         {
-            return "0.1";
+            get { return "0.1"; }
         }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 6cb0b4c..9284ba9 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -34,6 +34,7 @@ using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
 
+
 namespace OpenSim.Data.MySQL
 {
     /// <summary>
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index bb71c99..8142c74 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -33,12 +33,18 @@ using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
 using log4net;
+using Mono.Addins;
+using OpenSim.Framework;
+
+[assembly : Addin]
+[assembly : AddinDependency("OpenSim.Data", "0.5")]
 
 namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// A MySQL Interface for the Grid Server
     /// </summary>
+    [Extension("/OpenSim/GridDataStore")]
     public class MySQLGridData : GridDataBase
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -48,6 +54,12 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         private MySQLManager database;
 
+        override public void Initialise() 
+        { 
+            m_log.Info("[MySQLLogData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException (Name);
+        }
+
         /// <summary>
         /// <para>Initialises Grid interface</para>
         /// <para>
@@ -144,7 +156,7 @@ namespace OpenSim.Data.MySQL
         /// <summary>
         /// Shuts down the grid interface
         /// </summary>
-        override public void Close()
+        override public void Dispose()
         {
             database.Close();
         }
@@ -153,18 +165,18 @@ namespace OpenSim.Data.MySQL
         /// Returns the plugin name
         /// </summary>
         /// <returns>Plugin name</returns>
-        override public string getName()
+        override public string Name
         {
-            return "MySql OpenGridData";
+            get { return "MySql OpenGridData"; }
         }
 
         /// <summary>
         /// Returns the plugin version
         /// </summary>
         /// <returns>Plugin version</returns>
-        override public string getVersion()
+        override public string Version
         {
-            return "0.1";
+            get { return "0.1"; }
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index fee7f2f..f11aec5 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -28,20 +28,34 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
+using OpenSim.Framework;
+
+// Only one attribute per assembly. See: *GridData.cs
+// [assembly : Addin]
+// [assembly : AddinDependency("OpenSim.Data", "0.5")]
 
 namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// An interface to the log database for MySQL
     /// </summary>
-    internal class MySQLLogData : ILogData
+    [Extension("/OpenSim/GridLogData")]
+    internal class MySQLLogData : ILogDataPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// The database manager
         /// </summary>
         public MySQLManager database;
 
+        public void Initialise() 
+        { 
+            m_log.Info("[MySQLLogData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException (Name);
+        }
+        
         /// <summary>
         /// Artificial constructor called when the plugin is loaded
         /// Uses the obsolete mysql_connection.ini if connect string is empty.
@@ -128,16 +142,16 @@ namespace OpenSim.Data.MySQL
         /// Returns the name of this DB provider
         /// </summary>
         /// <returns>A string containing the DB provider name</returns>
-        public string getName()
+        public string Name
         {
-            return "MySQL Logdata Interface";
+            get { return "MySQL Logdata Interface";}
         }
 
         /// <summary>
         /// Closes the database provider
         /// </summary>
         /// <remarks>do nothing</remarks>
-        public void Close()
+        public void Dispose()
         {
             // Do nothing.
         }
@@ -146,9 +160,9 @@ namespace OpenSim.Data.MySQL
         /// Returns the version of this DB provider
         /// </summary>
         /// <returns>A string containing the provider version</returns>
-        public string getVersion()
+        public string Version
         {
-            return "0.1";
+            get { return "0.1"; }
         }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index cf4bce3..89d0672 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Data.MySQL
 
             return
                 string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
-                              dllVersion.Revision);
+                        dllVersion.Revision);
         }
 
         /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 6fd7235..1e07458 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -28,23 +28,38 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
+using log4net;
+using Mono.Addins;
 using OpenSim.Framework;
 
+[assembly : Addin]
+[assembly : AddinDependency("OpenSim.Data", "0.5")]
+
 namespace OpenSim.Data.SQLite
 {
     /// <summary>
     /// A Grid Interface to the SQLite database
     /// </summary>
+    [Extension("/OpenSim/GridDataStore")]
     public class SQLiteGridData : GridDataBase
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// SQLite database manager
         /// </summary>
         private SQLiteManager database;
 
+        override public void Initialise() 
+        { 
+            m_log.Info("[SQLite]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException (Name);
+        }
+
         /// <summary>
         /// <list type="bullet">
         /// <item>Initialises Inventory interface</item>
@@ -61,7 +76,7 @@ namespace OpenSim.Data.SQLite
         /// <summary>
         /// Shuts down the grid interface
         /// </summary>
-        override public void Close()
+        override public void Dispose()
         {
             database.Close();
         }
@@ -70,18 +85,18 @@ namespace OpenSim.Data.SQLite
         /// Returns the name of this grid interface
         /// </summary>
         /// <returns>A string containing the grid interface</returns>
-        override public string getName()
+        override public string Name
         {
-            return "SQLite OpenGridData";
+            get { return "SQLite OpenGridData"; }
         }
 
         /// <summary>
         /// Returns the version of this grid interface
         /// </summary>
         /// <returns>A string containing the version</returns>
-        override public string getVersion()
+        override public string Version
         {
-            return "0.1";
+            get { return "0.1"; }
         }
 
         /// <summary>