diff --git a/OpenSim/Data/IUserGridData.cs b/OpenSim/Data/IGridUserData.cs similarity index 91% rename from OpenSim/Data/IUserGridData.cs rename to OpenSim/Data/IGridUserData.cs index 6f7467ee96..abd2cef054 100644 --- a/OpenSim/Data/IUserGridData.cs +++ b/OpenSim/Data/IGridUserData.cs @@ -33,7 +33,7 @@ using OpenSim.Framework; namespace OpenSim.Data { // This MUST be a ref type! - public class UserGridData + public class GridUserData { public string UserID; public Dictionary Data; @@ -42,9 +42,9 @@ namespace OpenSim.Data /// /// An interface for connecting to the user grid datastore /// - public interface IUserGridData + public interface IGridUserData { - UserGridData GetUserGridData(string userID); - bool StoreUserGridData(UserGridData data); + GridUserData GetGridUserData(string userID); + bool StoreGridUserData(GridUserData data); } } \ No newline at end of file diff --git a/OpenSim/Data/MySQL/MySQLUserGridData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs similarity index 87% rename from OpenSim/Data/MySQL/MySQLUserGridData.cs rename to OpenSim/Data/MySQL/MySQLGridUserData.cs index 7209b18226..15834d2ab7 100644 --- a/OpenSim/Data/MySQL/MySQLUserGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs @@ -40,15 +40,15 @@ namespace OpenSim.Data.MySQL /// /// A MySQL Interface for user grid data /// - public class MySQLUserGridData : MySQLGenericTableHandler, IUserGridData + public class MySQLGridUserData : MySQLGenericTableHandler, IGridUserData { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public MySQLUserGridData(string connectionString, string realm) : base(connectionString, realm, "UserGrid") {} + public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "UserGrid") {} - public UserGridData GetUserGridData(string userID) + public GridUserData GetGridUserData(string userID) { - UserGridData[] ret = Get("UserID", userID); + GridUserData[] ret = Get("UserID", userID); if (ret.Length == 0) return null; @@ -56,7 +56,7 @@ namespace OpenSim.Data.MySQL return ret[0]; } - public bool StoreUserGridData(UserGridData data) + public bool StoreGridUserData(GridUserData data) { return Store(data); } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs similarity index 75% rename from OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs rename to OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs index f4309fead0..d5fae232d6 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs @@ -37,13 +37,13 @@ using OpenSim.Services.Interfaces; using OpenMetaverse; -namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser { - public class LocalUserGridServicesConnector : ISharedRegionModule, IUserGridService + public class LocalGridUserServicesConnector : ISharedRegionModule, IGridUserService { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private IUserGridService m_service; + private IGridUserService m_service; private bool m_Enabled = false; @@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid public string Name { - get { return "LocalUserGridServicesConnector"; } + get { return "LocalGridUserServicesConnector"; } } public void Initialise(IConfigSource source) @@ -62,13 +62,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid IConfig moduleConfig = source.Configs["Modules"]; if (moduleConfig != null) { - string name = moduleConfig.GetString("UserGridServices", ""); + string name = moduleConfig.GetString("GridUserServices", ""); if (name == Name) { - IConfig userConfig = source.Configs["UserGridService"]; + IConfig userConfig = source.Configs["GridUserService"]; if (userConfig == null) { - m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: UserGridService missing from ini files"); + m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: GridUserService missing from ini files"); return; } @@ -76,20 +76,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid if (serviceDll == String.Empty) { - m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: No LocalServiceModule named in section UserGridService"); + m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: No LocalServiceModule named in section GridUserService"); return; } Object[] args = new Object[] { source }; - m_service = ServerUtils.LoadPlugin(serviceDll, args); + m_service = ServerUtils.LoadPlugin(serviceDll, args); if (m_service == null) { - m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: Can't load UserGrid service"); + m_log.Error("[LOCAL GRID USER SERVICE CONNECTOR]: Can't load GridUser service"); return; } m_Enabled = true; - m_log.Info("[LOCAL USER GRID SERVICE CONNECTOR]: Local UserGrid connector enabled"); + m_log.Info("[LOCAL GRID USER SERVICE CONNECTOR]: Local GridUser connector enabled"); } } } @@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid if (!m_Enabled) return; - scene.RegisterModuleInterface(m_service); + scene.RegisterModuleInterface(m_service); } public void RemoveRegion(Scene scene) @@ -126,14 +126,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid return; } - public UserGridInfo GetUserGridInfo(string userID) + public GridUserInfo GetGridUserInfo(string userID) { - return m_service.GetUserGridInfo(userID); + return m_service.GetGridUserInfo(userID); } - public bool StoreUserGridInfo(UserGridInfo info) + public bool StoreGridUserInfo(GridUserInfo info) { - return m_service.StoreUserGridInfo(info); + return m_service.StoreGridUserInfo(info); } } } \ No newline at end of file diff --git a/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs similarity index 95% rename from OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs rename to OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs index 3aa8940e8a..ce88236ae3 100644 --- a/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs @@ -29,9 +29,9 @@ using System; namespace OpenSim.Services.Connectors { - public class UserGridServiceConnector + public class GridUserServiceConnector { - public UserGridServiceConnector() + public GridUserServiceConnector() { } } diff --git a/OpenSim/Services/Interfaces/IUserGridService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs similarity index 91% rename from OpenSim/Services/Interfaces/IUserGridService.cs rename to OpenSim/Services/Interfaces/IGridUserService.cs index 50134e0c6c..a7c2c6f014 100644 --- a/OpenSim/Services/Interfaces/IUserGridService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs @@ -34,16 +34,16 @@ namespace OpenSim.Services.Interfaces /// /// Records user information specific to a grid but which is not part of a user's account. /// - public class UserGridInfo + public class GridUserInfo { public string UserID; public UUID HomeRegionID; public Vector3 HomePosition; public Vector3 HomeLookAt; - public UserGridInfo() {} + public GridUserInfo() {} - public UserGridInfo(Dictionary kvp) + public GridUserInfo(Dictionary kvp) { if (kvp.ContainsKey("UserID")) UserID = kvp["UserID"].ToString(); @@ -67,9 +67,9 @@ namespace OpenSim.Services.Interfaces } } - public interface IUserGridService + public interface IGridUserService { - UserGridInfo GetUserGridInfo(string userID); - bool StoreUserGridInfo(UserGridInfo info); + GridUserInfo GetGridUserInfo(string userID); + bool StoreGridUserInfo(GridUserInfo info); } } \ No newline at end of file diff --git a/OpenSim/Services/UserAccountService/UserGridService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs similarity index 85% rename from OpenSim/Services/UserAccountService/UserGridService.cs rename to OpenSim/Services/UserAccountService/GridUserService.cs index 2d28b331d2..36cce758ce 100644 --- a/OpenSim/Services/UserAccountService/UserGridService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs @@ -39,20 +39,20 @@ using log4net; namespace OpenSim.Services.UserAccountService { - public class UserGridService : UserGridServiceBase, IUserGridService + public class GridUserService : GridUserServiceBase, IGridUserService { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public UserGridService(IConfigSource config) : base(config) + public GridUserService(IConfigSource config) : base(config) { m_log.Debug("[USER GRID SERVICE]: Starting user grid service"); } - public UserGridInfo GetUserGridInfo(string userID) + public GridUserInfo GetGridUserInfo(string userID) { - UserGridData d = m_Database.GetUserGridData(userID); + GridUserData d = m_Database.GetGridUserData(userID); - UserGridInfo info = new UserGridInfo(); + GridUserInfo info = new GridUserInfo(); info.UserID = d.UserID; info.HomeRegionID = new UUID(d.Data["HomeRegionID"]); info.HomePosition = Vector3.Parse(d.Data["HomePosition"]); @@ -61,16 +61,16 @@ namespace OpenSim.Services.UserAccountService return info; } - public bool StoreUserGridInfo(UserGridInfo info) + public bool StoreGridUserInfo(GridUserInfo info) { - UserGridData d = new UserGridData(); + GridUserData d = new GridUserData(); d.Data["UserID"] = info.UserID; d.Data["HomeRegionID"] = info.HomeRegionID.ToString(); d.Data["HomePosition"] = info.HomePosition.ToString(); d.Data["HomeLookAt"] = info.HomeLookAt.ToString(); - return m_Database.StoreUserGridData(d); + return m_Database.StoreGridUserData(d); } } } \ No newline at end of file diff --git a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs similarity index 88% rename from OpenSim/Services/UserAccountService/UserGridServiceBase.cs rename to OpenSim/Services/UserAccountService/GridUserServiceBase.cs index 80aaa49a64..990cb63dcf 100644 --- a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs +++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs @@ -35,15 +35,15 @@ using OpenSim.Services.Base; namespace OpenSim.Services.UserAccountService { - public class UserGridServiceBase : ServiceBase + public class GridUserServiceBase : ServiceBase { - protected IUserGridData m_Database = null; + protected IGridUserData m_Database = null; - public UserGridServiceBase(IConfigSource config) : base(config) + public GridUserServiceBase(IConfigSource config) : base(config) { string dllName = String.Empty; string connString = String.Empty; - string realm = "UserGrid"; + string realm = "GridUser"; // // Try reading the [DatabaseService] section, if it exists @@ -58,9 +58,9 @@ namespace OpenSim.Services.UserAccountService } // - // [PresenceService] section overrides [DatabaseService], if it exists + // [GridUsetService] section overrides [DatabaseService], if it exists // - IConfig presenceConfig = config.Configs["PresenceService"]; + IConfig presenceConfig = config.Configs["GridUserService"]; if (presenceConfig != null) { dllName = presenceConfig.GetString("StorageProvider", dllName); @@ -74,7 +74,7 @@ namespace OpenSim.Services.UserAccountService if (dllName.Equals(String.Empty)) throw new Exception("No StorageProvider configured"); - m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); + m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); if (m_Database == null) throw new Exception("Could not find a storage interface in the given module " + dllName); }