From 2270b252656146d9d74b84665a7ace6c3139db30 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Thu, 31 Jul 2008 09:24:28 +0000
Subject: Thanks, sempuki, for a patch that moves all Grid Server's plugins to
PluginLoader. Fix issue 1871.
---
OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 33 ++++++++++++++--------
OpenSim/Data/NHibernate/NHibernateUserData.cs | 8 +++++-
2 files changed, 28 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Data/NHibernate')
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 153d2d5..657a7b2 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -42,7 +42,7 @@ using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{
- public class NHibernateInventoryData: IInventoryData
+ public class NHibernateInventoryData: IInventoryDataPlugin
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,6 +50,12 @@ namespace OpenSim.Data.NHibernate
private ISessionFactory factory;
private ISession session;
+ public void Initialise()
+ {
+ m_log.Info("[NHibernateInventoryData]: " + Name + " cannot be default-initialized!");
+ throw new PluginNotInitialisedException (Name);
+ }
+
///
/// Initialises the interface
///
@@ -257,7 +263,7 @@ namespace OpenSim.Data.NHibernate
///
/// Closes the interface
///
- public void Close()
+ public void Dispose()
{
}
@@ -265,25 +271,28 @@ namespace OpenSim.Data.NHibernate
/// The plugin being loaded
///
/// A string containing the plugin name
- public string getName()
+ public string Name
{
- return "NHibernate Inventory Data Interface";
+ get { return "NHibernate Inventory Data Interface"; }
}
///
/// The plugins version
///
/// A string containing the plugin version
- public string getVersion()
+ public string Version
{
- Module module = GetType().Module;
- // string dllName = module.Assembly.ManifestModule.Name;
- Version dllVersion = module.Assembly.GetName().Version;
+ get
+ {
+ Module module = GetType().Module;
+ // string dllName = module.Assembly.ManifestModule.Name;
+ Version dllVersion = module.Assembly.GetName().Version;
- return
- string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
- dllVersion.Revision);
+ return
+ string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
+ dllVersion.Revision);
+ }
}
// Move seems to be just update
@@ -369,7 +378,7 @@ namespace OpenSim.Data.NHibernate
return folders;
}
- // See IInventoryData
+ // See IInventoryDataPlugin
public List getFolderHierarchy(LLUUID parentID)
{
List folders = new List();
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 9d9aec9..bceae7c 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -53,6 +53,12 @@ namespace OpenSim.Data.NHibernate
private ISessionFactory factory;
private ISession session;
+ public override void Initialise()
+ {
+ m_log.Info("[NHibernateUserData]: " + Name + " cannot be default-initialized!");
+ throw new PluginNotInitialisedException (Name);
+ }
+
public override void Initialise(string connect)
{
char[] split = {';'};
@@ -320,7 +326,7 @@ namespace OpenSim.Data.NHibernate
get { return "0.1"; }
}
- public void Dispose()
+ public override void Dispose()
{
}
--
cgit v1.1