Moving these nice HG connectors to their homes.

4 files changed, 423 insertions, 425 deletions

diff --git a/OpenSim/Services/AssetService/HGAssetService.cs b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
index b3e3f17..31e0aa9 100644
--- a/OpenSim/Services/AssetService/HGAssetService.cs
+++ b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
@@ -1,179 +1,178 @@
-/*
- * 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 OpenSimulator 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 log4net;
-using Nini.Config;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Connectors;
-
-namespace OpenSim.Services.AssetService
-{
-    public class HGAssetService : IAssetService
-    {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>();
-
-        public HGAssetService(IConfigSource source)
-        {
-            IConfig moduleConfig = source.Configs["Modules"];
-            if (moduleConfig != null)
-            {
-                // string name = moduleConfig.GetString("AssetServices", "");
-
-                IConfig assetConfig = source.Configs["AssetService"];
-                if (assetConfig == null)
-                {
-                    m_log.Error("[HG ASSET SERVICE]: AssetService missing from OpanSim.ini");
-                    return;
-                }
-
-                m_log.Info("[HG ASSET SERVICE]: HG asset service enabled");
-            }
-        }
-
-        private bool StringToUrlAndAssetID(string id, out string url, out string assetID)
-        {
-            url = String.Empty;
-            assetID = String.Empty;
-
-            Uri assetUri;
-
-            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&
-                    assetUri.Scheme == Uri.UriSchemeHttp)
-            {
-                url = "http://" + assetUri.Authority;
-                assetID = assetUri.LocalPath.Trim(new char[] {'/'});
-                return true;
-            }
-
-            return false;
-        }
-
-        private IAssetService GetConnector(string url)
-        {
-            AssetServicesConnector connector = null;
-            lock (m_connectors)
-            {
-                if (m_connectors.ContainsKey(url))
-                {
-                    connector = m_connectors[url];
-                }
-                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);
-                    m_connectors.Add(url, connector);
-                }
-            }
-            return connector;
-        }
-
-        public AssetBase Get(string id)
-        {
-            string url = string.Empty;
-            string assetID = string.Empty;
-
-            if (StringToUrlAndAssetID(id, out url, out assetID))
-            {
-                IAssetService connector = GetConnector(url);
-                return connector.Get(assetID);
-            }
-
-            return null;
-        }
-
-        public AssetMetadata GetMetadata(string id)
-        {
-            string url = string.Empty;
-            string assetID = string.Empty;
-
-            if (StringToUrlAndAssetID(id, out url, out assetID))
-            {
-                IAssetService connector = GetConnector(url);
-                return connector.GetMetadata(assetID);
-            }
-
-            return null;
-        }
-
-        public byte[] GetData(string id)
-        {
-            return null;
-        }
-
-        public bool Get(string id, Object sender, AssetRetrieved handler)
-        {
-            string url = string.Empty;
-            string assetID = string.Empty;
-
-            if (StringToUrlAndAssetID(id, out url, out assetID))
-            {
-                IAssetService connector = GetConnector(url);
-                return connector.Get(assetID, sender, handler);
-            }
-
-            return false;
-        }
-
-        public string Store(AssetBase asset)
-        {
-            string url = string.Empty;
-            string assetID = string.Empty;
-
-            if (StringToUrlAndAssetID(asset.ID, out url, out assetID))
-            {
-                IAssetService connector = GetConnector(url);
-                // Restore the assetID to a simple UUID
-                asset.ID = assetID;
-                return connector.Store(asset);
-            }
-
-            return String.Empty;
-        }
-
-        public bool UpdateContent(string id, byte[] data)
-        {
-            return false;
-        }
-
-        public bool Delete(string id)
-        {
-            return false;
-        }
-    }
-}
+/*

+ * 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 OpenSimulator 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 log4net;

+using Nini.Config;

+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using OpenSim.Framework;

+using OpenSim.Services.Interfaces;

+

+namespace OpenSim.Services.Connectors

+{

+    public class HGAssetServiceConnector : IAssetService

+    {

+        private static readonly ILog m_log =

+                LogManager.GetLogger(

+                MethodBase.GetCurrentMethod().DeclaringType);

+

+        private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>();

+

+        public HGAssetServiceConnector(IConfigSource source)

+        {

+            IConfig moduleConfig = source.Configs["Modules"];

+            if (moduleConfig != null)

+            {

+                // string name = moduleConfig.GetString("AssetServices", "");

+

+                IConfig assetConfig = source.Configs["AssetService"];

+                if (assetConfig == null)

+                {

+                    m_log.Error("[HG ASSET SERVICE]: AssetService missing from OpenSim.ini");

+                    return;

+                }

+

+                m_log.Info("[HG ASSET SERVICE]: HG asset service enabled");

+            }

+        }

+

+        private bool StringToUrlAndAssetID(string id, out string url, out string assetID)

+        {

+            url = String.Empty;

+            assetID = String.Empty;

+

+            Uri assetUri;

+

+            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&

+                    assetUri.Scheme == Uri.UriSchemeHttp)

+            {

+                url = "http://" + assetUri.Authority;

+                assetID = assetUri.LocalPath.Trim(new char[] {'/'});

+                return true;

+            }

+

+            return false;

+        }

+

+        private IAssetService GetConnector(string url)

+        {

+            AssetServicesConnector connector = null;

+            lock (m_connectors)

+            {

+                if (m_connectors.ContainsKey(url))

+                {

+                    connector = m_connectors[url];

+                }

+                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);

+                    m_connectors.Add(url, connector);

+                }

+            }

+            return connector;

+        }

+

+        public AssetBase Get(string id)

+        {

+            string url = string.Empty;

+            string assetID = string.Empty;

+

+            if (StringToUrlAndAssetID(id, out url, out assetID))

+            {

+                IAssetService connector = GetConnector(url);

+                return connector.Get(assetID);

+            }

+

+            return null;

+        }

+

+        public AssetMetadata GetMetadata(string id)

+        {

+            string url = string.Empty;

+            string assetID = string.Empty;

+

+            if (StringToUrlAndAssetID(id, out url, out assetID))

+            {

+                IAssetService connector = GetConnector(url);

+                return connector.GetMetadata(assetID);

+            }

+

+            return null;

+        }

+

+        public byte[] GetData(string id)

+        {

+            return null;

+        }

+

+        public bool Get(string id, Object sender, AssetRetrieved handler)

+        {

+            string url = string.Empty;

+            string assetID = string.Empty;

+

+            if (StringToUrlAndAssetID(id, out url, out assetID))

+            {

+                IAssetService connector = GetConnector(url);

+                return connector.Get(assetID, sender, handler);

+            }

+

+            return false;

+        }

+

+        public string Store(AssetBase asset)

+        {

+            string url = string.Empty;

+            string assetID = string.Empty;

+

+            if (StringToUrlAndAssetID(asset.ID, out url, out assetID))

+            {

+                IAssetService connector = GetConnector(url);

+                // Restore the assetID to a simple UUID

+                asset.ID = assetID;

+                return connector.Store(asset);

+            }

+

+            return String.Empty;

+        }

+

+        public bool UpdateContent(string id, byte[] data)

+        {

+            return false;

+        }

+

+        public bool Delete(string id)

+        {

+            return false;

+        }

+    }

+}

diff --git a/OpenSim/Services/InventoryService/HGInventoryService.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 0db80d0..e943ae4 100644
--- a/OpenSim/Services/InventoryService/HGInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -1,242 +1,241 @@
-/*
- * 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 OpenSimulator 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 log4net;
-using Nini.Config;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Connectors;
-using OpenMetaverse;
-
-namespace OpenSim.Services.InventoryService
-{
-    public class HGInventoryService : ISessionAuthInventoryService
-    {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Dictionary<string, InventoryServicesConnector> m_connectors = new Dictionary<string, InventoryServicesConnector>();
-
-        public HGInventoryService(IConfigSource source)
-        {
-            IConfig moduleConfig = source.Configs["Modules"];
-            if (moduleConfig != null)
-            {
-
-                IConfig assetConfig = source.Configs["InventoryService"];
-                if (assetConfig == null)
-                {
-                    m_log.Error("[HG INVENTORY SERVICE]: InventoryService missing from OpenSim.ini");
-                    return;
-                }
-
-                m_log.Info("[HG INVENTORY SERVICE]: HG inventory service enabled");
-            }
-        }
-
-        private bool StringToUrlAndUserID(string id, out string url, out string userID)
-        {
-            url = String.Empty;
-            userID = String.Empty;
-
-            Uri assetUri;
-
-            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&
-                    assetUri.Scheme == Uri.UriSchemeHttp)
-            {
-                url = "http://" + assetUri.Authority;
-                userID = assetUri.LocalPath.Trim(new char[] { '/' });
-                return true;
-            }
-
-            return false;
-        }
-        private ISessionAuthInventoryService GetConnector(string url)
-        {
-            InventoryServicesConnector connector = null;
-            lock (m_connectors)
-            {
-                if (m_connectors.ContainsKey(url))
-                {
-                    connector = m_connectors[url];
-                }
-                else
-                {
-                    // We're instantiating this class explicitly, but this won't
-                    // work in general, because the remote grid may be running
-                    // an inventory 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 InventoryServicesConnector(url);
-                    m_connectors.Add(url, connector);
-                }
-            }
-            return connector;
-        }
-
-        public string Host
-        {
-            get { return string.Empty; }
-        }
-
-        public void GetUserInventory(string id, UUID sessionID, InventoryReceiptCallback callback)
-        {
-            m_log.Debug("[HGInventory]: GetUserInventory " + id);
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                connector.GetUserInventory(userID, sessionID, callback);
-            }
-
-        }
-
-        public bool AddFolder(string id, InventoryFolderBase folder, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.AddFolder(userID, folder, sessionID);
-            }
-            return false;
-        }
-
-        public bool UpdateFolder(string id, InventoryFolderBase folder, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.UpdateFolder(userID, folder, sessionID);
-            }
-            return false;
-        }
-
-        public bool MoveFolder(string id, InventoryFolderBase folder, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.MoveFolder(userID, folder, sessionID);
-            }
-            return false;
-        }
-
-        public bool PurgeFolder(string id, InventoryFolderBase folder, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.PurgeFolder(userID, folder, sessionID);
-            }
-            return false;
-        }
-
-        public bool AddItem(string id, InventoryItemBase item, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.AddItem(userID, item, sessionID);
-            }
-            return false;
-        }
-
-        public bool UpdateItem(string id, InventoryItemBase item, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.UpdateItem(userID, item, sessionID);
-            }
-            return false;
-        }
-
-        public bool DeleteItem(string id, InventoryItemBase item, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.UpdateItem(userID, item, sessionID);
-            }
-            return false;
-        }
-
-        public InventoryItemBase QueryItem(string id, InventoryItemBase item, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.QueryItem(userID, item, sessionID);
-            }
-            return null;
-        }
-
-        public InventoryFolderBase QueryFolder(string id, InventoryFolderBase folder, UUID sessionID)
-        {
-            string url = string.Empty;
-            string userID = string.Empty;
-
-            if (StringToUrlAndUserID(id, out url, out userID))
-            {
-                ISessionAuthInventoryService connector = GetConnector(url);
-                return connector.QueryFolder(userID, folder, sessionID);
-            }
-            return null;
-        }
-
-    }
-}
+/*

+ * 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 OpenSimulator 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 log4net;

+using Nini.Config;

+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using OpenSim.Framework;

+using OpenSim.Services.Interfaces;

+using OpenMetaverse;

+

+namespace OpenSim.Services.Connectors.Inventory

+{

+    public class HGInventoryServiceConnector : ISessionAuthInventoryService

+    {

+        private static readonly ILog m_log =

+                LogManager.GetLogger(

+                MethodBase.GetCurrentMethod().DeclaringType);

+

+        private Dictionary<string, InventoryServicesConnector> m_connectors = new Dictionary<string, InventoryServicesConnector>();

+

+        public HGInventoryServiceConnector(IConfigSource source)

+        {

+            IConfig moduleConfig = source.Configs["Modules"];

+            if (moduleConfig != null)

+            {

+

+                IConfig inventoryConfig = source.Configs["InventoryService"];

+                if (inventoryConfig == null)

+                {

+                    m_log.Error("[HG INVENTORY SERVICE]: InventoryService missing from OpenSim.ini");

+                    return;

+                }

+

+                m_log.Info("[HG INVENTORY SERVICE]: HG inventory service enabled");

+            }

+        }

+

+        private bool StringToUrlAndUserID(string id, out string url, out string userID)

+        {

+            url = String.Empty;

+            userID = String.Empty;

+

+            Uri assetUri;

+

+            if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&

+                    assetUri.Scheme == Uri.UriSchemeHttp)

+            {

+                url = "http://" + assetUri.Authority;

+                userID = assetUri.LocalPath.Trim(new char[] { '/' });

+                return true;

+            }

+

+            return false;

+        }

+        private ISessionAuthInventoryService GetConnector(string url)

+        {

+            InventoryServicesConnector connector = null;

+            lock (m_connectors)

+            {

+                if (m_connectors.ContainsKey(url))

+                {

+                    connector = m_connectors[url];

+                }

+                else

+                {

+                    // We're instantiating this class explicitly, but this won't

+                    // work in general, because the remote grid may be running

+                    // an inventory 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 InventoryServicesConnector(url);

+                    m_connectors.Add(url, connector);

+                }

+            }

+            return connector;

+        }

+

+        public string Host

+        {

+            get { return string.Empty; }

+        }

+

+        public void GetUserInventory(string id, UUID sessionID, InventoryReceiptCallback callback)

+        {

+            m_log.Debug("[HGInventory]: GetUserInventory " + id);

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                connector.GetUserInventory(userID, sessionID, callback);

+            }

+

+        }

+

+        public bool AddFolder(string id, InventoryFolderBase folder, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.AddFolder(userID, folder, sessionID);

+            }

+            return false;

+        }

+

+        public bool UpdateFolder(string id, InventoryFolderBase folder, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.UpdateFolder(userID, folder, sessionID);

+            }

+            return false;

+        }

+

+        public bool MoveFolder(string id, InventoryFolderBase folder, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.MoveFolder(userID, folder, sessionID);

+            }

+            return false;

+        }

+

+        public bool PurgeFolder(string id, InventoryFolderBase folder, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.PurgeFolder(userID, folder, sessionID);

+            }

+            return false;

+        }

+

+        public bool AddItem(string id, InventoryItemBase item, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.AddItem(userID, item, sessionID);

+            }

+            return false;

+        }

+

+        public bool UpdateItem(string id, InventoryItemBase item, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.UpdateItem(userID, item, sessionID);

+            }

+            return false;

+        }

+

+        public bool DeleteItem(string id, InventoryItemBase item, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.UpdateItem(userID, item, sessionID);

+            }

+            return false;

+        }

+

+        public InventoryItemBase QueryItem(string id, InventoryItemBase item, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.QueryItem(userID, item, sessionID);

+            }

+            return null;

+        }

+

+        public InventoryFolderBase QueryFolder(string id, InventoryFolderBase folder, UUID sessionID)

+        {

+            string url = string.Empty;

+            string userID = string.Empty;

+

+            if (StringToUrlAndUserID(id, out url, out userID))

+            {

+                ISessionAuthInventoryService connector = GetConnector(url);

+                return connector.QueryFolder(userID, folder, sessionID);

+            }

+            return null;

+        }

+

+    }

+}

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4818fc8..8b65ab8 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,8 +17,8 @@
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
-    HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a21251c..8607e00 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,7 +20,7 @@
 
     ; For HGAssetBroker
     LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
     ; For the InventoryServiceInConnector
@@ -28,4 +28,4 @@
 
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"