From 2525810e2a1b23f9c5b17b3d075e02c0c6255e2c Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 27 Oct 2009 13:31:04 -0700 Subject: Removed the DotNetEngine scripting engine. You will need to create a fresh checkout or clean out all *DotNet*.dll assemblies from the bin/ directory to run OpenSim moving forward --- .../Engines/DotNetEngine/DotNetEngine.cs | 196 --------------------- .../DotNetEngine/DotNetEngine_ScriptLoadUnload.cs | 95 ---------- .../DotNetEngine/Properties/AssemblyInfo.cs | 63 ------- 3 files changed, 354 deletions(-) delete mode 100644 OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs delete mode 100644 OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine_ScriptLoadUnload.cs delete mode 100644 OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs (limited to 'OpenSim/ScriptEngine/Engines/DotNetEngine') diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs deleted file mode 100644 index 3b8a0ae..0000000 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs +++ /dev/null @@ -1,196 +0,0 @@ -/* - * 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 OpenSimulator 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.Reflection; -using System.Text; -using System.Text.RegularExpressions; -using log4net; -using Nini.Config; -using OpenMetaverse; -using OpenSim.ApplicationPlugins.ScriptEngine; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes; -using OpenSim.ScriptEngine.Components.DotNetEngine.Events; -using OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler; -using OpenSim.ScriptEngine.Shared; -using ComponentFactory = OpenSim.ApplicationPlugins.ScriptEngine.ComponentFactory; - -namespace OpenSim.ScriptEngine.Engines.DotNetEngine -{ - // This is a sample engine - public partial class DotNetEngine : IScriptEngine - { - - //private string[] _ComponentNames = new string[] { - // "Commands_LSL", - // "Commands_OSSL", - // "Compiler_CS", - // "Compiler_JS", - // "Compiler_LSL", - // "Compiler_VB", - // "LSLEventProvider", - // "Scheduler" - // }; - internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - public string Name { get { return "SECS.DotNetEngine"; } } - //public bool IsSharedModule { get { return true; } } - internal RegionInfoStructure RegionInfo; - - private string[] commandNames = new string[] - { - "Commands_LSL" - }; - - private string[] compilerNames = new string[] - { - "Compiler_CS", - "Compiler_JS", - "Compiler_LSL", - "Compiler_YP", - "Compiler_VB" - }; - private string[] schedulerNames = new string[] - { - "Scheduler" - }; - - //internal IScriptLoader m_ScriptLoader; - internal LSLEventProvider m_LSLEventProvider; - //internal IScriptExecutor m_Executor; - //internal Dictionary Compilers = new Dictionary(); - internal Dictionary Schedulers = new Dictionary(); - public static Dictionary Compilers = new Dictionary(); -// private static bool haveInitialized = false; - - public DotNetEngine() - { - RegionInfo = new RegionInfoStructure(); - RegionInfo.Compilers = Compilers; - RegionInfo.Schedulers = Schedulers; - RegionInfo.Executors = new Dictionary(); - RegionInfo.CommandProviders = new Dictionary(); - RegionInfo.EventProviders = new Dictionary(); - } - - public void Initialise(Scene scene, IConfigSource source) - { - RegionInfo.Scene = scene; - RegionInfo.ConfigSource = source; - - m_log.DebugFormat("[{0}] Initializing components", Name); - InitializeComponents(); - } - - public void PostInitialise() { } - - /// - /// Called on region close - /// - public void Close() - { - ComponentClose(); - } - #region Initialize the Script Engine Components we need - public void InitializeComponents() - { - string cname = ""; - m_log.DebugFormat("[{0}] Component initialization", Name); - // Initialize an instance of all module we want - try - { - cname = "ScriptManager"; - m_log.DebugFormat("[{0}] Executor: {1}", Name, cname); - RegionInfo.Executors.Add(cname, - ComponentFactory.GetComponentInstance(RegionInfo, cname) as IScriptExecutor); - - cname = "ScriptLoader"; - m_log.DebugFormat("[{0}] ScriptLoader: {1}", Name, cname); - RegionInfo.ScriptLoader = - ComponentFactory.GetComponentInstance(RegionInfo, cname) as IScriptExecutor as ScriptLoader; - - // CommandProviders - foreach (string cn in commandNames) - { - cname = cn; - m_log.DebugFormat("[{0}] CommandProvider: {1}", Name, cname); - RegionInfo.CommandProviders.Add(cname, - ComponentFactory.GetComponentInstance(RegionInfo, cname) as - IScriptCommandProvider); - } - - // Compilers - foreach (string cn in compilerNames) - { - cname = cn; - m_log.DebugFormat("[{0}] Compiler: {1}", Name, cname); - RegionInfo.Compilers.Add(cname, - ComponentFactory.GetComponentInstance(RegionInfo, cname) as - IScriptCompiler); - } - - // Schedulers - foreach (string cn in schedulerNames) - { - cname = cn; - m_log.DebugFormat("[{0}] Scheduler: {1}", Name, cname); - RegionInfo.Schedulers.Add(cname, - ComponentFactory.GetComponentInstance(RegionInfo, cname) as - IScriptScheduler); - } - - // Event provider - cname = "LSLEventProvider"; - m_log.DebugFormat("[{0}] EventProvider: {1}", Name, cname); - IScriptEventProvider sep = ComponentFactory.GetComponentInstance(RegionInfo, cname) as IScriptEventProvider; - RegionInfo.EventProviders.Add(cname, sep); - m_LSLEventProvider = sep as LSLEventProvider; - - // Hook up events - m_LSLEventProvider.RezScript += Events_RezScript; - m_LSLEventProvider.RemoveScript += Events_RemoveScript; - } - catch (Exception e) - { - m_log.ErrorFormat("[{0}] Exception while loading \"{1}\": {2}", Name, cname, e.ToString()); - } - } - - private void ComponentClose() - { - // Close schedulers - foreach (IScriptScheduler scheduler in RegionInfo.Schedulers.Values) - { - scheduler.Close(); - } - } - - #endregion - - } -} diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine_ScriptLoadUnload.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine_ScriptLoadUnload.cs deleted file mode 100644 index a113c1e..0000000 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine_ScriptLoadUnload.cs +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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 OpenSimulator 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.Text; -using OpenMetaverse; -using OpenSim.ScriptEngine.Components.DotNetEngine.Events; -using OpenSim.ScriptEngine.Shared; - -namespace OpenSim.ScriptEngine.Engines.DotNetEngine -{ - public partial class DotNetEngine - { - - //internal Dictionary ScriptMapping = new Dictionary(); - - - // - // HANDLE EVENTS FROM SCRIPTS - // We will handle script add, change and remove events outside of command pipeline - // - #region Script Add/Change/Remove - void Events_RezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine) - { - // ### - // # New script created - // ### - m_log.DebugFormat( - "[{0}] NEW SCRIPT: localID: {1}, itemID: {2}, startParam: {3}, postOnRez: {4}, engine: {5}", - Name, localID, itemID, startParam, postOnRez, engine); - - // Make a script object - ScriptStructure scriptObject = new ScriptStructure(); - scriptObject.RegionInfo = RegionInfo; - scriptObject.LocalID = localID; - scriptObject.ItemID = itemID; - scriptObject.Source = script; - - // - // Get MetaData from script header - // - ScriptMetaData scriptMetaData = ScriptMetaData.Extract(ref script); - scriptObject.ScriptMetaData = scriptMetaData; - foreach (string key in scriptObject.ScriptMetaData.Keys) - { - m_log.DebugFormat("[{0}] Script metadata: Key: \"{1}\", Value: \"{2}\".", Name, key, scriptObject.ScriptMetaData[key]); - } - - // - // Load this assembly - // - // TODO: Use Executor to send a command instead? - m_log.DebugFormat("[{0}] Adding script to scheduler", Name); - RegionInfo.FindScheduler(scriptObject.ScriptMetaData).AddScript(scriptObject); - // Add to our internal mapping - //ScriptMapping.Add(itemID, Schedulers[scheduler]); - } - - private void Events_RemoveScript(uint localID, UUID itemID) - { - // Tell all schedulers to remove this item - foreach (IScriptScheduler scheduler in RegionInfo.Schedulers.Values) - { - scheduler.Removecript(localID, itemID); - } - } - #endregion - - } -} diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs deleted file mode 100644 index bca9c2c..0000000 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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 OpenSimulator 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.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OpenSim.ScriptEngine.Engines.DotNetEngine")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://opensimulator.org")] -[assembly: AssemblyProduct("OpenSim.ScriptEngine.Engines.DotNetEngine")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1d1c68a7-026f-4556-a060-4af69f488d2a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("0.6.5.*")] -[assembly: AssemblyVersion("0.6.5.*")] -[assembly: AssemblyFileVersion("0.6.5.0")] -- cgit v1.1