From 2415d36bed4ccc2025c62f7e8e0a58fc3d76928a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 19:50:09 -0800 Subject: OpenSim.Region.Communications.* is no more. Thanks to everyone who contributed to these! --- .../Hypergrid/HGCommunicationsGridMode.cs | 57 ---- .../Hypergrid/HGCommunicationsStandalone.cs | 63 ---- .../Communications/Hypergrid/HGUserDataPlugin.cs | 72 ----- .../Communications/Hypergrid/HGUserServices.cs | 338 --------------------- 4 files changed, 530 deletions(-) delete mode 100644 OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs delete mode 100644 OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs delete mode 100644 OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs delete mode 100644 OpenSim/Region/Communications/Hypergrid/HGUserServices.cs (limited to 'OpenSim/Region/Communications/Hypergrid') diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs deleted file mode 100644 index 2106477..0000000 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ /dev/null @@ -1,57 +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 OpenSimulator 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 System.Reflection; -using log4net; -using OpenSim.Data; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Region.Communications.OGS1; -using OpenSim.Region.Framework.Scenes; - -namespace OpenSim.Region.Communications.Hypergrid -{ - public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 - { - - public HGCommunicationsGridMode( - NetworkServersInfo serversInfo, - SceneManager sman, LibraryRootFolder libraryRootFolder) - : base(serversInfo, libraryRootFolder) - { - - HGUserServices userServices = new HGUserServices(this); - // This plugin arrangement could eventually be configurable rather than hardcoded here. - userServices.AddPlugin(new TemporaryUserProfilePlugin()); - userServices.AddPlugin(new HGUserDataPlugin(this, userServices)); - - } - } -} diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs deleted file mode 100644 index f75edca..0000000 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ /dev/null @@ -1,63 +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 OpenSimulator 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 System.Collections.Generic; -using OpenSim.Data; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Osp; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Region.Communications.Local; -using OpenSim.Region.Communications.OGS1; - -namespace OpenSim.Region.Communications.Hypergrid -{ - public class HGCommunicationsStandalone : CommunicationsManager - { - public HGCommunicationsStandalone( - ConfigSettings configSettings, - NetworkServersInfo serversInfo, - BaseHttpServer httpServer, - LibraryRootFolder libraryRootFolder, - bool dumpAssetsToFile) - : base(serversInfo, libraryRootFolder) - { - LocalUserServices localUserService = - new LocalUserServices( - serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); - localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); - - HGUserServices hgUserService = new HGUserServices(this, localUserService); - // This plugin arrangement could eventually be configurable rather than hardcoded here. - hgUserService.AddPlugin(new TemporaryUserProfilePlugin()); - hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService)); - - } - } -} diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs b/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs deleted file mode 100644 index 4b8fc26..0000000 --- a/OpenSim/Region/Communications/Hypergrid/HGUserDataPlugin.cs +++ /dev/null @@ -1,72 +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 OpenSimulator 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 System; -using System.Collections; -using System.Collections.Generic; -using System.Net; -using System.Reflection; -using System.Text.RegularExpressions; -using System.Xml.Serialization; -using log4net; -using Nwc.XmlRpc; -using OpenMetaverse; -using OpenSim.Data; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Clients; -using OpenSim.Region.Communications.OGS1; - -namespace OpenSim.Region.Communications.Hypergrid -{ - public class HGUserDataPlugin : OGS1UserDataPlugin - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - HGUserServices m_UserServices; - - public HGUserDataPlugin() - { - } - - public HGUserDataPlugin(CommunicationsManager commsManager, HGUserServices userServices) - { - m_log.DebugFormat("[HG USER SERVICES]: {0} initialized", Name); - m_commsManager = commsManager; - m_UserServices = userServices; - } - - protected override string GetUserServerURL(UUID userID) - { - string url = string.Empty; - if (m_UserServices.IsForeignUser(userID, out url)) - return url; - return m_commsManager.NetworkServersInfo.UserURL; - } - - } -} diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs deleted file mode 100644 index 12bc64d..0000000 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ /dev/null @@ -1,338 +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 OpenSimulator 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 System; -using System.Collections; -using System.Collections.Generic; -using OpenMetaverse; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Clients; -using OpenSim.Region.Communications.OGS1; -using OpenSim.Region.Communications.Local; -using OpenSim.Services.Interfaces; - -namespace OpenSim.Region.Communications.Hypergrid -{ - /// - /// For the time being, this class is just an identity wrapper around OGS1UserServices, - /// so it always fails for foreign users. - /// Later it needs to talk with the foreign users' user servers. - /// - public class HGUserServices : OGS1UserServices - { - //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - //private OGS1UserServices m_remoteUserServices; - private LocalUserServices m_localUserServices; - - // Constructor called when running in grid mode - public HGUserServices(CommunicationsManager commsManager) - : base(commsManager) - { - } - - // Constructor called when running in standalone - public HGUserServices(CommunicationsManager commsManager, LocalUserServices local) - : base(commsManager) - { - m_localUserServices = local; - } - - public override void SetInventoryService(IInventoryService invService) - { - base.SetInventoryService(invService); - if (m_localUserServices != null) - m_localUserServices.SetInventoryService(invService); - } - - public override UUID AddUser( - string firstName, string lastName, string password, string email, uint regX, uint regY, UUID uuid) - { - // Only valid to create users locally - if (m_localUserServices != null) - return m_localUserServices.AddUser(firstName, lastName, password, email, regX, regY, uuid); - - return UUID.Zero; - } - - public override bool AddUserAgent(UserAgentData agentdata) - { - if (m_localUserServices != null) - return m_localUserServices.AddUserAgent(agentdata); - - return base.AddUserAgent(agentdata); - } - - public override UserAgentData GetAgentByUUID(UUID userId) - { - string url = string.Empty; - if ((m_localUserServices != null) && !IsForeignUser(userId, out url)) - return m_localUserServices.GetAgentByUUID(userId); - - return base.GetAgentByUUID(userId); - } - - public override void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat) - { - string url = string.Empty; - if ((m_localUserServices != null) && !IsForeignUser(userid, out url)) - m_localUserServices.LogOffUser(userid, regionid, regionhandle, position, lookat); - else - base.LogOffUser(userid, regionid, regionhandle, position, lookat); - } - - public override UserProfileData GetUserProfile(string firstName, string lastName) - { - if (m_localUserServices != null) - return m_localUserServices.GetUserProfile(firstName, lastName); - - return base.GetUserProfile(firstName, lastName); - } - - public override List GenerateAgentPickerRequestResponse(UUID queryID, string query) - { - if (m_localUserServices != null) - return m_localUserServices.GenerateAgentPickerRequestResponse(queryID, query); - - return base.GenerateAgentPickerRequestResponse(queryID, query); - } - - /// - /// Get a user profile from the user server - /// - /// - /// null if the request fails - public override UserProfileData GetUserProfile(UUID avatarID) - { - //string url = string.Empty; - // Unfortunately we can't query for foreigners here, - // because we'll end up in an infinite loop... - //if ((m_localUserServices != null) && (!IsForeignUser(avatarID, out url))) - if (m_localUserServices != null) - return m_localUserServices.GetUserProfile(avatarID); - - return base.GetUserProfile(avatarID); - } - - public override void ClearUserAgent(UUID avatarID) - { - if (m_localUserServices != null) - m_localUserServices.ClearUserAgent(avatarID); - else - base.ClearUserAgent(avatarID); - } - - /// - /// Retrieve the user information for the given master uuid. - /// - /// - /// - public override UserProfileData SetupMasterUser(string firstName, string lastName) - { - if (m_localUserServices != null) - return m_localUserServices.SetupMasterUser(firstName, lastName); - - return base.SetupMasterUser(firstName, lastName); - } - - /// - /// Retrieve the user information for the given master uuid. - /// - /// - /// - public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) - { - if (m_localUserServices != null) - return m_localUserServices.SetupMasterUser(firstName, lastName, password); - - return base.SetupMasterUser(firstName, lastName, password); - } - - /// - /// Retrieve the user information for the given master uuid. - /// - /// - /// - public override UserProfileData SetupMasterUser(UUID uuid) - { - if (m_localUserServices != null) - return m_localUserServices.SetupMasterUser(uuid); - - return base.SetupMasterUser(uuid); - } - - public override bool ResetUserPassword(string firstName, string lastName, string newPassword) - { - if (m_localUserServices != null) - return m_localUserServices.ResetUserPassword(firstName, lastName, newPassword); - else - return base.ResetUserPassword(firstName, lastName, newPassword); - } - - public override bool UpdateUserProfile(UserProfileData userProfile) - { - string url = string.Empty; - if ((m_localUserServices != null) && (!IsForeignUser(userProfile.ID, out url))) - return m_localUserServices.UpdateUserProfile(userProfile); - - return base.UpdateUserProfile(userProfile); - } - - public override bool AuthenticateUserByPassword(UUID userID, string password) - { - if (m_localUserServices != null) - return m_localUserServices.AuthenticateUserByPassword(userID, password); - else - return base.AuthenticateUserByPassword(userID, password); - } - - #region IUserServices Friend Methods - - // NOTE: We're still not dealing with foreign user friends - - /// - /// Adds a new friend to the database for XUser - /// - /// The agent that who's friends list is being added to - /// The agent that being added to the friends list of the friends list owner - /// A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects - public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) - { - if (m_localUserServices != null) - m_localUserServices.AddNewUserFriend(friendlistowner, friend, perms); - else - base.AddNewUserFriend(friendlistowner, friend, perms); - } - - /// - /// Delete friend on friendlistowner's friendlist. - /// - /// The agent that who's friends list is being updated - /// The Ex-friend agent - public override void RemoveUserFriend(UUID friendlistowner, UUID friend) - { - if (m_localUserServices != null) - m_localUserServices.RemoveUserFriend(friendlistowner, friend); - else - base.RemoveUserFriend(friend, friend); - } - - /// - /// Update permissions for friend on friendlistowner's friendlist. - /// - /// The agent that who's friends list is being updated - /// The agent that is getting or loosing permissions - /// A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects - public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) - { - if (m_localUserServices != null) - m_localUserServices.UpdateUserFriendPerms(friendlistowner, friend, perms); - else - base.UpdateUserFriendPerms(friendlistowner, friend, perms); - } - /// - /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner - /// - /// The agent that we're retreiving the friends Data. - public override List GetUserFriendList(UUID friendlistowner) - { - if (m_localUserServices != null) - return m_localUserServices.GetUserFriendList(friendlistowner); - - return base.GetUserFriendList(friendlistowner); - } - - #endregion - - /// Appearance - public override AvatarAppearance GetUserAppearance(UUID user) - { - string url = string.Empty; - if ((m_localUserServices != null) && (!IsForeignUser(user, out url))) - return m_localUserServices.GetUserAppearance(user); - else - return base.GetUserAppearance(user); - } - - public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance) - { - string url = string.Empty; - if ((m_localUserServices != null) && (!IsForeignUser(user, out url))) - m_localUserServices.UpdateUserAppearance(user, appearance); - else - base.UpdateUserAppearance(user, appearance); - } - - #region IMessagingService - - public override Dictionary GetFriendRegionInfos(List uuids) - { - if (m_localUserServices != null) - return m_localUserServices.GetFriendRegionInfos(uuids); - - return base.GetFriendRegionInfos(uuids); - } - #endregion - - public override bool VerifySession(UUID userID, UUID sessionID) - { - string url = string.Empty; - if ((m_localUserServices != null) && (!IsForeignUser(userID, out url))) - return m_localUserServices.VerifySession(userID, sessionID); - else - return base.VerifySession(userID, sessionID); - } - - - protected override string GetUserServerURL(UUID userID) - { - string serverURL = string.Empty; - if (IsForeignUser(userID, out serverURL)) - return serverURL; - - return m_commsManager.NetworkServersInfo.UserURL; - } - - [Obsolete] - public bool IsForeignUser(UUID userID, out string userServerURL) - { - userServerURL = m_commsManager.NetworkServersInfo.UserURL; - //CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); - //if (uinfo != null) - //{ - // if (!HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile)) - // { - // userServerURL = ((ForeignUserProfileData)(uinfo.UserProfile)).UserServerURI; - // return true; - // } - //} - return false; - } - } -} -- cgit v1.1