1 files changed, 122 insertions, 122 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
index f10edd4..aefaa10 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -1,123 +1,123 @@
-/*
+/*
-* Copyright (c) Contributors, http://opensimulator.org/
+* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-using OpenSim.Region.ScriptEngine.Common;
+using OpenSim.Region.ScriptEngine.Common;
-namespace OpenSim.Grid.ScriptServer.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer
-{
+{
-    internal class ScriptEngineLoader
+    internal class ScriptEngineLoader
-    {
+    {
-        private LogBase m_log;
+        private LogBase m_log;
-        public ScriptEngineLoader(LogBase logger)
+        public ScriptEngineLoader(LogBase logger)
-        {
+        {
-            m_log = logger;
+            m_log = logger;
-        }
+        }
-        public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)
+        public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)
-        {
+        {
-            ScriptServerInterfaces.ScriptEngine ret = null;
+            ScriptServerInterfaces.ScriptEngine ret = null;
-            try
+            try
-            {
+            {
-                ret =
+                ret =
-                    LoadAndInitAssembly(
+                    LoadAndInitAssembly(
-                        Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
+                        Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
-                        "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
+                        "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
-            }
+            }
-            catch (Exception e)
+            catch (Exception e)
-            {
+            {
-                m_log.Error("ScriptEngine",
+                m_log.Error("ScriptEngine",
-                            "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
+                            "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
-                            e.StackTrace.ToString());
+                            e.StackTrace.ToString());
-            }
+            }
-            return ret;
+            return ret;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Does actual loading and initialization of script Assembly
+        /// Does actual loading and initialization of script Assembly
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        private ScriptServerInterfaces.ScriptEngine LoadAndInitAssembly(string FileName, string NameSpace)
+        private ScriptServerInterfaces.ScriptEngine LoadAndInitAssembly(string FileName, string NameSpace)
-        {
+        {
-            //Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);
+            //Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);
-            // Load .Net Assembly (.dll)
+            // Load .Net Assembly (.dll)
-            // Initialize and return it
+            // Initialize and return it
-            // TODO: Add error handling
+            // TODO: Add error handling
-            Assembly a;
+            Assembly a;
-            //try
+            //try
-            //{
+            //{
-            // Load to default appdomain (temporary)
+            // Load to default appdomain (temporary)
-            a = Assembly.LoadFrom(FileName);
+            a = Assembly.LoadFrom(FileName);
-            // Load to specified appdomain
+            // Load to specified appdomain
-            // TODO: Insert security
+            // TODO: Insert security
-            //a = FreeAppDomain.Load(FileName);
+            //a = FreeAppDomain.Load(FileName);
-            //}
+            //}
-            //catch (Exception e)
+            //catch (Exception e)
-            //{
+            //{
-            //    m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
+            //    m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
-            //}
+            //}
-            //Console.WriteLine("Loading: " + FileName);
+            //Console.WriteLine("Loading: " + FileName);
-            //foreach (Type _t in a.GetTypes())
+            //foreach (Type _t in a.GetTypes())
-            //{
+            //{
-            //    Console.WriteLine("Type: " + _t.ToString());
+            //    Console.WriteLine("Type: " + _t.ToString());
-            //}
+            //}
-            Type t;
+            Type t;
-            //try
+            //try
-            //{
+            //{
-            t = a.GetType(NameSpace, true);
+            t = a.GetType(NameSpace, true);
-            //}
+            //}
-            //catch (Exception e)
+            //catch (Exception e)
-            //{
+            //{
-            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
-            //}
+            //}
-            ScriptServerInterfaces.ScriptEngine ret;
+            ScriptServerInterfaces.ScriptEngine ret;
-            //try
+            //try
-            //{
+            //{
-            ret = (ScriptServerInterfaces.ScriptEngine)Activator.CreateInstance(t);
+            ret = (ScriptServerInterfaces.ScriptEngine)Activator.CreateInstance(t);
-            //}
+            //}
-            //catch (Exception e)
+            //catch (Exception e)
-            //{
+            //{
-            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
-            //}
+            //}
-            return ret;
+            return ret;
-        }
+        }
-    }
+    }
 }
 \ No newline at end of file

diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs index f10edd4..aefaa10 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -1,123 +1,123 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29	using System.IO;	29	using System.IO;
30	using System.Reflection;	30	using System.Reflection;
31	using OpenSim.Framework.Console;	31	using OpenSim.Framework.Console;
32	using OpenSim.Region.ScriptEngine.Common;	32	using OpenSim.Region.ScriptEngine.Common;
33		33
34	namespace OpenSim.Grid.ScriptServer.ScriptServer	34	namespace OpenSim.Grid.ScriptServer.ScriptServer
35	{	35	{
36	internal class ScriptEngineLoader	36	internal class ScriptEngineLoader
37	{	37	{
38	private LogBase m_log;	38	private LogBase m_log;
39		39
40		40
41	public ScriptEngineLoader(LogBase logger)	41	public ScriptEngineLoader(LogBase logger)
42	{	42	{
43	m_log = logger;	43	m_log = logger;
44	}	44	}
45		45
46	public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)	46	public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)
47	{	47	{
48	ScriptServerInterfaces.ScriptEngine ret = null;	48	ScriptServerInterfaces.ScriptEngine ret = null;
49	try	49	try
50	{	50	{
51	ret =	51	ret =
52	LoadAndInitAssembly(	52	LoadAndInitAssembly(
53	Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),	53	Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
54	"OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");	54	"OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
55	}	55	}
56	catch (Exception e)	56	catch (Exception e)
57	{	57	{
58	m_log.Error("ScriptEngine",	58	m_log.Error("ScriptEngine",
59	"Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +	59	"Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
60	e.StackTrace.ToString());	60	e.StackTrace.ToString());
61	}	61	}
62	return ret;	62	return ret;
63	}	63	}
64		64
65	/// <summary>	65	/// <summary>
66	/// Does actual loading and initialization of script Assembly	66	/// Does actual loading and initialization of script Assembly
67	/// </summary>	67	/// </summary>
68	/// <returns></returns>	68	/// <returns></returns>
69	private ScriptServerInterfaces.ScriptEngine LoadAndInitAssembly(string FileName, string NameSpace)	69	private ScriptServerInterfaces.ScriptEngine LoadAndInitAssembly(string FileName, string NameSpace)
70	{	70	{
71	//Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);	71	//Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);
72	// Load .Net Assembly (.dll)	72	// Load .Net Assembly (.dll)
73	// Initialize and return it	73	// Initialize and return it
74		74
75	// TODO: Add error handling	75	// TODO: Add error handling
76		76
77	Assembly a;	77	Assembly a;
78	//try	78	//try
79	//{	79	//{
80		80
81		81
82	// Load to default appdomain (temporary)	82	// Load to default appdomain (temporary)
83	a = Assembly.LoadFrom(FileName);	83	a = Assembly.LoadFrom(FileName);
84	// Load to specified appdomain	84	// Load to specified appdomain
85	// TODO: Insert security	85	// TODO: Insert security
86	//a = FreeAppDomain.Load(FileName);	86	//a = FreeAppDomain.Load(FileName);
87	//}	87	//}
88	//catch (Exception e)	88	//catch (Exception e)
89	//{	89	//{
90	// m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());	90	// m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
91	//}	91	//}
92		92
93		93
94	//Console.WriteLine("Loading: " + FileName);	94	//Console.WriteLine("Loading: " + FileName);
95	//foreach (Type _t in a.GetTypes())	95	//foreach (Type _t in a.GetTypes())
96	//{	96	//{
97	// Console.WriteLine("Type: " + _t.ToString());	97	// Console.WriteLine("Type: " + _t.ToString());
98	//}	98	//}
99		99
100	Type t;	100	Type t;
101	//try	101	//try
102	//{	102	//{
103	t = a.GetType(NameSpace, true);	103	t = a.GetType(NameSpace, true);
104	//}	104	//}
105	//catch (Exception e)	105	//catch (Exception e)
106	//{	106	//{
107	// m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());	107	// m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
108	//}	108	//}
109		109
110	ScriptServerInterfaces.ScriptEngine ret;	110	ScriptServerInterfaces.ScriptEngine ret;
111	//try	111	//try
112	//{	112	//{
113	ret = (ScriptServerInterfaces.ScriptEngine)Activator.CreateInstance(t);	113	ret = (ScriptServerInterfaces.ScriptEngine)Activator.CreateInstance(t);
114	//}	114	//}
115	//catch (Exception e)	115	//catch (Exception e)
116	//{	116	//{
117	// m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());	117	// m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
118	//}	118	//}
119		119
120	return ret;	120	return ret;
121	}	121	}
122	}	122	}
123	} \ No newline at end of file	123	} \ No newline at end of file