From 18974b77668553a9fd1bba0b646bfc7a0d788bcb Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 28 Nov 2008 16:04:01 +0000 Subject: * refactor: rename UserServiceAdmin to UserAdminService --- .../RemoteController/RemoteAdminPlugin.cs | 6 +- .../Communications/CommunicationsManager.cs | 6 +- .../Framework/Communications/IUserAdminService.cs | 71 ++++++++++++++++++++++ .../Framework/Communications/IUserServiceAdmin.cs | 68 --------------------- .../Framework/Communications/UserManagerBase.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 4 +- .../Hypergrid/HGCommunicationsStandalone.cs | 3 +- .../Communications/Local/CommunicationsLocal.cs | 4 +- .../Modules/InterGrid/OpenGridProtocolModule.cs | 2 +- .../Environment/Scenes/Tests/SceneObjectTests.cs | 2 +- .../Scenes/Tests/TestCommunicationsManager.cs | 2 +- 11 files changed, 86 insertions(+), 84 deletions(-) create mode 100644 OpenSim/Framework/Communications/IUserAdminService.cs delete mode 100644 OpenSim/Framework/Communications/IUserServiceAdmin.cs (limited to 'OpenSim') diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 7f7689d..cf60484 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -474,7 +474,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController { m_log.InfoFormat("master avatar does not exist, creating it"); // ...or create new user - userID = m_app.CommunicationsManager.UserServiceAdmin.AddUser( + userID = m_app.CommunicationsManager.UserAdminService.AddUser( masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY); if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", @@ -671,7 +671,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); UUID userID - = m_app.CommunicationsManager.UserServiceAdmin.AddUser( + = m_app.CommunicationsManager.UserAdminService.AddUser( firstname, lastname, passwd, email, regX, regY); if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", @@ -769,7 +769,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); UUID userID - = m_app.CommunicationsManager.UserServiceAdmin.AddUser( + = m_app.CommunicationsManager.UserAdminService.AddUser( firstname, lastname, passwd, email, regX, regY); if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index c4adfa5..72c01bd 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -108,11 +108,11 @@ namespace OpenSim.Framework.Communications /// /// Interface to user service for administrating users. /// - public IUserServiceAdmin UserServiceAdmin + public IUserAdminService UserAdminService { - get { return m_userServiceAdmin; } + get { return m_userAdminService; } } - protected IUserServiceAdmin m_userServiceAdmin; + protected IUserAdminService m_userAdminService; public BaseHttpServer HttpServer { diff --git a/OpenSim/Framework/Communications/IUserAdminService.cs b/OpenSim/Framework/Communications/IUserAdminService.cs new file mode 100644 index 0000000..3b7ba6e --- /dev/null +++ b/OpenSim/Framework/Communications/IUserAdminService.cs @@ -0,0 +1,71 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using OpenMetaverse; + +namespace OpenSim.Framework.Communications +{ + /// + /// Interface for the service for administrating users + /// + public interface IUserAdminService + { + /// + /// Add a new user + /// + /// The first name + /// The last name + /// password of avatar + /// email of user + /// region X + /// region Y + /// The UUID of the created user profile. On failure, returns UUID.Zero + UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY); + + /// + /// Add a new user with a specified UUID. SHOULD ONLY BE USED in very special circumstances from modules! + /// + /// The first name + /// The last name + /// password of avatar + /// email of user + /// region X + /// region Y + /// The set UUID + /// The UUID of the created user profile. On failure, returns UUID.Zero + UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY, UUID setUUID); + + /// + /// Reset a user password + /// + /// + /// + /// + /// true if the update was successful, false otherwise + bool ResetUserPassword(string firstName, string lastName, string newPassword); + } +} diff --git a/OpenSim/Framework/Communications/IUserServiceAdmin.cs b/OpenSim/Framework/Communications/IUserServiceAdmin.cs deleted file mode 100644 index b1f974b..0000000 --- a/OpenSim/Framework/Communications/IUserServiceAdmin.cs +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using OpenMetaverse; - -namespace OpenSim.Framework.Communications -{ - public interface IUserServiceAdmin - { - /// - /// Add a new user - /// - /// The first name - /// The last name - /// password of avatar - /// email of user - /// region X - /// region Y - /// The UUID of the created user profile. On failure, returns UUID.Zero - UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY); - - /// - /// Add a new user with a specified UUID. SHOULD ONLY BE USED in very special circumstances from modules! - /// - /// The first name - /// The last name - /// password of avatar - /// email of user - /// region X - /// region Y - /// The set UUID - /// The UUID of the created user profile. On failure, returns UUID.Zero - UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY, UUID setUUID); - - /// - /// Reset a user password - /// - /// - /// - /// - /// true if the update was successful, false otherwise - bool ResetUserPassword(string firstName, string lastName, string newPassword); - } -} diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 3946ea3..8bfb2d7 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -43,7 +43,7 @@ namespace OpenSim.Framework.Communications /// /// Base class for user management (create, read, etc) /// - public abstract class UserManagerBase : IUserService, IUserServiceAdmin, IAvatarService, IMessagingService + public abstract class UserManagerBase : IUserService, IUserAdminService, IAvatarService, IMessagingService { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 316cad5..1999737 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -800,7 +800,7 @@ namespace OpenSim if (null == m_commsManager.UserService.GetUserProfile(firstName, lastName)) { - m_commsManager.UserServiceAdmin.AddUser(firstName, lastName, password, email, regX, regY); + m_commsManager.UserAdminService.AddUser(firstName, lastName, password, email, regX, regY); } else { @@ -830,7 +830,7 @@ namespace OpenSim newPassword = MainConsole.Instance.PasswdPrompt("New password"); else newPassword = cmdparams[4]; - m_commsManager.UserServiceAdmin.ResetUserPassword(firstName, lastName, newPassword); + m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword); } protected void SaveXml(string[] cmdparams) diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index 3bf714e..804640e 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.Communications.Hypergrid BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, - IUserServiceAdmin userServiceAdmin, + IUserAdminService userServiceAdmin, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile) @@ -54,6 +54,5 @@ namespace OpenSim.Region.Communications.Hypergrid AddSecureInventoryService((ISecureInventoryService)inventoryService); m_inventoryServices = null; } - } } diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 48a635a..6489408 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.Communications.Local BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, - IUserServiceAdmin userServiceAdmin, + IUserAdminService userServiceAdmin, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService, IMessagingService messageService, @@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.Local m_defaultInventoryHost = inventoryService.Host; m_interServiceInventoryService = inventoryService; m_userService = userService; - m_userServiceAdmin = userServiceAdmin; + m_userAdminService = userServiceAdmin; m_avatarService = (IAvatarService)userService; m_gridService = gridService; m_interRegion = interRegionService; diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index a855617..cbc4615 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -530,7 +530,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid // get seed capagentData.firstname = FirstName;agentData.lastname = LastName; if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode) { - homeScene.CommsManager.UserServiceAdmin.AddUser( + homeScene.CommsManager.UserAdminService.AddUser( agentData.firstname, agentData.lastname, CreateRandomStr(7), "", homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID); diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs index 6577fe3..7391696 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin()); Assert.That( - scene.CommsManager.UserServiceAdmin.AddUser( + scene.CommsManager.UserAdminService.AddUser( "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), Is.EqualTo(agentId)); diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs index 1607e03..cf7ba19 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests LocalUserServices lus = new LocalUserServices(991, 992, lis); m_userService = lus; - m_userServiceAdmin = lus; + m_userAdminService = lus; } } } -- cgit v1.1