*Reorganized RegionServerCommsManager for OGS and local support

12 files changed, 215 insertions, 90 deletions

diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
new file mode 100644
index 0000000..11b5ea7
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
@@ -0,0 +1,50 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Types;

+using OpenSim.Framework;

+

+namespace OpenGrid.Framework.Communications.GridServer

+{

+    public class GridCommsManagerBase

+    {

+        public GridCommsManagerBase()

+        {

+        }

+         /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionInfo"></param>

+        /// <returns></returns>

+        public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

+        {

+            return null;

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionInfo"></param>

+        /// <returns></returns>

+        public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

+        {

+            return null;

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <returns></returns>

+        public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

+        {

+           return false;

+        }

+

+        public virtual bool AddNewSession(ulong regionHandle, Login loginData)

+        {

+            return false;

+        }

+

+       

+    }

+}

diff --git a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
index fad2001..774585a 100644
--- a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
@@ -1,29 +1,24 @@
 using System;

-using System.Collections;

 using System.Collections.Generic;

 using System.Text;

-using libsecondlife;

+

 using OpenSim.Framework;

-using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

-namespace OpenGrid.Framework.Communications

+using libsecondlife;

+

+namespace OpenGrid.Framework.Communications.GridServer

 {

-    public class TestLocalCommsManager : RegionServerCommsManager

+    public class GridCommsManagerLocal : GridCommsManagerBase

     {

-        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong,RegionInfo>();

+        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();

         protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();

 

-        public TestLocalCommsManager()

+        public GridCommsManagerLocal()

         {

 

         }

 

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

         public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

         {

             //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");

@@ -32,27 +27,23 @@ namespace OpenGrid.Framework.Communications
                 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );

                 this.regions.Add(regionInfo.RegionHandle, regionInfo);

                 RegionCommsHostBase regionHost = new RegionCommsHostBase();

-                this.regionHosts.Add(regionInfo.RegionHandle, regionHost); 

+                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);

                 return regionHost;

             }

-      

+

             //already in our list of regions so for now lets return null

             return null;

         }

 

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

+

         public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

         {

-           // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);

+            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);

             List<RegionInfo> neighbours = new List<RegionInfo>();

 

             foreach (RegionInfo reg in this.regions.Values)

             {

-               // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);

+                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);

                 if (reg.RegionHandle != regionInfo.RegionHandle)

                 {

                     //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");

@@ -68,16 +59,12 @@ namespace OpenGrid.Framework.Communications
             return neighbours;

         }

 

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

         public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

         {

             //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");

             if (this.regionHosts.ContainsKey(regionHandle))

             {

-               // Console.WriteLine("CommsManager- Informing a region to expect child agent");

+                // Console.WriteLine("CommsManager- Informing a region to expect child agent");

                 this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);

                 return true;

             }

@@ -90,7 +77,7 @@ namespace OpenGrid.Framework.Communications
         /// <param name="regionHandle"></param>

         /// <param name="loginData"></param>

         /// <returns></returns>

-        public bool AddNewSession(ulong regionHandle, Login loginData)

+        public override bool AddNewSession(ulong regionHandle, Login loginData)

         {

             //Console.WriteLine(" comms manager been told to expect new user");

             AgentCircuitData agent = new AgentCircuitData();

diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
new file mode 100644
index 0000000..415c1d8
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
@@ -0,0 +1,36 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+using OpenSim.Framework;

+using OpenSim.Framework.Types;

+

+namespace OpenGrid.Framework.Communications.GridServer

+{

+    public class GridCommsManagerOGS : GridCommsManagerBase

+    {

+        public GridCommsManagerOGS()

+        {

+        }

+

+        public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

+        {

+            return null;

+        }

+

+        public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

+        {

+            return null;

+        }

+

+        public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

+        {

+            return false;

+        }

+

+        public override bool AddNewSession(ulong regionHandle, Login loginData)

+        {

+            return false;

+        }

+    }

+}

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 00b1548..689210b 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -80,15 +80,36 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="RegionServerCommsManager.cs">

+    <Compile Include="RegionServerCommsLocal.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="RegionServerCommsOGS.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="TestLocalCommsManager.cs">

+    <Compile Include="RegionServerCommsManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="UserServer\UserCommsManagerOGS.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="UserServer\UserCommsManagerLocal.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="UserServer\UserCommsManagerBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="GridServer\GridCommsManagerLocal.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="GridServer\GridCommsManagerOGS.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="GridServer\GridCommsManagerBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

   </ItemGroup>

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

   <PropertyGroup>

diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
new file mode 100644
index 0000000..0743cbf
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
@@ -0,0 +1,20 @@
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+using OpenSim.Framework;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Types;

+

+namespace OpenGrid.Framework.Communications

+{

+    public class RegionServerCommsLocal : RegionServerCommsManager

+    {

+        public RegionServerCommsLocal()

+        {

+            userServer = new UserServer.UserCommsManagerLocal(); //Local User Server

+            gridServer = new GridServer.GridCommsManagerLocal(); //Locl Grid Server

+        }

+    }

+}

diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index fa786d3..38bce42 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -12,66 +12,12 @@ namespace OpenGrid.Framework.Communications
  

     public class RegionServerCommsManager

     {

+        public UserServer.UserCommsManagerBase userServer;

+        public GridServer.GridCommsManagerBase gridServer;

 

         public RegionServerCommsManager()

         {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public virtual RegionInfo LoadRegionConfigFromGridServer(LLUUID regionID)

-        {

-            return null;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)

-        {

-            return null;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        /// <returns></returns>

-        public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

-        {

-            return null;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public virtual bool InformNeighbourOfChildAgent( ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

-        {

-            return false;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public virtual bool AvatarCrossingToRegion()

-        {

-            return false;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public virtual IList RequestMapBlocks()

-        {

-            return null;

+            

         }

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
new file mode 100644
index 0000000..b0db473
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
@@ -0,0 +1,15 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenGrid.Framework.Communications

+{

+    public class RegionServerCommsOGS : RegionServerCommsManager

+    {

+        public RegionServerCommsOGS()

+        {

+            userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server

+            gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server

+        }

+    }

+}

diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
new file mode 100644
index 0000000..9ea4ae8
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
@@ -0,0 +1,30 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+using libsecondlife;

+namespace OpenGrid.Framework.Communications.UserServer

+{

+    public class UserCommsManagerBase

+    {

+        public UserCommsManagerBase()

+        {

+        }

+

+        public virtual UserProfileData GetUserProfile(string name)

+        {

+            return null;

+        }

+        public virtual UserProfileData GetUserProfile(LLUUID avatar_id)

+        {

+            return null;

+        }

+    }

+

+    public class UserProfileData

+    {

+        public UserProfileData()

+        {

+        }

+    }

+}

diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
new file mode 100644
index 0000000..eb0881a
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
@@ -0,0 +1,10 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenGrid.Framework.Communications.UserServer

+{

+    public class UserCommsManagerLocal : UserCommsManagerBase

+    {

+    }

+}

diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
new file mode 100644
index 0000000..0921535
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
@@ -0,0 +1,10 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenGrid.Framework.Communications.UserServer

+{

+    public class UserCommsManagerOGS : UserCommsManagerBase

+    {

+    }

+}

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index ab29d04..7e14e6a 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -195,6 +195,9 @@
     <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Types\RegionInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Types\ParcelData.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -225,9 +228,6 @@
     <Compile Include="Types\AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

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

   <PropertyGroup>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index a45a121..2678e54 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -46,6 +46,7 @@
                 <include name="Properties/AssemblyInfo.cs" />

                 <include name="Types/NeighbourInfo.cs" />

                 <include name="Types/NetworkServersInfo.cs" />

+                <include name="Types/RegionInfo.cs" />

                 <include name="Types/ParcelData.cs" />

                 <include name="Types/AgentWearable.cs" />

                 <include name="Types/PrimData.cs" />

@@ -56,7 +57,6 @@
                 <include name="Types/Login.cs" />

                 <include name="Types/AssetLandmark.cs" />

                 <include name="Types/AssetBase.cs" />

-                <include name="Types/RegionInfo.cs" />

             </sources>

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

                 <lib>