OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* test: Add the ability to add a plugin directory to the user and inventory services in order to extend unit tests for user and inventory information 

* I can't spend any longer in trying to get Mono.Addins to work with the unit tests, so this is not a proper plugin at this time
0.6.1-post-fixes
Justin Clarke Casey 2008-11-27 19:28:04 +00:00
parent 5867f9c11f
commit 7c6c776ff7
8 changed files with 111 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -110,7 +110,6 @@ namespace OpenSim.Framework.Communications
/// </summary> /// </summary>
protected IUserServiceAdmin m_userServiceAdmin; protected IUserServiceAdmin m_userServiceAdmin;
public BaseHttpServer HttpServer public BaseHttpServer HttpServer
{ {
get { return m_httpServer; } get { return m_httpServer; }

19
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -48,20 +48,29 @@ namespace OpenSim.Framework.Communications
#region Plugin methods #region Plugin methods
/// <summary> /// <summary>
/// Adds a new user server plugin - plugins will be requested in the order they were loaded. /// Add a new inventory data plugin - plugins will be requested in the order they were added.
/// </summary> /// </summary>
/// <param name="provider">The filename to the user server plugin DLL</param> /// <param name="plugin">The plugin that will provide data</param>
public void AddPlugin(IInventoryDataPlugin plugin)
{
m_plugins.Add(plugin);
}
/// <summary>
/// Adds a new inventory data plugin - plugins will be requested in the order they were loaded.
/// </summary>
/// <param name="provider">The filename of the inventory server plugin DLL</param>
public void AddPlugin(string provider, string connect) public void AddPlugin(string provider, string connect)
{ {
PluginLoader<IInventoryDataPlugin> loader = PluginLoader<IInventoryDataPlugin> loader =
new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser(connect));
// loader will try to load all providers (MySQL, MSSQL, etc) // loader will try to load all providers (MySQL, MSSQL, etc)
// unless it is constrainted to the correct "Provider" entry in the addin.xml // unless it is constrainted to the correct "Provider" entry in the addin.xml
loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter(provider));
loader.Load(); loader.Load();
m_plugins = loader.Plugins; m_plugins.AddRange(loader.Plugins);
} }
#endregion #endregion

