aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs19
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs7
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs17
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs23
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs1
-rw-r--r--OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs1
11 files changed, 31 insertions, 56 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 4683f53..66a8890 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -36,9 +36,6 @@ using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Communications.Osp; 36using OpenSim.Framework.Communications.Osp;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.HttpServer; 38using OpenSim.Framework.Servers.HttpServer;
39using OpenSim.Region.Communications.Hypergrid;
40using OpenSim.Region.Communications.Local;
41using OpenSim.Region.Communications.OGS1;
42 39
43namespace OpenSim.ApplicationPlugins.CreateCommsManager 40namespace OpenSim.ApplicationPlugins.CreateCommsManager
44{ 41{
@@ -155,18 +152,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
155 /// <param name="libraryRootFolder"></param> 152 /// <param name="libraryRootFolder"></param>
156 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) 153 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
157 { 154 {
158 m_commsManager
159 = new CommunicationsLocal(
160 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo,
161 libraryRootFolder);
162 155
163 CreateGridInfoService(); 156 CreateGridInfoService();
164 } 157 }
165 158
166 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) 159 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
167 { 160 {
168 m_commsManager
169 = new CommunicationsOGS1(m_openSim.NetServersInfo, libraryRootFolder);
170 161
171 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 162 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
172 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 163 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
@@ -176,20 +167,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
176 167
177 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) 168 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
178 { 169 {
179 m_commsManager 170
180 = new HGCommunicationsStandalone(
181 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer,
182 libraryRootFolder, false);
183
184 CreateGridInfoService(); 171 CreateGridInfoService();
185 } 172 }
186 173
187 protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) 174 protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder)
188 { 175 {
189 m_commsManager
190 = new HGCommunicationsGridMode(
191 m_openSim.NetServersInfo,
192 m_openSim.SceneManager, libraryRootFolder);
193 176
194 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 177 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
195 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 178 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index bc04009..7c4ae9a 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -44,12 +44,6 @@ namespace OpenSim.Framework.Communications
44 public class CommunicationsManager 44 public class CommunicationsManager
45 { 45 {
46 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47
48 public NetworkServersInfo NetworkServersInfo
49 {
50 get { return m_networkServersInfo; }
51 }
52 protected NetworkServersInfo m_networkServersInfo;
53 47
54 /// <summary> 48 /// <summary>
55 /// Constructor 49 /// Constructor
@@ -58,7 +52,6 @@ namespace OpenSim.Framework.Communications
58 public CommunicationsManager(NetworkServersInfo serversInfo, 52 public CommunicationsManager(NetworkServersInfo serversInfo,
59 LibraryRootFolder libraryRootFolder) 53 LibraryRootFolder libraryRootFolder)
60 { 54 {
61 m_networkServersInfo = serversInfo;
62 } 55 }
63 56
64 } 57 }
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
index 0f2ba32..f9bc935 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
@@ -119,14 +119,15 @@ namespace OpenSim.Region.CoreModules.InterGrid
119 119
120 Hashtable requestData = (Hashtable)req.Params[0]; 120 Hashtable requestData = (Hashtable)req.Params[0];
121 121
122 if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey)) 122 // REFACTORING PROBLEM. This authorization needs to be replaced with some other
123 { 123 //if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey))
124 responseData["accepted"] = false; 124 //{
125 responseData["success"] = false; 125 // responseData["accepted"] = false;
126 responseData["error"] = "Invalid Key"; 126 // responseData["success"] = false;
127 response.Value = responseData; 127 // responseData["error"] = "Invalid Key";
128 return response; 128 // response.Value = responseData;
129 } 129 // return response;
130 //}
130 131
131 string message = (string)requestData["message"]; 132 string message = (string)requestData["message"];
132 string user = (string)requestData["user"]; 133 string user = (string)requestData["user"];
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index cf7bcef..8cf4619 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -528,9 +528,9 @@ namespace OpenSim.Region.CoreModules.InterGrid
528 userProfile.PasswordHash = "$1$"; 528 userProfile.PasswordHash = "$1$";
529 userProfile.PasswordSalt = ""; 529 userProfile.PasswordSalt = "";
530 userProfile.SurName = agentData.lastname; 530 userProfile.SurName = agentData.lastname;
531 userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; 531 //userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL;
532 userProfile.UserFlags = 0; 532 userProfile.UserFlags = 0;
533 userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL; 533 //userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL;
534 userProfile.WantDoMask = 0; 534 userProfile.WantDoMask = 0;
535 userProfile.WebLoginKey = UUID.Random(); 535 userProfile.WebLoginKey = UUID.Random();
536 536
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index f3ccbda..782eddf 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -155,12 +155,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
155 155
156 ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); 156 ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
157 157
158 // Yikes!! Remove this as soon as user services get refactored
159 LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL;
160 LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL;
161 LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
162 HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);
163
164 } 158 }
165 159
166 public void RemoveRegion(Scene scene) 160 public void RemoveRegion(Scene scene)
@@ -760,7 +754,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
760 754
761 protected bool IsComingHome(ForeignUserProfileData userData) 755 protected bool IsComingHome(ForeignUserProfileData userData)
762 { 756 {
763 return (userData.UserServerURI == LocalUserServerURI); 757 return false;
758 // REFACTORING PROBLEM
759 //return (userData.UserServerURI == LocalUserServerURI);
764 } 760 }
765 761
766 // REFACTORING PROBLEM 762 // REFACTORING PROBLEM
@@ -787,13 +783,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
787 783
788 protected bool IsLocalUser(UserAccount account) 784 protected bool IsLocalUser(UserAccount account)
789 { 785 {
790 if (account != null && 786 return true;
791 account.ServiceURLs.ContainsKey("HomeURI") &&
792 account.ServiceURLs["HomeURI"] != null)
793 787
794 return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI); 788 // REFACTORING PROBLEM
789 //if (account != null &&
790 // account.ServiceURLs.ContainsKey("HomeURI") &&
791 // account.ServiceURLs["HomeURI"] != null)
795 792
796 return false; 793 // return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI);
794
795 //return false;
797 } 796 }
798 797
799 798
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 5ed2b7a..8fed4da 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -61,9 +61,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
61 { 61 {
62 get 62 get
63 { 63 {
64 if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "") 64 return string.Empty;
65 m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL; 65 // REFACTORING PROBLEM
66 return m_LocalGridInventoryURI; 66 //if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "")
67 // m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL;
68 //return m_LocalGridInventoryURI;
67 } 69 }
68 } 70 }
69 71
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 0ed00de..a58b4d0 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -33,7 +33,6 @@ using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Communications.Local;
37using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
38using OpenSim.Tests.Common; 37using OpenSim.Tests.Common;
39using OpenSim.Tests.Common.Mock; 38using OpenSim.Tests.Common.Mock;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 709cca2..14db741 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -33,7 +33,6 @@ using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Communications.Local;
37using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
38using OpenSim.Tests.Common; 37using OpenSim.Tests.Common;
39using OpenSim.Tests.Common.Mock; 38using OpenSim.Tests.Common.Mock;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index c8a10b5..68e6497 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1159,12 +1159,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1159 m_log.WarnFormat("[GROUPS]: Could not find a user profile for {0} / {1}", client.Name, client.AgentId); 1159 m_log.WarnFormat("[GROUPS]: Could not find a user profile for {0} / {1}", client.Name, client.AgentId);
1160 1160
1161 // Default to local user service and hope for the best? 1161 // Default to local user service and hope for the best?
1162 info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; 1162 // REFACTORING PROBLEM
1163 //info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL;
1163 1164
1164 } 1165 }
1165 else 1166 else
1166 { 1167 {
1167 string domain = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; 1168 string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL;
1168 if (account.ServiceURLs["HomeURI"] != null) 1169 if (account.ServiceURLs["HomeURI"] != null)
1169 domain = account.ServiceURLs["HomeURI"].ToString(); 1170 domain = account.ServiceURLs["HomeURI"].ToString();
1170 // They're a local user, use this: 1171 // They're a local user, use this:
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index d4cdcd6..8e193c1 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -30,7 +30,6 @@ using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
31using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
32using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Region.Communications.Local;
34using OpenSim.Data; 33using OpenSim.Data;
35 34
36namespace OpenSim.Tests.Common.Mock 35namespace OpenSim.Tests.Common.Mock
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index b54299b..24ad3eb 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -28,7 +28,6 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework.Communications; 29using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
31using OpenSim.Region.Communications.Local;
32 31
33namespace OpenSim.Tests.Common.Setup 32namespace OpenSim.Tests.Common.Setup
34{ 33{