From 8cc3d60e59b631951618d6b89c8ba54a72061bc4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 8 Sep 2010 14:09:43 -0700
Subject: Added constructor that takes an URL to asset and inventory simian
 connectors.

---
 .../Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs    | 5 +++++
 .../Connectors/SimianGrid/SimianInventoryServiceConnector.cs         | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 8f601e8..30d3147 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -84,6 +84,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             CommonInit(source);
         }
 
+        public SimianAssetServiceConnector(string url)
+        {
+            m_serverUrl = url;
+        }
+
         public void Initialise(IConfigSource source)
         {
             IConfig moduleConfig = source.Configs["Modules"];
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 470eccd..3953369 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -91,6 +91,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             CommonInit(source);
         }
 
+        public SimianInventoryServiceConnector(string url)
+        {
+            m_serverUrl = url;
+        }
+
         public void Initialise(IConfigSource source)
         {
             IConfig moduleConfig = source.Configs["Modules"];
-- 
cgit v1.1


From ae6682036df0268b47a27756915c72367663efec Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 8 Sep 2010 14:13:01 -0700
Subject: Made the HG asset and inventory brokers use the Helo service in order
 to instantiate the right network connectors. Tested on Robust only.

---
 .../Connectors/Asset/HGAssetServiceConnector.cs    | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
index 34df54a..5c31639 100644
--- a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
@@ -32,6 +32,8 @@ using System.Collections.Generic;
 using System.Reflection;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors.Hypergrid;
+using OpenSim.Services.Connectors.SimianGrid;
 
 namespace OpenSim.Services.Connectors
 {
@@ -41,7 +43,7 @@ namespace OpenSim.Services.Connectors
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>();
+        private Dictionary<string, IAssetService> m_connectors = new Dictionary<string, IAssetService>();
 
         public HGAssetServiceConnector(IConfigSource source)
         {
@@ -81,7 +83,7 @@ namespace OpenSim.Services.Connectors
 
         private IAssetService GetConnector(string url)
         {
-            AssetServicesConnector connector = null;
+            IAssetService connector = null;
             lock (m_connectors)
             {
                 if (m_connectors.ContainsKey(url))
@@ -90,12 +92,17 @@ namespace OpenSim.Services.Connectors
                 }
                 else
                 {
-                    // We're instantiating this class explicitly, but this won't
-                    // work in general, because the remote grid may be running
-                    // an asset server that has a different protocol.
-                    // Eventually we will want a piece of protocol asking
-                    // the remote server about its kind. Definitely cool thing to do!
-                    connector = new AssetServicesConnector(url);
+                    // Still not as flexible as I would like this to be,
+                    // but good enough for now
+                    string connectorType = new HeloServicesConnector(url).Helo();
+                    m_log.DebugFormat("[HG ASSET SERVICE]: HELO returned {0}", connectorType);
+                    if (connectorType == "opensim-simian")
+                    {
+                        connector = new SimianAssetServiceConnector(url);
+                    }
+                    else
+                        connector = new AssetServicesConnector(url);
+
                     m_connectors.Add(url, connector);
                 }
             }
-- 
cgit v1.1