Deleted IGridServer interface (and classes implementing that).

9 files changed, 20 insertions, 381 deletions

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index ae394c4..70b14c2 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -66,16 +66,16 @@ namespace OpenSim.GridInterfaces.Local
             this._assetRequests = new BlockingQueue<ARequest>();

             yapfile = System.IO.File.Exists("assets.yap");

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Asset Server class created");

+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Local Asset Server class created");

             try

             {

                 db = Db4oFactory.OpenFile("assets.yap");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Db4 Asset database  creation");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Db4 Asset database  creation");

             }

             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());

             }

             if (!yapfile)

@@ -295,4 +295,18 @@ namespace OpenSim.GridInterfaces.Local
             //info.loaded=true;

         }

     }

+        public class AssetUUIDQuery : Predicate

+        {

+            private LLUUID _findID;

+

+            public AssetUUIDQuery(LLUUID find)

+            {

+                _findID = find;

+            }

+            public bool Match(AssetStorage asset)

+            {

+                return (asset.UUID == _findID);

+            }

+        }

+    

 }

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
deleted file mode 100644
index 01003fb..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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;

-using System.Collections.Generic;

-using System.Threading;

-using System.IO;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Console;

-using libsecondlife;

-using Db4objects.Db4o;

-using Db4objects.Db4o.Query;

-using System.Collections;

-

-namespace OpenSim.GridInterfaces.Local

-{

-        /// <summary>

-        /// 

-        /// </summary>

-        /// 

-        public class LocalGridPlugin : IGridPlugin

-        {

-                public LocalGridPlugin()

-                {

-                        

-                }

-                

-                public IGridServer GetGridServer()

-                {

-                        return(new LocalGridServer());

-                }

-        }

-        

-        public class LocalGridServer : LocalGridBase

-        {

-                public List<Login> Sessions = new List<Login>();  

-                

-                public LocalGridServer()

-                {

-                        Sessions = new List<Login>();

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Grid Server class created");

-                }

-                

-                public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)

-                {

-                        return true;

-                }

-

-        public override string GetName()

-        {

-            return "Local";

-        }

-

-                public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)

-                {

-                        //we are running local

-                        AuthenticateResponse user = new AuthenticateResponse();

-                        

-                        lock(this.Sessions)

-                        {

-                                

-                                for(int i = 0; i < Sessions.Count; i++)

-                                {

-                                        if((Sessions[i].Agent == agentID) && (Sessions[i].Session == sessionID))

-                                        {

-                                                user.Authorised = true;

-                                                user.LoginInfo = Sessions[i];

-                                        }

-                                }

-                        }

-                        return(user);

-                }

-                

-                public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)

-                {

-                        return(true);

-                }

-                

-                public override UUIDBlock RequestUUIDBlock()

-                {

-                        UUIDBlock uuidBlock = new UUIDBlock();

-                        return(uuidBlock);

-                }

-

-        public override NeighbourInfo[] RequestNeighbours()

-                {

-                        return null;

-                }

-

-        public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)

-                {

-                        

-                }

-

-        public override IList RequestMapBlocks(int minX, int minY, int maxX, int maxY)

-        {

-            return new ArrayList();

-        }

-

-                

-                public override void Close()

-                {

-                        

-                }

-

-                /// <summary>

-                /// used by the local login server to inform us of new sessions

-                /// </summary>

-                /// <param name="session"></param>

-                public override void AddNewSession(Login session)

-                {

-                        lock(this.Sessions)

-                        {

-                                this.Sessions.Add(session);

-                        }

-                }

-        }

-

-        public class AssetUUIDQuery : Predicate

-        {

-                private LLUUID _findID;

-                

-                public AssetUUIDQuery(LLUUID find)

-                {

-                        _findID = find;

-                }

-                public bool Match(AssetStorage asset)

-                {

-                        return (asset.UUID == _findID);

-                }

-        }

-                

-}

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index 1acd1b5..77c76e3 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
@@ -96,9 +96,6 @@
     <Compile Include="LocalAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalGridServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index c3c4ae4..1a72d0a 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -13,7 +13,6 @@
             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

                 <include name="LocalAssetServer.cs" />

-                <include name="LocalGridServer.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index 11aacac..0a918bd 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
@@ -98,9 +98,6 @@
     <Compile Include="RemoteAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RemoteGridServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index 860251f..7c3eb68 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -13,7 +13,6 @@
             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

                 <include name="RemoteAssetServer.cs" />

-                <include name="RemoteGridServer.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
deleted file mode 100644
index 19f8f7d..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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;

-using System.Collections;

-using System.Collections.Generic;

-using System.Threading;

-using System.Net;

-using System.Net.Sockets;

-using System.IO;

-using libsecondlife;

-using Nwc.XmlRpc;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.GridInterfaces.Remote

