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

* refactor: rename UserServiceAdmin to UserAdminService

0.6.1-post-fixes
Justin Clarke Casey 2008-11-28 16:04:01 +00:00
parent 63851f1441
commit 18974b7766
10 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -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}",

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

@ -108,11 +108,11 @@ namespace OpenSim.Framework.Communications
/// <summary>
/// Interface to user service for administrating users.
/// </summary>
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
{

5
OpenSim/Framework/Communications/IUserServiceAdmin.cs → OpenSim/Framework/Communications/IUserAdminService.cs
View File

@ -29,7 +29,10 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications
{
public interface IUserServiceAdmin
/// <summary>
/// Interface for the service for administrating users
/// </summary>
public interface IUserAdminService
{
/// <summary>
/// Add a new user

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

@ -43,7 +43,7 @@ namespace OpenSim.Framework.Communications
/// <summary>
/// Base class for user management (create, read, etc)
/// </summary>
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);

4
OpenSim/Region/Application/OpenSim.cs
View File

@ -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)

3
OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
View File

@ -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;
}
}
}

4
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@ -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;

2
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -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);

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

@ -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));

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

@ -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;
}
}
}