32
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -48,12 +48,24 @@ namespace OpenSim.Framework.Communications
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <value>
/// List of plugins to search for user data
/// </value>
private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>(); private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>();
/// <summary>
/// Add a new user data plugin - plugins will be requested in the order they were added.
/// </summary>
/// <param name="plugin">The plugin that will provide user data</param>
public void AddPlugin(IUserDataPlugin plugin)
{
_plugins.Add(plugin);
}
/// <summary> /// <summary>
/// Adds a new user server plugin - user servers will be requested in the order they were loaded. /// Add a new user data plugin - plugins will be requested in the order they were added.
/// </summary> /// </summary>
/// <param name="provider">The filename to the user server plugin DLL</param> /// <param name="provider">The filename to the user data plugin DLL</param>
/// <param name="connect"></param> /// <param name="connect"></param>
public void AddPlugin(string provider, string connect) public void AddPlugin(string provider, string connect)
{ {
@ -65,7 +77,7 @@ namespace OpenSim.Framework.Communications
loader.Add("/OpenSim/UserData", new PluginProviderFilter(provider)); loader.Add("/OpenSim/UserData", new PluginProviderFilter(provider));
loader.Load(); loader.Load();
_plugins = loader.Plugins; _plugins.AddRange(loader.Plugins);
} }
#region Get UserProfile #region Get UserProfile
@ -637,7 +649,7 @@ namespace OpenSim.Framework.Communications
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Info("[USERSTORAGE]: Unable to add user via " + plugin.Name + "(" + e.ToString() + ")"); m_log.Error("[USERSTORAGE]: Unable to add user via " + plugin.Name + "(" + e.ToString() + ")");
} }
} }
@ -696,8 +708,11 @@ namespace OpenSim.Framework.Communications
return false; return false;
} }
/// Appearance /// <summary>
/// TODO: stubs for now to get us to a compiling state gently /// Get avatar appearance information
/// </summary>
/// <param name="user"></param>
/// <returns></returns>
public AvatarAppearance GetUserAppearance(UUID user) public AvatarAppearance GetUserAppearance(UUID user)
{ {
foreach (IUserDataPlugin plugin in _plugins) foreach (IUserDataPlugin plugin in _plugins)
@ -714,6 +729,11 @@ namespace OpenSim.Framework.Communications
return null; return null;
} }
/// <summary>
/// Update avatar appearance information
/// </summary>
/// <param name="user"></param>
/// <param name="appearance"></param>
public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
{ {
foreach (IUserDataPlugin plugin in _plugins) foreach (IUserDataPlugin plugin in _plugins)

103
OpenSim/Framework/PluginLoader.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Framework
public interface IPluginConstraint public interface IPluginConstraint
{ {
string Message { get; } string Message { get; }
bool Apply (string extpoint); bool Apply(string extpoint);
} }
/// <summary> /// <summary>
@ -60,7 +60,7 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public interface IPluginFilter public interface IPluginFilter
{ {
bool Apply (PluginExtensionNode plugin); bool Apply(PluginExtensionNode plugin);
} }
/// <summary> /// <summary>
@ -99,89 +99,90 @@ namespace OpenSim.Framework
get { return (loaded.Count == 1)? loaded [0] : default (T); } get { return (loaded.Count == 1)? loaded [0] : default (T); }
} }
public PluginLoader () public PluginLoader()
{ {
Initialiser = new PluginInitialiserBase(); Initialiser = new PluginInitialiserBase();
initialise_plugin_dir_ ("."); initialise_plugin_dir_(".");
} }
public PluginLoader (PluginInitialiserBase init) public PluginLoader(PluginInitialiserBase init)
{ {
Initialiser = init; Initialiser = init;
initialise_plugin_dir_ ("."); initialise_plugin_dir_(".");
} }
public PluginLoader (PluginInitialiserBase init, string dir) public PluginLoader(PluginInitialiserBase init, string dir)
{ {
Initialiser = init; Initialiser = init;
initialise_plugin_dir_ (dir); initialise_plugin_dir_(dir);
} }
public void Add (string extpoint) public void Add(string extpoint)
{ {
if (extpoints.Contains (extpoint)) if (extpoints.Contains(extpoint))
return; return;
extpoints.Add (extpoint); extpoints.Add(extpoint);
} }
public void Add (string extpoint, IPluginConstraint cons) public void Add(string extpoint, IPluginConstraint cons)
{ {
Add (extpoint); Add(extpoint);
AddConstraint (extpoint, cons); AddConstraint(extpoint, cons);
} }
public void Add (string extpoint, IPluginFilter filter) public void Add(string extpoint, IPluginFilter filter)
{ {
Add (extpoint); Add(extpoint);
AddFilter (extpoint, filter); AddFilter(extpoint, filter);
} }
public void AddConstraint (string extpoint, IPluginConstraint cons) public void AddConstraint(string extpoint, IPluginConstraint cons)
{ {
constraints.Add (extpoint, cons); constraints.Add(extpoint, cons);
} }
public void AddFilter (string extpoint, IPluginFilter filter) public void AddFilter(string extpoint, IPluginFilter filter)
{ {
filters.Add (extpoint, filter); filters.Add(extpoint, filter);
} }
public void Load (string extpoint) public void Load(string extpoint)
{ {
Add (extpoint); Add(extpoint);
Load(); Load();
} }
public void Load () public void Load()
{ {
foreach (string ext in extpoints) foreach (string ext in extpoints)
{ {
log.Info("[PLUGINS]: Loading extension point " + ext); log.Info("[PLUGINS]: Loading extension point " + ext);
if (constraints.ContainsKey (ext)) if (constraints.ContainsKey(ext))
{ {
IPluginConstraint cons = constraints [ext]; IPluginConstraint cons = constraints[ext];
if (cons.Apply (ext)) if (cons.Apply(ext))
log.Error ("[PLUGINS]: " + ext + " failed constraint: " + cons.Message); log.Error("[PLUGINS]: " + ext + " failed constraint: " + cons.Message);
} }
IPluginFilter filter = null; IPluginFilter filter = null;
if (filters.ContainsKey (ext)) if (filters.ContainsKey(ext))
filter = filters [ext]; filter = filters[ext];
List<T> loadedPlugins = new List<T>(); List<T> loadedPlugins = new List<T>();
foreach (PluginExtensionNode node in AddinManager.GetExtensionNodes (ext)) foreach (PluginExtensionNode node in AddinManager.GetExtensionNodes(ext))
{ {
log.Info("[PLUGINS]: Trying plugin " + node.Path); log.Info("[PLUGINS]: Trying plugin " + node.Path);
if ((filter != null) && (filter.Apply (node) == false)) if ((filter != null) && (filter.Apply(node) == false))
continue; continue;
T plugin = (T) node.CreateInstance(); T plugin = (T)node.CreateInstance();
loadedPlugins.Add(plugin); loadedPlugins.Add(plugin);
} }
// We do Initialise() in a second loop after CreateInstance // We do Initialise() in a second loop after CreateInstance
// So that modules who need init before others can do it // So that modules who need init before others can do it
// Example: Script Engine Component System needs to load its components before RegionLoader starts // Example: Script Engine Component System needs to load its components before RegionLoader starts
@ -193,28 +194,28 @@ namespace OpenSim.Framework
} }
} }
public void Dispose () public void Dispose()
{ {
foreach (T plugin in Plugins) foreach (T plugin in Plugins)
plugin.Dispose (); plugin.Dispose();
} }
private void initialise_plugin_dir_ (string dir) private void initialise_plugin_dir_(string dir)
{ {
if (AddinManager.IsInitialized == true) if (AddinManager.IsInitialized == true)
return; return;
log.Info("[PLUGINS]: Initializing"); log.Info("[PLUGINS]: Initializing addin manager");
AddinManager.AddinLoadError += on_addinloaderror_; AddinManager.AddinLoadError += on_addinloaderror_;
AddinManager.AddinLoaded += on_addinloaded_; AddinManager.AddinLoaded += on_addinloaded_;
clear_registry_(); clear_registry_();
suppress_console_output_ (true); suppress_console_output_(true);
AddinManager.Initialize (dir); AddinManager.Initialize(dir);
AddinManager.Registry.Update (null); AddinManager.Registry.Update(null);
suppress_console_output_ (false); suppress_console_output_(false);
} }
private void on_addinloaded_(object sender, AddinEventArgs args) private void on_addinloaded_(object sender, AddinEventArgs args)
@ -233,7 +234,7 @@ namespace OpenSim.Framework
+ args.Exception.StackTrace); + args.Exception.StackTrace);
} }
private void clear_registry_ () private void clear_registry_()
{ {
// The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
// occasionally seems to corrupt its addin cache // occasionally seems to corrupt its addin cache
@ -259,7 +260,7 @@ namespace OpenSim.Framework
} }
private static TextWriter prev_console_; private static TextWriter prev_console_;
public void suppress_console_output_ (bool save) public void suppress_console_output_(bool save)
{ {
if (save) if (save)
{ {
@ -295,15 +296,15 @@ namespace OpenSim.Framework
return typeobj; return typeobj;
if (type.Length == 0) if (type.Length == 0)
throw new InvalidOperationException ("Type name not specified."); throw new InvalidOperationException("Type name not specified.");
return typeobj = Addin.GetType (type, true); return typeobj = Addin.GetType(type, true);
} }
} }
public object CreateInstance () public object CreateInstance()
{ {
return Activator.CreateInstance (TypeObject); return Activator.CreateInstance(TypeObject);
} }
} }
@ -315,13 +316,13 @@ namespace OpenSim.Framework
private int min; private int min;
private int max; private int max;
public PluginCountConstraint (int exact) public PluginCountConstraint(int exact)
{ {
min = exact; min = exact;
max = exact; max = exact;
} }
public PluginCountConstraint (int minimum, int maximum) public PluginCountConstraint(int minimum, int maximum)
{ {
min = minimum; min = minimum;
max = maximum; max = maximum;
@ -338,10 +339,10 @@ namespace OpenSim.Framework
public bool Apply (string extpoint) public bool Apply (string extpoint)
{ {
int count = AddinManager.GetExtensionNodes (extpoint).Count; int count = AddinManager.GetExtensionNodes(extpoint).Count;
if ((count < min) || (count > max)) if ((count < min) || (count > max))
throw new PluginConstraintViolatedException (Message); throw new PluginConstraintViolatedException(Message);
return true; return true;
} }

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2789,8 +2789,10 @@ namespace OpenSim.Region.Environment.Scenes
} }
m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
// rewrite session_id // rewrite session_id
CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID); CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
if (userinfo != null) if (userinfo != null)
{ {
userinfo.SessionID = agent.SessionID; userinfo.SessionID = agent.SessionID;

14
OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
View File

@ -31,6 +31,8 @@ using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Scenes.Tests namespace OpenSim.Region.Environment.Scenes.Tests
@ -57,7 +59,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
/// <summary> /// <summary>
/// Test adding an object to a scene. /// Test adding an object to a scene.
/// </summary> /// </summary>
[Test] [Test]
public void TestAddSceneObject() public void TestAddSceneObject()
{ {
Scene scene = SceneTestUtils.SetupScene(); Scene scene = SceneTestUtils.SetupScene();
@ -99,6 +101,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
((LocalUserServices)scene.CommsManager.UserService).AddPlugin(new TestUserDataPlugin());
// Assert.That(
// scene.CommsManager.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
// Is.EqualTo(agentId));
IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero); scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero);
@ -107,7 +114,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
sogd.InventoryDeQueueAndDelete(); sogd.InventoryDeQueueAndDelete();
SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
Assert.That(retrievedPart2, Is.Null); Assert.That(retrievedPart2, Is.Null);
// CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
// Assert.That(userInfo, Is.Not.Null);
// TODO: test that the object actually made it successfully into inventory // TODO: test that the object actually made it successfully into inventory
} }

4
OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
View File

@ -85,8 +85,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
/// <summary> /// <summary>
/// Test removing an uncrossed root agent from a scene. /// Test removing an uncrossed root agent from a scene.
/// </summary> /// </summary>
[Test] [Test]
public void TestRemoveRootAgent() public void TestRemoveRootAgent()
{ {
Scene scene = SceneTestUtils.SetupScene(); Scene scene = SceneTestUtils.SetupScene();

4
OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
View File

@ -38,7 +38,9 @@ namespace OpenSim.Region.Environment.Scenes.Tests
public TestCommunicationsManager() public TestCommunicationsManager()
: base(null, null, null, false, null) : base(null, null, null, false, null)
{ {
m_userService = new LocalUserServices(null, 991, 992, null); LocalUserServices lus = new LocalUserServices(null, 991, 992, null);
m_userService = lus;
m_userServiceAdmin = lus;
} }
} }
} }