From 6256078876d343a892d72df47ff6ce7d9e11f096 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Wed, 23 Jul 2008 05:53:54 +0000
Subject: Thanks, sempuki, for a patch that adds .addin.xml for MSSQL and
SQLite users.
---
OpenSim/Framework/PluginLoader.cs | 5 +++++
OpenSim/Grid/GridServer/GridManager.cs | 15 ++-------------
bin/LoadRegionsPlugin.addin.xml | 2 +-
bin/OpenSim.Data.MSSQL.addin.xml | 14 ++++++++++++++
bin/OpenSim.Data.MySQL.addin.xml | 6 +++---
bin/OpenSim.Data.SQLite.addin.xml | 11 +++++++++++
bin/RemoteAdminPlugin.addin.xml | 2 +-
bin/RestHandler.addin.xml | 2 +-
bin/RestRegionPlugin.addin.xml | 2 +-
9 files changed, 39 insertions(+), 20 deletions(-)
create mode 100644 bin/OpenSim.Data.MSSQL.addin.xml
create mode 100644 bin/OpenSim.Data.SQLite.addin.xml
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 0d21093..c4602a8 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -284,6 +284,11 @@ namespace OpenSim.Framework
public bool Apply (ExtensionNode plugin)
{
+ System.Console.WriteLine ("[WTF]: " + plugin.Path);
+
+ if (plugin.HasId == false)
+ return false;
+
return (plugin.Id == id);
}
}
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 0b4b4ac..ec3ca19 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -61,17 +61,6 @@ namespace OpenSim.Grid.GridServer
/// The name of the grid server plugin DLL
public void AddPlugin(string provider, string connect)
{
- // FIXME: convert "provider" DLL file name to Mono.Addins "id",
- // which unless it is changed in the source code, is the .NET namespace.
- // In the future, the "provider" should be changed to "id" in the
- // config files, and is independent of filenames or namespaces.
- string[] s = provider.Split ('.');
- int len = s.Length;
- if ((len >= 2) && (s [len-1] == "dll"))
- s [len-1] = s [len-2];
-
- provider = String.Join (".", s);
-
PluginLoader gridloader =
new PluginLoader (new GridDataInitialiser (connect));
@@ -83,8 +72,8 @@ namespace OpenSim.Grid.GridServer
// loader will try to load all providers (MySQL, MSSQL, etc)
// unless it is constrainted to the correct "id"
- //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData"));
- //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData"));
+ gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider));
+ logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider));
gridloader.Load();
logloader.Load();
diff --git a/bin/LoadRegionsPlugin.addin.xml b/bin/LoadRegionsPlugin.addin.xml
index 2bbffa6..7fc3876 100644
--- a/bin/LoadRegionsPlugin.addin.xml
+++ b/bin/LoadRegionsPlugin.addin.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/bin/OpenSim.Data.MSSQL.addin.xml b/bin/OpenSim.Data.MSSQL.addin.xml
new file mode 100644
index 0000000..b85c792
--- /dev/null
+++ b/bin/OpenSim.Data.MSSQL.addin.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/OpenSim.Data.MySQL.addin.xml b/bin/OpenSim.Data.MySQL.addin.xml
index ad861ea..6dd4d75 100644
--- a/bin/OpenSim.Data.MySQL.addin.xml
+++ b/bin/OpenSim.Data.MySQL.addin.xml
@@ -1,4 +1,4 @@
-
+
@@ -6,9 +6,9 @@
-
+
-
+
diff --git a/bin/OpenSim.Data.SQLite.addin.xml b/bin/OpenSim.Data.SQLite.addin.xml
new file mode 100644
index 0000000..ef254dc
--- /dev/null
+++ b/bin/OpenSim.Data.SQLite.addin.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/RemoteAdminPlugin.addin.xml b/bin/RemoteAdminPlugin.addin.xml
index b3fae6c..cb82ee0 100644
--- a/bin/RemoteAdminPlugin.addin.xml
+++ b/bin/RemoteAdminPlugin.addin.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/bin/RestHandler.addin.xml b/bin/RestHandler.addin.xml
index 1e33193..1727c3b 100644
--- a/bin/RestHandler.addin.xml
+++ b/bin/RestHandler.addin.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/bin/RestRegionPlugin.addin.xml b/bin/RestRegionPlugin.addin.xml
index c085192..91a6dd6 100644
--- a/bin/RestRegionPlugin.addin.xml
+++ b/bin/RestRegionPlugin.addin.xml
@@ -1,4 +1,4 @@
-
+
--
cgit v1.1