aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-24 15:56:50 +0000
committerJustin Clarke Casey2008-07-24 15:56:50 +0000
commit77297ed6cce787c662d67880e15ecaff5f1b4ca1 (patch)
tree0114f0c5375d48c0413ef73761613b5d9e84e865
parentThank you, Neopallium, for a patch that addresses ack issues in the (diff)
downloadopensim-SC_OLD-77297ed6cce787c662d67880e15ecaff5f1b4ca1.zip
opensim-SC_OLD-77297ed6cce787c662d67880e15ecaff5f1b4ca1.tar.gz
opensim-SC_OLD-77297ed6cce787c662d67880e15ecaff5f1b4ca1.tar.bz2
opensim-SC_OLD-77297ed6cce787c662d67880e15ecaff5f1b4ca1.tar.xz
* Separate out OGS1 calls used between services (rather than from region to services) into a separate assembly to parallel OpenSim.Region.Communications.OGS1
-rw-r--r--OpenSim/Framework/Communications/ISecureInventoryService.cs14
-rwxr-xr-xOpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs67
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs16
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs15
-rw-r--r--prebuild.xml28
6 files changed, 105 insertions, 39 deletions
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
99 bool DeleteItem(InventoryItemBase item, LLUUID session_id); 99 bool DeleteItem(InventoryItemBase item, LLUUID session_id);
100 100
101 /// <summary> 101 /// <summary>
102 /// Create a new inventory for the given user.
103 /// </summary>
104 /// <param name="user"></param>
105 /// <returns>true if the inventory was successfully created, false otherwise</returns>
106 bool CreateNewUserInventory(LLUUID user);
107
108 /// <summary>
109 /// Does the given user have an inventory structure? 102 /// Does the given user have an inventory structure?
110 /// </summary> 103 /// </summary>
111 /// <param name="userID"></param> 104 /// <param name="userID"></param>
112 /// <returns></returns> 105 /// <returns></returns>
113 bool HasInventoryForUser(LLUUID userID); 106 bool HasInventoryForUser(LLUUID userID);
107
108 /// <summary>
109 /// Retrieve the root inventory folder for the given user.
110 /// </summary>
111 /// <param name="userID"></param>
112 /// <returns>null if no root folder was found</returns>
113 InventoryFolderBase RequestRootFolder(LLUUID userID);
114 } 114 }
115} 115}
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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using libsecondlife;
31using OpenSim.Framework;
32using OpenSim.Framework.Communications;
33using OpenSim.Framework.Servers;
34
35namespace OpenSim.Grid.Communications.OGS1
36{
37 /// <summary>
38 /// OGS1 implementation of the inter-service inventory service
39 /// </summary>
40 public class OGS1InterServiceInventoryService : IInterServiceInventoryServices
41 {
42 protected string m_inventoryServerUrl;
43
44 public OGS1InterServiceInventoryService(string inventoryServerUrl)
45 {
46 m_inventoryServerUrl = inventoryServerUrl;
47 }
48
49 public bool CreateNewUserInventory(LLUUID userId)
50 {
51 return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
52 "POST", m_inventoryServerUrl + "CreateInventory/", userId.UUID);
53 }
54
55 /// <summary>
56 /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
57 /// </summary>
58 /// <param name="userId"></param>
59 /// <returns></returns>
60 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
61 {
62 //m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
63
64 return new List<InventoryFolderBase>();
65 }
66 }
67}
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;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42using OpenSim.Region.Communications.OGS1; 42using OpenSim.Grid.Communications.OGS1;
43 43
44namespace OpenSim.Grid.UserServer 44namespace OpenSim.Grid.UserServer
45{ 45{
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer
103 m_loginService = new UserLoginService( 103 m_loginService = new UserLoginService(
104 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); 104 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
105 105
106 m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl); 106 m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl);
107 107
108 m_messagesService = new MessageServersConnector(); 108 m_messagesService = new MessageServersConnector();
109 109
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;
39 39
40namespace OpenSim.Region.Communications.OGS1 40namespace OpenSim.Region.Communications.OGS1
41{ 41{
42 public class OGS1InventoryService : IInventoryServices, IInterServiceInventoryServices 42 public class OGS1InventoryService : IInventoryServices
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -306,20 +306,6 @@ namespace OpenSim.Region.Communications.OGS1
306 return null; 306 return null;
307 } 307 }
308 308
309 public bool CreateNewUserInventory(LLUUID userId)
310 {
311 return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
312 "POST", _inventoryServerUrl + "CreateInventory/", userId.UUID);
313 }
314
315 // See IInventoryServices
316 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
317 {
318 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
319
320 return new List<InventoryFolderBase>();
321 }
322
323 #endregion 309 #endregion
324 } 310 }
325} 311}
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;
39 39
40namespace OpenSim.Region.Communications.OGS1 40namespace OpenSim.Region.Communications.OGS1
41{ 41{
42 public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices 42 public class OGS1SecureInventoryService : ISecureInventoryService
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -306,19 +306,6 @@ namespace OpenSim.Region.Communications.OGS1
306 return null; 306 return null;
307 } 307 }
308 308
309 public bool CreateNewUserInventory(LLUUID user)
310 {
311 return false;
312 }
313
314 // See IInventoryServices
315 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
316 {
317 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
318
319 return new List<InventoryFolderBase>();
320 }
321
322 #endregion 309 #endregion
323 } 310 }
324} 311}
diff --git a/prebuild.xml b/prebuild.xml
index 044aa99..ec0b71f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1654,6 +1654,32 @@
1654 1654
1655 <!-- OGS projects --> 1655 <!-- OGS projects -->
1656 1656
1657 <Project name="OpenSim.Grid.Communications.OGS1" path="OpenSim/Grid/Communications/OGS1" type="Library">
1658 <Configuration name="Debug">
1659 <Options>
1660 <OutputPath>../../../../bin/</OutputPath>
1661 </Options>
1662 </Configuration>
1663 <Configuration name="Release">
1664 <Options>
1665 <OutputPath>../../../../bin/</OutputPath>
1666 </Options>
1667 </Configuration>
1668
1669 <ReferencePath>../../../../bin/</ReferencePath>
1670 <Reference name="System"/>
1671 <Reference name="OpenSim.Framework"/>
1672 <Reference name="OpenSim.Framework.Communications" />
1673 <Reference name="OpenSim.Framework.Servers"/>
1674 <Reference name="libsecondlife.dll"/>
1675 <Reference name="XMLRPC.dll"/>
1676 <Reference name="log4net.dll"/>
1677
1678 <Files>
1679 <Match pattern="*.cs" recurse="true"/>
1680 </Files>
1681 </Project>
1682
1657 <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe"> 1683 <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
1658 <Configuration name="Debug"> 1684 <Configuration name="Debug">
1659 <Options> 1685 <Options>
@@ -1739,7 +1765,7 @@
1739 <Reference name="OpenSim.Data"/> 1765 <Reference name="OpenSim.Data"/>
1740 <Reference name="OpenSim.Framework.Servers"/> 1766 <Reference name="OpenSim.Framework.Servers"/>
1741 <Reference name="OpenSim.Framework.Statistics"/> 1767 <Reference name="OpenSim.Framework.Statistics"/>
1742 <Reference name="OpenSim.Region.Communications.OGS1"/> 1768 <Reference name="OpenSim.Grid.Communications.OGS1"/>
1743 <Reference name="libsecondlife.dll"/> 1769 <Reference name="libsecondlife.dll"/>
1744 <Reference name="XMLRPC.dll"/> 1770 <Reference name="XMLRPC.dll"/>
1745 <Reference name="log4net.dll"/> 1771 <Reference name="log4net.dll"/>