From 2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 16 Jul 2007 15:40:11 +0000
Subject: changed to native line ending encoding
---
.../Grid/Framework.Manager/GridManagementAgent.cs | 276 ++++++++++-----------
.../Grid/Framework.Manager/GridServerManager.cs | 186 +++++++-------
2 files changed, 231 insertions(+), 231 deletions(-)
(limited to 'OpenSim/Grid/Framework.Manager')
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index 6c916a2..989df26 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -1,138 +1,138 @@
-/*
-* 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.Collections;
-using libsecondlife;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Framework.Manager
-{
- ///
- /// Used to pass messages to the gridserver
- ///
- /// Pass this argument
- public delegate void GridManagerCallback(string param);
-
- ///
- /// Serverside listener for grid commands
- ///
- public class GridManagementAgent
- {
- ///
- /// Passes grid server messages
- ///
- private GridManagerCallback thecallback;
-
- ///
- /// Security keys
- ///
- private string sendkey;
- private string recvkey;
-
- ///
- /// Our component type
- ///
- private string component_type;
-
- ///
- /// List of active sessions
- ///
- private static ArrayList Sessions;
-
- ///
- /// Initialises a new GridManagementAgent
- ///
- /// HTTP Daemon for this server
- /// What component type are we?
- /// Security send key
- /// Security recieve key
- /// Message callback
- public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
- {
- this.sendkey = sendkey;
- this.recvkey = recvkey;
- this.component_type = component_type;
- this.thecallback = thecallback;
- Sessions = new ArrayList();
-
- app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
-
- switch (component_type)
- {
- case "gridserver":
- GridServerManager.sendkey = this.sendkey;
- GridServerManager.recvkey = this.recvkey;
- GridServerManager.thecallback = thecallback;
- app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
- break;
- }
- }
-
- ///
- /// Checks if a session exists
- ///
- /// The session ID
- /// Exists?
- public static bool SessionExists(LLUUID sessionID)
- {
- return Sessions.Contains(sessionID);
- }
-
- ///
- /// Logs a new session to the grid manager
- ///
- /// the XMLRPC request
- /// An XMLRPC reply
- public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
- {
- XmlRpcResponse response = new XmlRpcResponse();
- Hashtable requestData = (Hashtable)request.Params[0];
- Hashtable responseData = new Hashtable();
-
- // TODO: Switch this over to using OpenSim.Framework.Data
- if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
- {
- response.IsFault = false;
- LLUUID new_session = LLUUID.Random();
- Sessions.Add(new_session);
- responseData["session_id"] = new_session.ToString();
- responseData["msg"] = "Login OK";
- }
- else
- {
- response.IsFault = true;
- responseData["error"] = "Invalid username or password";
- }
-
- response.Value = responseData;
- return response;
-
- }
-
- }
-}
+/*
+* 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.Collections;
+using libsecondlife;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Servers;
+
+namespace OpenSim.Framework.Manager
+{
+ ///
+ /// Used to pass messages to the gridserver
+ ///
+ /// Pass this argument
+ public delegate void GridManagerCallback(string param);
+
+ ///
+ /// Serverside listener for grid commands
+ ///
+ public class GridManagementAgent
+ {
+ ///
+ /// Passes grid server messages
+ ///
+ private GridManagerCallback thecallback;
+
+ ///
+ /// Security keys
+ ///
+ private string sendkey;
+ private string recvkey;
+
+ ///
+ /// Our component type
+ ///
+ private string component_type;
+
+ ///
+ /// List of active sessions
+ ///
+ private static ArrayList Sessions;
+
+ ///
+ /// Initialises a new GridManagementAgent
+ ///
+ /// HTTP Daemon for this server
+ /// What component type are we?
+ /// Security send key
+ /// Security recieve key
+ /// Message callback
+ public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
+ {
+ this.sendkey = sendkey;
+ this.recvkey = recvkey;
+ this.component_type = component_type;
+ this.thecallback = thecallback;
+ Sessions = new ArrayList();
+
+ app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
+
+ switch (component_type)
+ {
+ case "gridserver":
+ GridServerManager.sendkey = this.sendkey;
+ GridServerManager.recvkey = this.recvkey;
+ GridServerManager.thecallback = thecallback;
+ app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
+ break;
+ }
+ }
+
+ ///
+ /// Checks if a session exists
+ ///
+ /// The session ID
+ /// Exists?
+ public static bool SessionExists(LLUUID sessionID)
+ {
+ return Sessions.Contains(sessionID);
+ }
+
+ ///
+ /// Logs a new session to the grid manager
+ ///
+ /// the XMLRPC request
+ /// An XMLRPC reply
+ public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+ {
+ XmlRpcResponse response = new XmlRpcResponse();
+ Hashtable requestData = (Hashtable)request.Params[0];
+ Hashtable responseData = new Hashtable();
+
+ // TODO: Switch this over to using OpenSim.Framework.Data
+ if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
+ {
+ response.IsFault = false;
+ LLUUID new_session = LLUUID.Random();
+ Sessions.Add(new_session);
+ responseData["session_id"] = new_session.ToString();
+ responseData["msg"] = "Login OK";
+ }
+ else
+ {
+ response.IsFault = true;
+ responseData["error"] = "Invalid username or password";
+ }
+
+ response.Value = responseData;
+ return response;
+
+ }
+
+ }
+}
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index 67cd35d..729e42b 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -1,93 +1,93 @@
-/*
-* 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.Threading;
-using libsecondlife;
-using Nwc.XmlRpc;
-
-namespace OpenSim.Framework.Manager {
-
- ///
- /// A remote management system for the grid server
- ///
- public class GridServerManager
- {
- ///
- /// Triggers events from the grid manager
- ///
- public static GridManagerCallback thecallback;
-
- ///
- /// Security keys
- ///
- public static string sendkey;
- public static string recvkey;
-
- ///
- /// Disconnects the grid server and shuts it down
- ///
- /// XmlRpc Request
- /// An XmlRpc response containing either a "msg" or an "error"
- 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;
- }
-
- ///
- /// Shuts down the grid server
- ///
- 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");
- }
- }
-}
-
+/*
+* 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.Threading;
+using libsecondlife;
+using Nwc.XmlRpc;
+
+namespace OpenSim.Framework.Manager {
+
+ ///
+ /// A remote management system for the grid server
+ ///
+ public class GridServerManager
+ {
+ ///
+ /// Triggers events from the grid manager
+ ///
+ public static GridManagerCallback thecallback;
+
+ ///
+ /// Security keys
+ ///
+ public static string sendkey;
+ public static string recvkey;
+
+ ///
+ /// Disconnects the grid server and shuts it down
+ ///
+ /// XmlRpc Request
+ /// An XmlRpc response containing either a "msg" or an "error"
+ 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;
+ }
+
+ ///
+ /// Shuts down the grid server
+ ///
+ 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");
+ }
+ }
+}
+
--
cgit v1.1