Finished off adding the new management API to gridserver

Updated VersionInfo.cs finally
Updated prebuild and rebuilt nant build files
Completed Management agent basics

2 files changed, 12 insertions, 0 deletions

diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 1a2a0fb..5d51edf 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -35,6 +35,7 @@ using System.Net;
 using System.Threading;

 using System.Reflection;

 using libsecondlife;

+using OpenGrid.Framework.Manager;

 using OpenSim.Framework;

 using OpenSim.Framework.Sims;

 using OpenSim.Framework.Console;

@@ -91,6 +92,15 @@ namespace OpenGridServices.GridServer
 

         }

 

+        public void managercallback(string cmd) {

+           switch(cmd) {

+                case "shutdown":

+                        RunCmd("shutdown",new string[0]);

+                break;

+           }

+        }

+

+

         public void Startup()

         {

             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration");

@@ -105,6 +115,7 @@ namespace OpenGridServices.GridServer
 

             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");

             BaseHttpServer httpServer = new BaseHttpServer(8001);

+            GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer,"gridserver",Cfg.SimSendKey,Cfg.SimRecvKey,managercallback);

 

             httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);

 

diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 774dab5..84e0a98 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -27,6 +27,7 @@
                 <include name="../bin/OpenSim.Framework.Console.dll" />
                 <include name="../bin/OpenSim.Servers.dll" />
                 <include name="../bin/OpenGrid.Framework.Data.dll" />
+                <include name="../bin/OpenGrid.Framework.Manager.dll" />
                 <include name="../bin/libsecondlife.dll" />
                 <include name="../bin/Db4objects.Db4o.dll" />
                 <include name="../bin/XMLRPC.dll" />