From 3d7e6fc6d8a813210f44f7b165be8be40cf38f95 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 6 Jan 2008 11:17:57 +0000 Subject: Set svn:eol-style. --- OpenSim/Grid/MessagingServer/Main.cs | 450 ++++++++++----------- .../ScriptEngine/Common/ScriptServerInterfaces.cs | 104 ++--- 2 files changed, 277 insertions(+), 277 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index a340ce8..a69cef3 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -1,226 +1,226 @@ -/* -* Copyright (c) Contributors, http://opensimulator.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.IO; -using libsecondlife; -using OpenSim.Framework; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Console; -using OpenSim.Framework.Servers; - -namespace OpenSim.Grid.MessagingServer -{ - /// - /// - public class OpenUser_Main : conscmd_callback - { - private UserConfig Cfg; - - //public UserManager m_userManager; - //public UserLoginService m_loginService; - - private LogBase m_console; - private LLUUID m_lastCreatedUser = LLUUID.Random(); - - [STAThread] - public static void Main(string[] args) - { - Console.WriteLine("Launching UserServer..."); - - OpenUser_Main userserver = new OpenUser_Main(); - - userserver.Startup(); - userserver.Work(); - } - - private OpenUser_Main() - { - if (!Directory.Exists(Util.logDir())) - { - Directory.CreateDirectory(Util.logDir()); - } - m_console = - new LogBase((Path.Combine(Util.logDir(), "opengrid-messagingserver-console.log")), "OpenUser", this, true); - MainLog.Instance = m_console; - } - - private void Work() - { - m_console.Notice("Enter help for a list of commands\n"); - - while (true) - { - m_console.MainLogPrompt(); - } - } - - public void Startup() - { - Cfg = new UserConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); - - MainLog.Instance.Verbose("REGION", "Establishing data connection"); - //m_userManager = new UserManager(); - //m_userManager._config = Cfg; - //m_userManager.AddPlugin(Cfg.DatabaseProvider); - - //m_loginService = new UserLoginService( - //m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); - - MainLog.Instance.Verbose("REGION", "Starting HTTP process"); - BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); - - //httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); - - //httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); - //httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); - //httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", m_userManager.XmlRPCGetAvatarPickerAvatar); - //httpServer.AddXmlRPCHandler("add_new_user_friend", m_userManager.XmlRpcResponseXmlRPCAddUserFriend); - //httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend); - //httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); - //httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); - - - //httpServer.AddStreamHandler( - //new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); - - httpServer.Start(); - m_console.Status("SERVER", "Messageserver 0.4 - Startup complete"); - } - - - public void do_create(string what) - { - switch (what) - { - case "user": - string tempfirstname; - string templastname; - string tempMD5Passwd; - uint regX = 1000; - uint regY = 1000; - - tempfirstname = m_console.CmdPrompt("First name"); - templastname = m_console.CmdPrompt("Last name"); - tempMD5Passwd = m_console.PasswdPrompt("Password"); - regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); - regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); - - tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); - - LLUUID userID = new LLUUID(); - try - { - //userID = - //m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); - } catch (Exception ex) - { - m_console.Error("SERVER", "Error creating user: {0}", ex.ToString()); - } - - try - { - //RestObjectPoster.BeginPostObject(m_userManager._config.InventoryUrl + "CreateInventory/", - //userID.UUID); - } - catch (Exception ex) - { - m_console.Error("SERVER", "Error creating inventory for user: {0}", ex.ToString()); - } - m_lastCreatedUser = userID; - break; - } - } - - public void RunCmd(string cmd, string[] cmdparams) - { - switch (cmd) - { - case "help": - m_console.Notice("create user - create a new user"); - m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)"); - break; - - case "create": - do_create(cmdparams[0]); - break; - - case "shutdown": - m_console.Close(); - Environment.Exit(0); - break; - - case "test-inventory": - // RestObjectPosterResponse> requester = new RestObjectPosterResponse>(); - // requester.ReturnResponseVal = TestResponse; - // requester.BeginPostObject(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); - //List folders = - //SynchronousRestObjectPoster.BeginPostObject>("POST", - //m_userManager. - //_config. - //InventoryUrl + - //"RootFolders/", - //m_lastCreatedUser); - break; - } - } - - public void TestResponse(List resp) - { - Console.WriteLine("response got"); - } - - /*private void ConfigDB(IGenericConfig configData) - { - try - { - string attri = ""; - attri = configData.GetAttribute("DataBaseProvider"); - if (attri == "") - { - StorageDll = "OpenSim.Framework.Data.DB4o.dll"; - configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); - } - else - { - StorageDll = attri; - } - configData.Commit(); - } - catch - { - - } - }*/ - - public void Show(string ShowWhat) - { - } - } +/* +* Copyright (c) Contributors, http://opensimulator.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.IO; +using libsecondlife; +using OpenSim.Framework; +using OpenSim.Framework.Communications.Cache; +using OpenSim.Framework.Console; +using OpenSim.Framework.Servers; + +namespace OpenSim.Grid.MessagingServer +{ + /// + /// + public class OpenUser_Main : conscmd_callback + { + private UserConfig Cfg; + + //public UserManager m_userManager; + //public UserLoginService m_loginService; + + private LogBase m_console; + private LLUUID m_lastCreatedUser = LLUUID.Random(); + + [STAThread] + public static void Main(string[] args) + { + Console.WriteLine("Launching UserServer..."); + + OpenUser_Main userserver = new OpenUser_Main(); + + userserver.Startup(); + userserver.Work(); + } + + private OpenUser_Main() + { + if (!Directory.Exists(Util.logDir())) + { + Directory.CreateDirectory(Util.logDir()); + } + m_console = + new LogBase((Path.Combine(Util.logDir(), "opengrid-messagingserver-console.log")), "OpenUser", this, true); + MainLog.Instance = m_console; + } + + private void Work() + { + m_console.Notice("Enter help for a list of commands\n"); + + while (true) + { + m_console.MainLogPrompt(); + } + } + + public void Startup() + { + Cfg = new UserConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); + + MainLog.Instance.Verbose("REGION", "Establishing data connection"); + //m_userManager = new UserManager(); + //m_userManager._config = Cfg; + //m_userManager.AddPlugin(Cfg.DatabaseProvider); + + //m_loginService = new UserLoginService( + //m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); + + MainLog.Instance.Verbose("REGION", "Starting HTTP process"); + BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); + + //httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); + + //httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); + //httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); + //httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", m_userManager.XmlRPCGetAvatarPickerAvatar); + //httpServer.AddXmlRPCHandler("add_new_user_friend", m_userManager.XmlRpcResponseXmlRPCAddUserFriend); + //httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend); + //httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); + //httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); + + + //httpServer.AddStreamHandler( + //new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); + + httpServer.Start(); + m_console.Status("SERVER", "Messageserver 0.4 - Startup complete"); + } + + + public void do_create(string what) + { + switch (what) + { + case "user": + string tempfirstname; + string templastname; + string tempMD5Passwd; + uint regX = 1000; + uint regY = 1000; + + tempfirstname = m_console.CmdPrompt("First name"); + templastname = m_console.CmdPrompt("Last name"); + tempMD5Passwd = m_console.PasswdPrompt("Password"); + regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); + regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); + + tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); + + LLUUID userID = new LLUUID(); + try + { + //userID = + //m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); + } catch (Exception ex) + { + m_console.Error("SERVER", "Error creating user: {0}", ex.ToString()); + } + + try + { + //RestObjectPoster.BeginPostObject(m_userManager._config.InventoryUrl + "CreateInventory/", + //userID.UUID); + } + catch (Exception ex) + { + m_console.Error("SERVER", "Error creating inventory for user: {0}", ex.ToString()); + } + m_lastCreatedUser = userID; + break; + } + } + + public void RunCmd(string cmd, string[] cmdparams) + { + switch (cmd) + { + case "help": + m_console.Notice("create user - create a new user"); + m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)"); + break; + + case "create": + do_create(cmdparams[0]); + break; + + case "shutdown": + m_console.Close(); + Environment.Exit(0); + break; + + case "test-inventory": + // RestObjectPosterResponse> requester = new RestObjectPosterResponse>(); + // requester.ReturnResponseVal = TestResponse; + // requester.BeginPostObject(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); + //List folders = + //SynchronousRestObjectPoster.BeginPostObject>("POST", + //m_userManager. + //_config. + //InventoryUrl + + //"RootFolders/", + //m_lastCreatedUser); + break; + } + } + + public void TestResponse(List resp) + { + Console.WriteLine("response got"); + } + + /*private void ConfigDB(IGenericConfig configData) + { + try + { + string attri = ""; + attri = configData.GetAttribute("DataBaseProvider"); + if (attri == "") + { + StorageDll = "OpenSim.Framework.Data.DB4o.dll"; + configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); + } + else + { + StorageDll = attri; + } + configData.Commit(); + } + catch + { + + } + }*/ + + public void Show(string ShowWhat) + { + } + } } \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs index 1e8917c..6ac7c65 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs @@ -1,52 +1,52 @@ -using libsecondlife; -using OpenSim.Framework; - -namespace OpenSim.Region.ScriptEngine.Common -{ - public class ScriptServerInterfaces - { - public interface RemoteEvents - { - void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient); - void OnRezScript(uint localID, LLUUID itemID, string script); - void OnRemoveScript(uint localID, LLUUID itemID); - void state_exit(uint localID, LLUUID itemID); - void touch(uint localID, LLUUID itemID); - void touch_end(uint localID, LLUUID itemID); - void collision_start(uint localID, LLUUID itemID); - void collision(uint localID, LLUUID itemID); - void collision_end(uint localID, LLUUID itemID); - void land_collision_start(uint localID, LLUUID itemID); - void land_collision(uint localID, LLUUID itemID); - void land_collision_end(uint localID, LLUUID itemID); - void timer(uint localID, LLUUID itemID); - void listen(uint localID, LLUUID itemID); - void on_rez(uint localID, LLUUID itemID); - void sensor(uint localID, LLUUID itemID); - void no_sensor(uint localID, LLUUID itemID); - void control(uint localID, LLUUID itemID); - void money(uint localID, LLUUID itemID); - void email(uint localID, LLUUID itemID); - void at_target(uint localID, LLUUID itemID); - void not_at_target(uint localID, LLUUID itemID); - void at_rot_target(uint localID, LLUUID itemID); - void not_at_rot_target(uint localID, LLUUID itemID); - void run_time_permissions(uint localID, LLUUID itemID); - void changed(uint localID, LLUUID itemID); - void attach(uint localID, LLUUID itemID); - void dataserver(uint localID, LLUUID itemID); - void link_message(uint localID, LLUUID itemID); - void moving_start(uint localID, LLUUID itemID); - void moving_end(uint localID, LLUUID itemID); - void object_rez(uint localID, LLUUID itemID); - void remote_data(uint localID, LLUUID itemID); - void http_response(uint localID, LLUUID itemID); - } - - public interface ServerRemotingObject - { - RemoteEvents Events(); - } - - } -} +using libsecondlife; +using OpenSim.Framework; + +namespace OpenSim.Region.ScriptEngine.Common +{ + public class ScriptServerInterfaces + { + public interface RemoteEvents + { + void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient); + void OnRezScript(uint localID, LLUUID itemID, string script); + void OnRemoveScript(uint localID, LLUUID itemID); + void state_exit(uint localID, LLUUID itemID); + void touch(uint localID, LLUUID itemID); + void touch_end(uint localID, LLUUID itemID); + void collision_start(uint localID, LLUUID itemID); + void collision(uint localID, LLUUID itemID); + void collision_end(uint localID, LLUUID itemID); + void land_collision_start(uint localID, LLUUID itemID); + void land_collision(uint localID, LLUUID itemID); + void land_collision_end(uint localID, LLUUID itemID); + void timer(uint localID, LLUUID itemID); + void listen(uint localID, LLUUID itemID); + void on_rez(uint localID, LLUUID itemID); + void sensor(uint localID, LLUUID itemID); + void no_sensor(uint localID, LLUUID itemID); + void control(uint localID, LLUUID itemID); + void money(uint localID, LLUUID itemID); + void email(uint localID, LLUUID itemID); + void at_target(uint localID, LLUUID itemID); + void not_at_target(uint localID, LLUUID itemID); + void at_rot_target(uint localID, LLUUID itemID); + void not_at_rot_target(uint localID, LLUUID itemID); + void run_time_permissions(uint localID, LLUUID itemID); + void changed(uint localID, LLUUID itemID); + void attach(uint localID, LLUUID itemID); + void dataserver(uint localID, LLUUID itemID); + void link_message(uint localID, LLUUID itemID); + void moving_start(uint localID, LLUUID itemID); + void moving_end(uint localID, LLUUID itemID); + void object_rez(uint localID, LLUUID itemID); + void remote_data(uint localID, LLUUID itemID); + void http_response(uint localID, LLUUID itemID); + } + + public interface ServerRemotingObject + { + RemoteEvents Events(); + } + + } +} -- cgit v1.1