diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/PluginLoader.cs | 5 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 15 | ||||
-rw-r--r-- | bin/LoadRegionsPlugin.addin.xml | 2 | ||||
-rw-r--r-- | bin/OpenSim.Data.MSSQL.addin.xml | 14 | ||||
-rw-r--r-- | bin/OpenSim.Data.MySQL.addin.xml | 6 | ||||
-rw-r--r-- | bin/OpenSim.Data.SQLite.addin.xml | 11 | ||||
-rw-r--r-- | bin/RemoteAdminPlugin.addin.xml | 2 | ||||
-rw-r--r-- | bin/RestHandler.addin.xml | 2 | ||||
-rw-r--r-- | bin/RestRegionPlugin.addin.xml | 2 |
9 files changed, 39 insertions, 20 deletions
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 | |||
284 | 284 | ||
285 | public bool Apply (ExtensionNode plugin) | 285 | public bool Apply (ExtensionNode plugin) |
286 | { | 286 | { |
287 | System.Console.WriteLine ("[WTF]: " + plugin.Path); | ||
288 | |||
289 | if (plugin.HasId == false) | ||
290 | return false; | ||
291 | |||
287 | return (plugin.Id == id); | 292 | return (plugin.Id == id); |
288 | } | 293 | } |
289 | } | 294 | } |
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 | |||
61 | /// <param name="provider">The name of the grid server plugin DLL</param> | 61 | /// <param name="provider">The name of the grid server plugin DLL</param> |
62 | public void AddPlugin(string provider, string connect) | 62 | public void AddPlugin(string provider, string connect) |
63 | { | 63 | { |
64 | // FIXME: convert "provider" DLL file name to Mono.Addins "id", | ||
65 | // which unless it is changed in the source code, is the .NET namespace. | ||
66 | // In the future, the "provider" should be changed to "id" in the | ||
67 | // config files, and is independent of filenames or namespaces. | ||
68 | string[] s = provider.Split ('.'); | ||
69 | int len = s.Length; | ||
70 | if ((len >= 2) && (s [len-1] == "dll")) | ||
71 | s [len-1] = s [len-2]; | ||
72 | |||
73 | provider = String.Join (".", s); | ||
74 | |||
75 | PluginLoader<IGridDataPlugin> gridloader = | 64 | PluginLoader<IGridDataPlugin> gridloader = |
76 | new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); | 65 | new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect)); |
77 | 66 | ||
@@ -83,8 +72,8 @@ namespace OpenSim.Grid.GridServer | |||
83 | 72 | ||
84 | // loader will try to load all providers (MySQL, MSSQL, etc) | 73 | // loader will try to load all providers (MySQL, MSSQL, etc) |
85 | // unless it is constrainted to the correct "id" | 74 | // unless it is constrainted to the correct "id" |
86 | //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData")); | 75 | gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider)); |
87 | //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData")); | 76 | logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider)); |
88 | 77 | ||
89 | gridloader.Load(); | 78 | gridloader.Load(); |
90 | logloader.Load(); | 79 | 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 @@ | |||
1 | <Addin> | 1 | <Addin id="OpenSim.ApplicationPlugins.LoadRegions" version="0.1"> |
2 | <Runtime> | 2 | <Runtime> |
3 | <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/> | 3 | <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/> |
4 | </Runtime> | 4 | </Runtime> |
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 @@ | |||
1 | <Addin id="OpenSim.Data.MSSQL" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Data.MSSQL.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim.Data" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/GridData"> | ||
9 | <Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" /> | ||
10 | </Extension> | ||
11 | <Extension path = "/OpenSim/LogData"> | ||
12 | <Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" /> | ||
13 | </Extension> | ||
14 | </Addin> | ||
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 @@ | |||
1 | <Addin> | 1 | <Addin id="OpenSim.Data.MySQL" version="0.1"> |
2 | <Runtime> | 2 | <Runtime> |
3 | <Import assembly="OpenSim.Data.MySQL.dll"/> | 3 | <Import assembly="OpenSim.Data.MySQL.dll"/> |
4 | </Runtime> | 4 | </Runtime> |
@@ -6,9 +6,9 @@ | |||
6 | <Addin id="OpenSim.Data" version="0.5" /> | 6 | <Addin id="OpenSim.Data" version="0.5" /> |
7 | </Dependencies> | 7 | </Dependencies> |
8 | <Extension path = "/OpenSim/GridData"> | 8 | <Extension path = "/OpenSim/GridData"> |
9 | <Type type="OpenSim.Data.MySQL.MySQLGridData" /> | 9 | <Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" /> |
10 | </Extension> | 10 | </Extension> |
11 | <Extension path = "/OpenSim/LogData"> | 11 | <Extension path = "/OpenSim/LogData"> |
12 | <Type type="OpenSim.Data.MySQL.MySQLLogData" /> | 12 | <Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" /> |
13 | </Extension> | 13 | </Extension> |
14 | </Addin> | 14 | </Addin> |
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 @@ | |||
1 | <Addin id="OpenSim.Data.SQLite" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Data.SQLite.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim.Data" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/GridData"> | ||
9 | <Type id="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||
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 @@ | |||
1 | <Addin> | 1 | <Addin id="OpenSim.ApplicationPlugins.RemoteController" version="0.1"> |
2 | <Runtime> | 2 | <Runtime> |
3 | <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/> | 3 | <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/> |
4 | </Runtime> | 4 | </Runtime> |
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 @@ | |||
1 | <Addin> | 1 | <Addin id="OpenSim.ApplicationPlugins.Rest.Inventory" version="0.1"> |
2 | <Runtime> | 2 | <Runtime> |
3 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/> | 3 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/> |
4 | </Runtime> | 4 | </Runtime> |
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 @@ | |||
1 | <Addin> | 1 | <Addin id="OpenSim.ApplicationPlugins.Rest.Regions" version="0.1"> |
2 | <Runtime> | 2 | <Runtime> |
3 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/> | 3 | <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/> |
4 | </Runtime> | 4 | </Runtime> |