Some very Preliminary work on .net remoting for interregion comms.

a few more classes for CAPS LLSD types.

1 files changed, 55 insertions, 55 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
index d665ab4..e276556 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
@@ -24,71 +24,71 @@
 * (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 Nwc.XmlRpc;
-using System.Threading;
-using libsecondlife;
-
-namespace OpenGrid.Framework.Manager {
-
+*/

+

+using System;

+using System.Collections;

+using System.Collections.Generic;

+using Nwc.XmlRpc;

+using System.Threading;

+using libsecondlife;

+

+namespace OpenGrid.Framework.Manager {

+

     /// <summary>

     /// A remote management system for the grid server

-    /// </summary>
-        public class GridServerManager 
-        {
+    /// </summary>

+        public class GridServerManager 

+        {

         /// <summary>

         /// Triggers events from the grid manager

-        /// </summary>
-                public static GridManagerCallback thecallback;
-
+        /// </summary>

+                public static GridManagerCallback thecallback;

+

         /// <summary>

         /// Security keys

-        /// </summary>
-                public static string sendkey;
-                public static string recvkey;
-
+        /// </summary>

+                public static string sendkey;

+                public static string recvkey;

+

         /// <summary>

         /// Disconnects the grid server and shuts it down

         /// </summary>

         /// <param name="request">XmlRpc Request</param>

-        /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
-                public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
-                {
-                        XmlRpcResponse response = new XmlRpcResponse();
-                        Hashtable requestData = (Hashtable)request.Params[0];
-                        Hashtable responseData = new Hashtable();
-         
-                        if(requestData.ContainsKey("session_id")) {
-                                if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
-                                        responseData["msg"]="Shutdown command accepted";
-                                        (new Thread(new ThreadStart(ShutdownServer))).Start();
-                                } else {
-                                        response.IsFault=true;
-                                        responseData["error"]="bad session ID";
-                                }
-                        } else {
-                                response.IsFault=true;
-                                responseData["error"]="no session ID";
-                        }
-
-                        response.Value = responseData;
-                        return response;
-                }
-
+        /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>

+                public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)

+                {

+                        XmlRpcResponse response = new XmlRpcResponse();

+                        Hashtable requestData = (Hashtable)request.Params[0];

+                        Hashtable responseData = new Hashtable();

+         

+                        if(requestData.ContainsKey("session_id")) {

+                                if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {

+                                        responseData["msg"]="Shutdown command accepted";

+                                        (new Thread(new ThreadStart(ShutdownServer))).Start();

+                                } else {

+                                        response.IsFault=true;

+                                        responseData["error"]="bad session ID";

+                                }

+                        } else {

+                                response.IsFault=true;

+                                responseData["error"]="no session ID";

+                        }

+

+                        response.Value = responseData;

+                        return response;

+                }

+

                 /// <summary>

         /// Shuts down the grid server

-                /// </summary>
-                public static void ShutdownServer()
-                {
+                /// </summary>

+                public static void ShutdownServer()

+                {

                         Console.WriteLine("Shutting down the grid server - recieved a grid manager request");

-            Console.WriteLine("Terminating in three seconds...");
-                        Thread.Sleep(3000);
-                        thecallback("shutdown");
-                }
-         }
-}
-
+            Console.WriteLine("Terminating in three seconds...");

+                        Thread.Sleep(3000);

+                        thecallback("shutdown");

+                }

+         }

+}

+