From 77297ed6cce787c662d67880e15ecaff5f1b4ca1 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 24 Jul 2008 15:56:50 +0000 Subject: * Separate out OGS1 calls used between services (rather than from region to services) into a separate assembly to parallel OpenSim.Region.Communications.OGS1 --- .../Communications/ISecureInventoryService.cs | 14 ++--- .../OGS1/OGS1InterServiceInventoryService.cs | 67 ++++++++++++++++++++++ OpenSim/Grid/UserServer/Main.cs | 4 +- .../Communications/OGS1/OGS1InventoryService.cs | 16 +----- .../OGS1/OGS1SecureInventoryService.cs | 15 +---- 5 files changed, 78 insertions(+), 38 deletions(-) create mode 100755 OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs (limited to 'OpenSim') diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs index 1da3115..3608c56 100644 --- a/OpenSim/Framework/Communications/ISecureInventoryService.cs +++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs @@ -99,17 +99,17 @@ namespace OpenSim.Framework.Communications bool DeleteItem(InventoryItemBase item, LLUUID session_id); /// - /// Create a new inventory for the given user. - /// - /// - /// true if the inventory was successfully created, false otherwise - bool CreateNewUserInventory(LLUUID user); - - /// /// Does the given user have an inventory structure? /// /// /// bool HasInventoryForUser(LLUUID userID); + + /// + /// Retrieve the root inventory folder for the given user. + /// + /// + /// null if no root folder was found + InventoryFolderBase RequestRootFolder(LLUUID userID); } } diff --git a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs new file mode 100755 index 0000000..92a6ad8 --- /dev/null +++ b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs @@ -0,0 +1,67 @@ +/* + * 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 System; +using System.Collections.Generic; +using libsecondlife; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Servers; + +namespace OpenSim.Grid.Communications.OGS1 +{ + /// + /// OGS1 implementation of the inter-service inventory service + /// + public class OGS1InterServiceInventoryService : IInterServiceInventoryServices + { + protected string m_inventoryServerUrl; + + public OGS1InterServiceInventoryService(string inventoryServerUrl) + { + m_inventoryServerUrl = inventoryServerUrl; + } + + public bool CreateNewUserInventory(LLUUID userId) + { + return SynchronousRestObjectPoster.BeginPostObject( + "POST", m_inventoryServerUrl + "CreateInventory/", userId.UUID); + } + + /// + /// + /// + /// + /// + public List GetInventorySkeleton(LLUUID userId) + { + //m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); + + return new List(); + } + } +} diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 4b4292d..6e970d5 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -39,7 +39,7 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Statistics; -using OpenSim.Region.Communications.OGS1; +using OpenSim.Grid.Communications.OGS1; namespace OpenSim.Grid.UserServer { @@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer m_loginService = new UserLoginService( m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); - m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl); + m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl); m_messagesService = new MessageServersConnector(); diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 80c286e..2828928 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs @@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics; namespace OpenSim.Region.Communications.OGS1 { - public class OGS1InventoryService : IInventoryServices, IInterServiceInventoryServices + public class OGS1InventoryService : IInventoryServices { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -306,20 +306,6 @@ namespace OpenSim.Region.Communications.OGS1 return null; } - public bool CreateNewUserInventory(LLUUID userId) - { - return SynchronousRestObjectPoster.BeginPostObject( - "POST", _inventoryServerUrl + "CreateInventory/", userId.UUID); - } - - // See IInventoryServices - public List GetInventorySkeleton(LLUUID userId) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); - - return new List(); - } - #endregion } } diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs index bb94c20..26521ab 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs @@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics; namespace OpenSim.Region.Communications.OGS1 { - public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices + public class OGS1SecureInventoryService : ISecureInventoryService { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -306,19 +306,6 @@ namespace OpenSim.Region.Communications.OGS1 return null; } - public bool CreateNewUserInventory(LLUUID user) - { - return false; - } - - // See IInventoryServices - public List GetInventorySkeleton(LLUUID userId) - { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); - - return new List(); - } - #endregion } } -- cgit v1.1