From 29e8fcd13c99606813c916c4d464372572af230f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 24 Jul 2008 15:20:57 +0000
Subject: * minor: Rename IInterGridInventoryServices since it's inter service
rather than inter grid
---
.../Communications/CommunicationsManager.cs | 8 ++--
.../Communications/IInterGridInventoryServices.cs | 53 ----------------------
.../IInterServiceInventoryServices.cs | 53 ++++++++++++++++++++++
.../Framework/Communications/IInventoryServices.cs | 2 +-
.../Communications/InventoryServiceBase.cs | 2 +-
OpenSim/Grid/UserServer/Main.cs | 6 +--
.../Communications/Local/CommunicationsLocal.cs | 2 +-
.../Communications/Local/LocalLoginService.cs | 8 ++--
.../Communications/Local/LocalUserServices.cs | 8 ++--
.../Communications/OGS1/OGS1InventoryService.cs | 2 +-
.../OGS1/OGS1SecureInvenotryService.cs | 2 +-
11 files changed, 73 insertions(+), 73 deletions(-)
delete mode 100644 OpenSim/Framework/Communications/IInterGridInventoryServices.cs
create mode 100644 OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6272872..3659d86 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -88,11 +88,11 @@ namespace OpenSim.Framework.Communications
}
protected AssetCache m_assetCache;
- public IInterGridInventoryServices InterGridInventoryService
+ public IInterServiceInventoryServices InterServiceInventoryService
{
- get { return m_interGridInventoryService; }
+ get { return m_interServiceInventoryService; }
}
- protected IInterGridInventoryServices m_interGridInventoryService;
+ protected IInterServiceInventoryServices m_interServiceInventoryService;
public NetworkServersInfo NetworkServersInfo
{
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications
}
else
{
- InventoryService.CreateNewUserInventory(userProf.ID);
+ InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
return userProf.ID;
}
diff --git a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs b/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
deleted file mode 100644
index e820c5e..0000000
--- a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs
+++ /dev/null
@@ -1,53 +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 System.Collections.Generic;
-using libsecondlife;
-
-namespace OpenSim.Framework.Communications
-{
- ///
- /// Inventory operations used between grid services.
- ///
- public interface IInterGridInventoryServices
- {
- ///
- /// Create a new inventory for the given user.
- ///
- ///
- /// true if the inventory was successfully created, false otherwise
- bool CreateNewUserInventory(LLUUID user);
-
- ///
- /// Returns a list of all the folders in a given user's inventory.
- ///
- ///
- /// A flat list of the user's inventory folder tree,
- /// null if there is no inventory for this user
- List GetInventorySkeleton(LLUUID userId);
- }
-}
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
new file mode 100644
index 0000000..24213f2
--- /dev/null
+++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
@@ -0,0 +1,53 @@
+/*
+ * 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.Collections.Generic;
+using libsecondlife;
+
+namespace OpenSim.Framework.Communications
+{
+ ///
+ /// Inventory operations used between grid services.
+ ///
+ public interface IInterServiceInventoryServices
+ {
+ ///
+ /// Create a new inventory for the given user.
+ ///
+ ///
+ /// true if the inventory was successfully created, false otherwise
+ bool CreateNewUserInventory(LLUUID user);
+
+ ///
+ /// Returns a list of all the folders in a given user's inventory.
+ ///
+ ///
+ /// A flat list of the user's inventory folder tree,
+ /// null if there is no inventory for this user
+ List GetInventorySkeleton(LLUUID userId);
+ }
+}
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index bb16a49..08a2c5f 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications
///
/// Defines all the operations one can perform on a user's inventory.
///
- public interface IInventoryServices : IInterGridInventoryServices
+ public interface IInventoryServices
{
string Host
{
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index fd2e6b1..06b707b 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications
///
/// Abstract base class used by local and grid implementations of an inventory service.
///
- public abstract class InventoryServiceBase : IInventoryServices, IInterGridInventoryServices
+ public abstract class InventoryServiceBase : IInventoryServices, IInterServiceInventoryServices
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 30a41f4..4b4292d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Grid.UserServer
public UserManager m_userManager;
public UserLoginService m_loginService;
public MessageServersConnector m_messagesService;
- protected IInventoryServices m_inventoryService;
+ protected IInterServiceInventoryServices m_interServiceInventoryService;
private LLUUID m_lastCreatedUser = LLUUID.Random();
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer
m_loginService = new UserLoginService(
m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
- m_inventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl);
+ m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl);
m_messagesService = new MessageServersConnector();
@@ -196,7 +196,7 @@ namespace OpenSim.Grid.UserServer
try
{
- if (!m_inventoryService.CreateNewUserInventory(userID))
+ if (!m_interServiceInventoryService.CreateNewUserInventory(userID))
{
throw new Exception(
String.Format(
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 3bc3f9a..6793889 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Local
{
AddInventoryService(inventoryService);
m_defaultInventoryHost = inventoryService.Host;
- m_interGridInventoryService = inventoryService;
+ m_interServiceInventoryService = inventoryService;
m_userService = userService;
m_avatarService = (IAvatarService)userService;
m_gridService = gridService;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 98672c2..bdd32ea 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
profile = m_userManager.GetUserProfile(firstname, lastname);
if (profile != null)
{
- m_Parent.InterGridInventoryService.CreateNewUserInventory(profile.ID);
+ m_Parent.InterServiceInventoryService.CreateNewUserInventory(profile.ID);
}
return profile;
@@ -260,13 +260,13 @@ namespace OpenSim.Region.Communications.Local
// See LoginService
protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
{
- List folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
+ List folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
// If we have user auth but no inventory folders for some reason, create a new set of folders.
if (null == folders || 0 == folders.Count)
{
- m_Parent.InterGridInventoryService.CreateNewUserInventory(userID);
- folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
+ m_Parent.InterServiceInventoryService.CreateNewUserInventory(userID);
+ folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
}
LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 76791f1..2ee7981 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
// private readonly NetworkServersInfo m_serversInfo;
private readonly uint m_defaultHomeX;
private readonly uint m_defaultHomeY;
- private IInterGridInventoryServices m_interGridInventoryService;
+ private IInterServiceInventoryServices m_interServiceInventoryService;
///
///
@@ -48,14 +48,14 @@ namespace OpenSim.Region.Communications.Local
///
/// Can be null if stats collection is not required.
public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
- IInterGridInventoryServices interGridInventoryService)
+ IInterServiceInventoryServices interServiceInventoryService)
{
// m_serversInfo = serversInfo;
m_defaultHomeX = defaultHomeLocX;
m_defaultHomeY = defaultHomeLocY;
- m_interGridInventoryService = interGridInventoryService;
+ m_interServiceInventoryService = interServiceInventoryService;
}
public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local
}
else
{
- m_interGridInventoryService.CreateNewUserInventory(profile.ID);
+ m_interServiceInventoryService.CreateNewUserInventory(profile.ID);
}
return profile;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b86d9ea..80c286e 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, IInterGridInventoryServices
+ public class OGS1InventoryService : IInventoryServices, IInterServiceInventoryServices
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
index fbfc680..bb94c20 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
namespace OpenSim.Region.Communications.OGS1
{
- public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices
+ public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
--
cgit v1.1