-{

-    public class RemoteGridServer : RemoteGridBase

-    {

-        private string GridServerUrl;

-        private string GridSendKey;

-        private string GridRecvKey;

-        private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();

-        private ArrayList simneighbours = new ArrayList();

-        private Hashtable griddatahash;

-

-        public override Dictionary<uint, AgentCircuitData> agentcircuits

-        {

-            get { return AgentCircuits; }

-            set { AgentCircuits = value; }

-        }

-

-        public override ArrayList neighbours

-        {

-            get { return simneighbours; }

-            set { simneighbours = value; }

-        }

-

-        public override Hashtable GridData

-        {

-            get { return griddatahash; }

-            set { griddatahash = value; }

-        }

-

-

-        public RemoteGridServer()

-        {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Remote Grid Server class created");

-        }

-

-        public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)

-        {

-            Hashtable GridParams = new Hashtable();

-            GridParams["authkey"] = GridSendKey;

-            GridParams["UUID"] = SimUUID.ToString();

-            GridParams["sim_ip"] = sim_ip;

-            GridParams["sim_port"] = sim_port.ToString();

-            ArrayList SendParams = new ArrayList();

-            SendParams.Add(GridParams);

-

-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);

-            XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);

-            Hashtable GridRespData = (Hashtable)GridResp.Value;

-            this.griddatahash = GridRespData;

-

-            if (GridRespData.ContainsKey("error"))

-            {

-                string errorstring = (string)GridRespData["error"];

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Error connecting to grid:");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, errorstring);

-                return false;

-            }

-            this.neighbours = (ArrayList)GridRespData["neighbours"];

-            Console.WriteLine(simneighbours.Count);

-            return true;

-        }

-

-        public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)

-        {

-            AgentCircuitData validcircuit = null;

-            if (this.AgentCircuits.ContainsKey(circuitcode))

-            {

-                validcircuit = this.AgentCircuits[circuitcode];

-            }

-            AuthenticateResponse user = new AuthenticateResponse();

-            if (validcircuit == null)

-            {

-                //don't have this circuit code in our list

-                user.Authorised = false;

-                return (user);

-            }

-

-            if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))

-            {

-                // YAY! Valid login

-                user.Authorised = true;

-                user.LoginInfo = new Login();

-                user.LoginInfo.Agent = agentID;

-                user.LoginInfo.Session = sessionID;

-                user.LoginInfo.SecureSession = validcircuit.SecureSessionID;

-                user.LoginInfo.First = validcircuit.firstname;

-                user.LoginInfo.Last = validcircuit.lastname;

-            }

-            else

-            {

-                // Invalid

-                user.Authorised = false;

-            }

-

-            return (user);

-        }

-

-        public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)

-        {

-            WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + sessionID.ToString());

-            DeleteSession.Method = "DELETE";

-            DeleteSession.ContentType = "text/plaintext";

-            DeleteSession.ContentLength = 0;

-

-            StreamWriter stOut = new StreamWriter(DeleteSession.GetRequestStream(), System.Text.Encoding.ASCII);

-            stOut.Write("");

-            stOut.Close();

-

-            StreamReader stIn = new StreamReader(DeleteSession.GetResponse().GetResponseStream());

-            string GridResponse = stIn.ReadToEnd();

-            stIn.Close();

-            return (true);

-        }

-

-        public override UUIDBlock RequestUUIDBlock()

-        {

-            UUIDBlock uuidBlock = new UUIDBlock();

-            return (uuidBlock);

-        }

-

-        public override NeighbourInfo[] RequestNeighbours()

-        {

-            return null;

-        }

-

-        public override IList RequestMapBlocks(int minX, int minY, int maxX, int maxY)

-        {

-            Hashtable param = new Hashtable();

-            param["xmin"] = minX;

-            param["ymin"] = minY;

-            param["xmax"] = maxX;

-            param["ymax"] = maxY;

-            IList parameters = new ArrayList();

-            parameters.Add(param);

-            XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);

-            XmlRpcResponse resp = req.Send(GridServerUrl, 3000);

-            Hashtable respData = (Hashtable)resp.Value;

-            return (IList)respData["sim-profiles"];

-        }

-

-        public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)

-        {

-            this.GridServerUrl = ServerUrl;

-            this.GridSendKey = SendKey;

-            this.GridRecvKey = RecvKey;

-        }

-

-        public override string GetName()

-        {

-            return "Remote";

-        }

-

-        public override void Close()

-        {

-

-        }

-    }

-

-    public class RemoteGridPlugin : IGridPlugin

-    {

-        public RemoteGridPlugin()

-        {

-

-        }

-

-        public IGridServer GetGridServer()

-        {

-            return (new RemoteGridServer());

-        }

-    }

-

-}

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index c8961b6..aaac4d0 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -164,6 +164,7 @@ namespace OpenSim
 

         public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)

         {

+            /*

             IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);

             MapBlockReplyPacket mbReply = new MapBlockReplyPacket();

             mbReply.AgentData.AgentID = this.AgentID;

@@ -189,6 +190,7 @@ namespace OpenSim
                 mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);

             }

             this.OutPacket(mbReply);

+             * */

         }

 

        

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index e9c1f2d..0943c0d 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -75,7 +75,7 @@ namespace OpenSim
         protected IWorld m_world;

         private Dictionary<uint, ClientView> m_clientThreads;

         private AssetCache m_assetCache;

-        private IGridServer m_gridServer;

+        //private IGridServer m_gridServer;

         private InventoryCache m_inventoryCache;

         private int cachedtextureserial = 0;

         private RegionInfo m_regionData;