From a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Wed, 23 Jul 2008 03:08:31 +0000
Subject: Thanks, sempuki, for a patch that moves control of Mono.Addins from
 source attributes to external XML files. Fix issues 1682 and 1786.

---
 OpenSim/Data/IGridData.cs             | 8 ++------
 OpenSim/Data/ILogData.cs              | 2 --
 OpenSim/Data/MSSQL/MSSQLGridData.cs   | 5 -----
 OpenSim/Data/MSSQL/MSSQLLogData.cs    | 6 ------
 OpenSim/Data/MySQL/MySQLGridData.cs   | 5 -----
 OpenSim/Data/MySQL/MySQLLogData.cs    | 6 ------
 OpenSim/Data/SQLite/SQLiteGridData.cs | 5 -----
 7 files changed, 2 insertions(+), 35 deletions(-)

(limited to 'OpenSim/Data')

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 @@
  */
 
 using libsecondlife;
-using Mono.Addins;
 using OpenSim.Framework;
 
-[assembly : AddinRoot("OpenSim.Data", "0.5")]
-
 namespace OpenSim.Data
 {
     public enum DataResponse
@@ -44,7 +41,6 @@ namespace OpenSim.Data
     /// <summary>
     /// A standard grid interface
     /// </summary>
-    [TypeExtensionPoint("/OpenSim/GridDataStore")]
     public interface IGridDataPlugin : IPlugin
     {
         /// <summary>
@@ -105,10 +101,10 @@ namespace OpenSim.Data
         ReservationData GetReservationAtPoint(uint x, uint y);
     }
     
-    public class GridDataStoreInitialiser : PluginInitialiserBase
+    public class GridDataInitialiser : PluginInitialiserBase
     {
         private string connect;
-        public GridDataStoreInitialiser (string s) { connect = s; }
+        public GridDataInitialiser (string s) { connect = s; }
         public override void Initialise (IPlugin plugin)
         {
             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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using Mono.Addins;
 using OpenSim.Framework;
 
 namespace OpenSim.Data
@@ -64,7 +63,6 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface to a LogData storage system
     /// </summary>
-    [TypeExtensionPoint("/OpenSim/GridLogData")]
     public interface ILogDataPlugin : IPlugin
     {
         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;
 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);
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;
 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>
-    [Extension("/OpenSim/GridLogData")]
     internal class MSSQLLogData : ILogDataPlugin
     {
         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;
 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);
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;
 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>
-    [Extension("/OpenSim/GridLogData")]
     internal class MySQLLogData : ILogDataPlugin
     {
         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;
 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);
-- 
cgit v1.1