diff options
Diffstat (limited to '')
11 files changed, 788 insertions, 788 deletions
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs index c89da81..0aa0525 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs | |||
@@ -1,101 +1,101 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Text; | 31 | using System.Text; |
32 | using log4net; | 32 | using log4net; |
33 | using OpenSim.ApplicationPlugins.ScriptEngine.Components; | 33 | using OpenSim.ApplicationPlugins.ScriptEngine.Components; |
34 | 34 | ||
35 | namespace OpenSim.ApplicationPlugins.ScriptEngine | 35 | namespace OpenSim.ApplicationPlugins.ScriptEngine |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Used to load ScriptEngine component .dll's | 38 | /// Used to load ScriptEngine component .dll's |
39 | /// </summary> | 39 | /// </summary> |
40 | internal class ComponentLoader | 40 | internal class ComponentLoader |
41 | { | 41 | { |
42 | internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | private ScriptEnginePlugin scriptEnginePlugin; | 43 | private ScriptEnginePlugin scriptEnginePlugin; |
44 | public ComponentLoader(ScriptEnginePlugin sep) | 44 | public ComponentLoader(ScriptEnginePlugin sep) |
45 | { | 45 | { |
46 | scriptEnginePlugin = sep; | 46 | scriptEnginePlugin = sep; |
47 | } | 47 | } |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Load components from directory | 50 | /// Load components from directory |
51 | /// </summary> | 51 | /// </summary> |
52 | /// <param name="directory"></param> | 52 | /// <param name="directory"></param> |
53 | public void Load(string directory) | 53 | public void Load(string directory) |
54 | { | 54 | { |
55 | // We may want to change how this functions as currently it required unique class names for each component | 55 | // We may want to change how this functions as currently it required unique class names for each component |
56 | 56 | ||
57 | foreach (string file in Directory.GetFiles(directory, "*.dll")) | 57 | foreach (string file in Directory.GetFiles(directory, "*.dll")) |
58 | { | 58 | { |
59 | //m_log.DebugFormat("[ScriptEngine]: Loading: [{0}].", file); | 59 | //m_log.DebugFormat("[ScriptEngine]: Loading: [{0}].", file); |
60 | Assembly componentAssembly = Assembly.LoadFrom(file); | 60 | Assembly componentAssembly = Assembly.LoadFrom(file); |
61 | if (componentAssembly != null) | 61 | if (componentAssembly != null) |
62 | { | 62 | { |
63 | try | 63 | try |
64 | { | 64 | { |
65 | // Go through all types in the assembly | 65 | // Go through all types in the assembly |
66 | foreach (Type componentType in componentAssembly.GetTypes()) | 66 | foreach (Type componentType in componentAssembly.GetTypes()) |
67 | { | 67 | { |
68 | if (componentType.IsPublic | 68 | if (componentType.IsPublic |
69 | && !componentType.IsAbstract) | 69 | && !componentType.IsAbstract) |
70 | { | 70 | { |
71 | if (componentType.IsSubclassOf(typeof (ComponentBase))) | 71 | if (componentType.IsSubclassOf(typeof (ComponentBase))) |
72 | { | 72 | { |
73 | // We have found an type which is derived from ProdiverBase, add it to provider list | 73 | // We have found an type which is derived from ProdiverBase, add it to provider list |
74 | m_log.InfoFormat("[ScriptEngine]: Adding component: {0}", componentType.Name); | 74 | m_log.InfoFormat("[ScriptEngine]: Adding component: {0}", componentType.Name); |
75 | lock (ComponentRegistry.providers) | 75 | lock (ComponentRegistry.providers) |
76 | { | 76 | { |
77 | ComponentRegistry.providers.Add(componentType.Name, componentType); | 77 | ComponentRegistry.providers.Add(componentType.Name, componentType); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | if (componentType.IsSubclassOf(typeof(RegionScriptEngineBase))) | 80 | if (componentType.IsSubclassOf(typeof(RegionScriptEngineBase))) |
81 | { | 81 | { |
82 | // We have found an type which is derived from RegionScriptEngineBase, add it to engine list | 82 | // We have found an type which is derived from RegionScriptEngineBase, add it to engine list |
83 | m_log.InfoFormat("[ScriptEngine]: Adding script engine: {0}", componentType.Name); | 83 | m_log.InfoFormat("[ScriptEngine]: Adding script engine: {0}", componentType.Name); |
84 | lock (ComponentRegistry.scriptEngines) | 84 | lock (ComponentRegistry.scriptEngines) |
85 | { | 85 | { |
86 | ComponentRegistry.scriptEngines.Add(componentType.Name, componentType); | 86 | ComponentRegistry.scriptEngines.Add(componentType.Name, componentType); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | } | 89 | } |
90 | } | 90 | } |
91 | } | 91 | } |
92 | catch | 92 | catch |
93 | (ReflectionTypeLoadException) | 93 | (ReflectionTypeLoadException) |
94 | { | 94 | { |
95 | m_log.InfoFormat("[ScriptEngine]: Could not load types for [{0}].", componentAssembly.FullName); | 95 | m_log.InfoFormat("[ScriptEngine]: Could not load types for [{0}].", componentAssembly.FullName); |
96 | } | 96 | } |
97 | } //if | 97 | } //if |
98 | } //foreach | 98 | } //foreach |
99 | } | 99 | } |
100 | } | 100 | } |
101 | } \ No newline at end of file | 101 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentRegistry.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentRegistry.cs index dcb435d..5ffa490 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentRegistry.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentRegistry.cs | |||
@@ -1,68 +1,68 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | using OpenSim.ApplicationPlugins.ScriptEngine; | 30 | using OpenSim.ApplicationPlugins.ScriptEngine; |
31 | using OpenSim.ApplicationPlugins.ScriptEngine.Components; | 31 | using OpenSim.ApplicationPlugins.ScriptEngine.Components; |
32 | 32 | ||
33 | namespace OpenSim.ApplicationPlugins.ScriptEngine | 33 | namespace OpenSim.ApplicationPlugins.ScriptEngine |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// Component providers | 36 | /// Component providers |
37 | /// This is where any component (any part) of the Script Engine Component System (SECS) registers. | 37 | /// This is where any component (any part) of the Script Engine Component System (SECS) registers. |
38 | /// Nothing is instanciated at this point. The modules just need to register here to be available for any script engine. | 38 | /// Nothing is instanciated at this point. The modules just need to register here to be available for any script engine. |
39 | /// </summary> | 39 | /// </summary> |
40 | public static class ComponentRegistry | 40 | public static class ComponentRegistry |
41 | { | 41 | { |
42 | // Component providers are registered here wit a name (string) | 42 | // Component providers are registered here wit a name (string) |
43 | // When a script engine is created the components are instanciated | 43 | // When a script engine is created the components are instanciated |
44 | public static Dictionary<string, Type> providers = new Dictionary<string, Type>(); | 44 | public static Dictionary<string, Type> providers = new Dictionary<string, Type>(); |
45 | public static Dictionary<string, Type> scriptEngines = new Dictionary<string, Type>(); | 45 | public static Dictionary<string, Type> scriptEngines = new Dictionary<string, Type>(); |
46 | 46 | ||
47 | ///// <summary> | 47 | ///// <summary> |
48 | ///// Returns a list of ProviderBase objects which has been instanciated by their name | 48 | ///// Returns a list of ProviderBase objects which has been instanciated by their name |
49 | ///// </summary> | 49 | ///// </summary> |
50 | ///// <param name="Providers">List of Script Engine Components</param> | 50 | ///// <param name="Providers">List of Script Engine Components</param> |
51 | ///// <returns></returns> | 51 | ///// <returns></returns> |
52 | //public static List<ComponentBase> GetComponents(string[] Providers) | 52 | //public static List<ComponentBase> GetComponents(string[] Providers) |
53 | //{ | 53 | //{ |
54 | // List<ComponentBase> pbl = new List<ComponentBase>(); | 54 | // List<ComponentBase> pbl = new List<ComponentBase>(); |
55 | // if (Providers != null) | 55 | // if (Providers != null) |
56 | // { | 56 | // { |
57 | // foreach (string p in Providers) | 57 | // foreach (string p in Providers) |
58 | // { | 58 | // { |
59 | // if (providers.ContainsKey(p)) | 59 | // if (providers.ContainsKey(p)) |
60 | // pbl.Add(Activator.CreateInstance(providers[p]) as ComponentBase); | 60 | // pbl.Add(Activator.CreateInstance(providers[p]) as ComponentBase); |
61 | // } | 61 | // } |
62 | // } | 62 | // } |
63 | 63 | ||
64 | // return pbl; | 64 | // return pbl; |
65 | //} | 65 | //} |
66 | 66 | ||
67 | } | 67 | } |
68 | } \ No newline at end of file | 68 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CommandBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Components/CommandBase.cs index 01a052f..4708554 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CommandBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Components/CommandBase.cs | |||
@@ -1,45 +1,45 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | 30 | ||
31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components | 31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components |
32 | { | 32 | { |
33 | public abstract class CommandBase: ComponentBase | 33 | public abstract class CommandBase: ComponentBase |
34 | { | 34 | { |
35 | //public override iProviderBase CreateInstance() | 35 | //public override iProviderBase CreateInstance() |
36 | //{ | 36 | //{ |
37 | // throw new NotImplementedException(); | 37 | // throw new NotImplementedException(); |
38 | //} | 38 | //} |
39 | 39 | ||
40 | //public override void Start() | 40 | //public override void Start() |
41 | //{ | 41 | //{ |
42 | // throw new NotImplementedException(); | 42 | // throw new NotImplementedException(); |
43 | //} | 43 | //} |
44 | } | 44 | } |
45 | } \ No newline at end of file | 45 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CompilerBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Components/CompilerBase.cs index 69b54a5..e62d1f2 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CompilerBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Components/CompilerBase.cs | |||
@@ -1,45 +1,45 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | 30 | ||
31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components | 31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components |
32 | { | 32 | { |
33 | public abstract class CompilerBase: ComponentBase | 33 | public abstract class CompilerBase: ComponentBase |
34 | { | 34 | { |
35 | //public override iProviderBase CreateInstance() | 35 | //public override iProviderBase CreateInstance() |
36 | //{ | 36 | //{ |
37 | // throw new NotImplementedException(); | 37 | // throw new NotImplementedException(); |
38 | //} | 38 | //} |
39 | 39 | ||
40 | //public override void Start() | 40 | //public override void Start() |
41 | //{ | 41 | //{ |
42 | // throw new NotImplementedException(); | 42 | // throw new NotImplementedException(); |
43 | //} | 43 | //} |
44 | } | 44 | } |
45 | } \ No newline at end of file | 45 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/ComponentBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Components/ComponentBase.cs index 8879e53..48c6bfe 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/ComponentBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Components/ComponentBase.cs | |||
@@ -1,53 +1,53 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | 30 | ||
31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components | 31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Generic baseclass for component providers | 34 | /// Generic baseclass for component providers |
35 | /// </summary> | 35 | /// </summary> |
36 | public abstract class ComponentBase //: iProviderBase | 36 | public abstract class ComponentBase //: iProviderBase |
37 | { | 37 | { |
38 | //public abstract iProviderBase CreateInstance(); | 38 | //public abstract iProviderBase CreateInstance(); |
39 | public abstract void Start(); | 39 | public abstract void Start(); |
40 | public abstract void Close(); | 40 | public abstract void Close(); |
41 | public RegionScriptEngineBase scriptEngine; | 41 | public RegionScriptEngineBase scriptEngine; |
42 | public void Initialize(RegionScriptEngineBase ScriptEngine) | 42 | public void Initialize(RegionScriptEngineBase ScriptEngine) |
43 | { | 43 | { |
44 | scriptEngine = ScriptEngine; | 44 | scriptEngine = ScriptEngine; |
45 | } | 45 | } |
46 | 46 | ||
47 | static ComponentBase() | 47 | static ComponentBase() |
48 | { | 48 | { |
49 | // We got loaded -- should we register now? | 49 | // We got loaded -- should we register now? |
50 | //OpenSim.ApplicationPlugins.ScriptEngine.ComponentProviders.providers.Add(GetType()); | 50 | //OpenSim.ApplicationPlugins.ScriptEngine.ComponentProviders.providers.Add(GetType()); |
51 | } | 51 | } |
52 | } | 52 | } |
53 | } \ No newline at end of file | 53 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/EventBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Components/EventBase.cs index d9c29a9..1c0fd52 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/EventBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Components/EventBase.cs | |||
@@ -1,45 +1,45 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | 30 | ||
31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components | 31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components |
32 | { | 32 | { |
33 | public abstract class EventBase : ComponentBase | 33 | public abstract class EventBase : ComponentBase |
34 | { | 34 | { |
35 | //public override iProviderBase CreateInstance() | 35 | //public override iProviderBase CreateInstance() |
36 | //{ | 36 | //{ |
37 | // throw new NotImplementedException(); | 37 | // throw new NotImplementedException(); |
38 | //} | 38 | //} |
39 | 39 | ||
40 | //public override void Start() | 40 | //public override void Start() |
41 | //{ | 41 | //{ |
42 | // throw new NotImplementedException(); | 42 | // throw new NotImplementedException(); |
43 | //} | 43 | //} |
44 | } | 44 | } |
45 | } \ No newline at end of file | 45 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/SchedulerBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Components/SchedulerBase.cs index 7c19beb..9d5aff0 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/SchedulerBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Components/SchedulerBase.cs | |||
@@ -1,45 +1,45 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | 30 | ||
31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components | 31 | namespace OpenSim.ApplicationPlugins.ScriptEngine.Components |
32 | { | 32 | { |
33 | public abstract class SchedulerBase: ComponentBase | 33 | public abstract class SchedulerBase: ComponentBase |
34 | { | 34 | { |
35 | //public override iProviderBase CreateInstance() | 35 | //public override iProviderBase CreateInstance() |
36 | //{ | 36 | //{ |
37 | // throw new NotImplementedException(); | 37 | // throw new NotImplementedException(); |
38 | //} | 38 | //} |
39 | 39 | ||
40 | //public override void Start() | 40 | //public override void Start() |
41 | //{ | 41 | //{ |
42 | // throw new NotImplementedException(); | 42 | // throw new NotImplementedException(); |
43 | //} | 43 | //} |
44 | } | 44 | } |
45 | } \ No newline at end of file | 45 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs index 166a6d7..a93f89c 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs | |||
@@ -1,36 +1,36 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.ApplicationPlugins.ScriptEngine")] | 8 | [assembly: AssemblyTitle("OpenSim.ApplicationPlugins.ScriptEngine")] |
9 | [assembly: AssemblyDescription("")] | 9 | [assembly: AssemblyDescription("")] |
10 | [assembly: AssemblyConfiguration("")] | 10 | [assembly: AssemblyConfiguration("")] |
11 | [assembly: AssemblyCompany("Microsoft")] | 11 | [assembly: AssemblyCompany("Microsoft")] |
12 | [assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")] | 12 | [assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")] |
13 | [assembly: AssemblyCopyright("Copyright © Microsoft 2008")] | 13 | [assembly: AssemblyCopyright("Copyright © Microsoft 2008")] |
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
23 | [assembly: Guid("a234c402-3014-45de-9f6b-c024d9f71983")] | 23 | [assembly: Guid("a234c402-3014-45de-9f6b-c024d9f71983")] |
24 | 24 | ||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | // You can specify all the values or you can default the Build and Revision Numbers | 32 | // You can specify all the values or you can default the Build and Revision Numbers |
33 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
34 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
35 | [assembly: AssemblyVersion("1.0.0.0")] | 35 | [assembly: AssemblyVersion("1.0.0.0")] |
36 | [assembly: AssemblyFileVersion("1.0.0.0")] | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs index ec676f2..e2731d7 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs | |||
@@ -1,182 +1,182 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Text; | 30 | using System.Text; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.ApplicationPlugins.ScriptEngine.Components; | 33 | using OpenSim.ApplicationPlugins.ScriptEngine.Components; |
34 | using OpenSim.Region.Environment.Scenes; | 34 | using OpenSim.Region.Environment.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.ApplicationPlugins.ScriptEngine | 36 | namespace OpenSim.ApplicationPlugins.ScriptEngine |
37 | { | 37 | { |
38 | public abstract class RegionScriptEngineBase | 38 | public abstract class RegionScriptEngineBase |
39 | { | 39 | { |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Called on region initialize | 42 | /// Called on region initialize |
43 | /// </summary> | 43 | /// </summary> |
44 | public abstract void Initialize(); | 44 | public abstract void Initialize(); |
45 | public abstract string Name { get; } | 45 | public abstract string Name { get; } |
46 | /// <summary> | 46 | /// <summary> |
47 | /// Called before components receive Close() | 47 | /// Called before components receive Close() |
48 | /// </summary> | 48 | /// </summary> |
49 | public abstract void PreClose(); | 49 | public abstract void PreClose(); |
50 | // Hold list of all the different components we have working for us | 50 | // Hold list of all the different components we have working for us |
51 | public List<ComponentBase> Components = new List<ComponentBase>(); | 51 | public List<ComponentBase> Components = new List<ComponentBase>(); |
52 | 52 | ||
53 | public Scene m_Scene; | 53 | public Scene m_Scene; |
54 | public IConfigSource m_ConfigSource; | 54 | public IConfigSource m_ConfigSource; |
55 | public readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | public readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
56 | 56 | ||
57 | public void Initialize(Scene scene, IConfigSource source) | 57 | public void Initialize(Scene scene, IConfigSource source) |
58 | { | 58 | { |
59 | // Region started | 59 | // Region started |
60 | m_Scene = scene; | 60 | m_Scene = scene; |
61 | m_ConfigSource = source; | 61 | m_ConfigSource = source; |
62 | Initialize(); | 62 | Initialize(); |
63 | } | 63 | } |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
66 | /// Creates instances of script engine components inside "components" List | 66 | /// Creates instances of script engine components inside "components" List |
67 | /// </summary> | 67 | /// </summary> |
68 | /// <param name="ComponentList">Array of comonent names to initialize</param> | 68 | /// <param name="ComponentList">Array of comonent names to initialize</param> |
69 | public void InitializeComponents(string[] ComponentList) | 69 | public void InitializeComponents(string[] ComponentList) |
70 | { | 70 | { |
71 | // Take list of providers to initialize and make instances of them | 71 | // Take list of providers to initialize and make instances of them |
72 | foreach (string c in ComponentList) | 72 | foreach (string c in ComponentList) |
73 | { | 73 | { |
74 | m_log.Info("[" + Name + "]: Loading: " + c); | 74 | m_log.Info("[" + Name + "]: Loading: " + c); |
75 | lock (Components) | 75 | lock (Components) |
76 | { | 76 | { |
77 | lock (ComponentRegistry.providers) | 77 | lock (ComponentRegistry.providers) |
78 | { | 78 | { |
79 | try | 79 | try |
80 | { | 80 | { |
81 | if (ComponentRegistry.providers.ContainsKey(c)) | 81 | if (ComponentRegistry.providers.ContainsKey(c)) |
82 | Components.Add(Activator.CreateInstance(ComponentRegistry.providers[c]) as ComponentBase); | 82 | Components.Add(Activator.CreateInstance(ComponentRegistry.providers[c]) as ComponentBase); |
83 | else | 83 | else |
84 | m_log.Error("[" + Name + "]: Component \"" + c + "\" not found, can not load"); | 84 | m_log.Error("[" + Name + "]: Component \"" + c + "\" not found, can not load"); |
85 | } | 85 | } |
86 | catch (Exception ex) | 86 | catch (Exception ex) |
87 | { | 87 | { |
88 | m_log.Error("[" + Name + "]: Exception loading \"" + c + "\": " + ex.ToString()); | 88 | m_log.Error("[" + Name + "]: Exception loading \"" + c + "\": " + ex.ToString()); |
89 | } | 89 | } |
90 | } | 90 | } |
91 | } | 91 | } |
92 | } | 92 | } |
93 | 93 | ||
94 | 94 | ||
95 | // Run Initialize on all our providers, hand over a reference of ourself. | 95 | // Run Initialize on all our providers, hand over a reference of ourself. |
96 | foreach (ComponentBase p in Components.ToArray()) | 96 | foreach (ComponentBase p in Components.ToArray()) |
97 | { | 97 | { |
98 | try | 98 | try |
99 | { | 99 | { |
100 | p.Initialize(this); | 100 | p.Initialize(this); |
101 | } | 101 | } |
102 | catch (Exception ex) | 102 | catch (Exception ex) |
103 | { | 103 | { |
104 | lock (Components) | 104 | lock (Components) |
105 | { | 105 | { |
106 | m_log.Error("[" + Name + "]: Error initializing \"" + p.GetType().FullName + "\": " + | 106 | m_log.Error("[" + Name + "]: Error initializing \"" + p.GetType().FullName + "\": " + |
107 | ex.ToString()); | 107 | ex.ToString()); |
108 | if (Components.Contains(p)) | 108 | if (Components.Contains(p)) |
109 | Components.Remove(p); | 109 | Components.Remove(p); |
110 | } | 110 | } |
111 | } | 111 | } |
112 | } | 112 | } |
113 | // All modules has been initialized, call Start() on them. | 113 | // All modules has been initialized, call Start() on them. |
114 | foreach (ComponentBase p in Components.ToArray()) | 114 | foreach (ComponentBase p in Components.ToArray()) |
115 | { | 115 | { |
116 | try | 116 | try |
117 | { | 117 | { |
118 | p.Start(); | 118 | p.Start(); |
119 | } | 119 | } |
120 | catch (Exception ex) | 120 | catch (Exception ex) |
121 | { | 121 | { |
122 | lock (Components) | 122 | lock (Components) |
123 | { | 123 | { |
124 | m_log.Error("[" + Name + "]: Error starting \"" + p.GetType().FullName + "\": " + ex.ToString()); | 124 | m_log.Error("[" + Name + "]: Error starting \"" + p.GetType().FullName + "\": " + ex.ToString()); |
125 | if (Components.Contains(p)) | 125 | if (Components.Contains(p)) |
126 | Components.Remove(p); | 126 | Components.Remove(p); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | } | 129 | } |
130 | 130 | ||
131 | } | 131 | } |
132 | 132 | ||
133 | #region Functions to return lists based on type | 133 | #region Functions to return lists based on type |
134 | // Predicate for searching List for a certain type | 134 | // Predicate for searching List for a certain type |
135 | private static bool FindType<T>(ComponentBase pb) | 135 | private static bool FindType<T>(ComponentBase pb) |
136 | { | 136 | { |
137 | if (pb.GetType() is T) | 137 | if (pb.GetType() is T) |
138 | return true; | 138 | return true; |
139 | return false; | 139 | return false; |
140 | } | 140 | } |
141 | public List<ComponentBase> GetCommandComponentList() | 141 | public List<ComponentBase> GetCommandComponentList() |
142 | { | 142 | { |
143 | return Components.FindAll(FindType<CommandBase>); | 143 | return Components.FindAll(FindType<CommandBase>); |
144 | } | 144 | } |
145 | public List<ComponentBase> GetCompilerComponentList() | 145 | public List<ComponentBase> GetCompilerComponentList() |
146 | { | 146 | { |
147 | return Components.FindAll(FindType<CompilerBase>); | 147 | return Components.FindAll(FindType<CompilerBase>); |
148 | } | 148 | } |
149 | public List<ComponentBase> GetEventComponentList() | 149 | public List<ComponentBase> GetEventComponentList() |
150 | { | 150 | { |
151 | return Components.FindAll(FindType<EventBase>); | 151 | return Components.FindAll(FindType<EventBase>); |
152 | } | 152 | } |
153 | public List<ComponentBase> GetScheduleComponentList() | 153 | public List<ComponentBase> GetScheduleComponentList() |
154 | { | 154 | { |
155 | return Components.FindAll(FindType<SchedulerBase>); | 155 | return Components.FindAll(FindType<SchedulerBase>); |
156 | } | 156 | } |
157 | 157 | ||
158 | #endregion | 158 | #endregion |
159 | 159 | ||
160 | public void Close() | 160 | public void Close() |
161 | { | 161 | { |
162 | // We need to shut down | 162 | // We need to shut down |
163 | 163 | ||
164 | // First call abstracted PreClose() | 164 | // First call abstracted PreClose() |
165 | PreClose(); | 165 | PreClose(); |
166 | 166 | ||
167 | // Then Call Close() on all components | 167 | // Then Call Close() on all components |
168 | foreach (ComponentBase p in Components.ToArray()) | 168 | foreach (ComponentBase p in Components.ToArray()) |
169 | { | 169 | { |
170 | try | 170 | try |
171 | { | 171 | { |
172 | p.Close(); | 172 | p.Close(); |
173 | } | 173 | } |
174 | catch (Exception ex) | 174 | catch (Exception ex) |
175 | { | 175 | { |
176 | // TODO: Print error to console | 176 | // TODO: Print error to console |
177 | } | 177 | } |
178 | } | 178 | } |
179 | } | 179 | } |
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs index 89fb47b..e85e4dd 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs | |||
@@ -1,86 +1,86 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenSim.Region.Environment.Interfaces; | 31 | using OpenSim.Region.Environment.Interfaces; |
32 | using OpenSim.Region.Environment.Scenes; | 32 | using OpenSim.Region.Environment.Scenes; |
33 | 33 | ||
34 | namespace OpenSim.ApplicationPlugins.ScriptEngine | 34 | namespace OpenSim.ApplicationPlugins.ScriptEngine |
35 | { | 35 | { |
36 | public class RegionScriptEnginePlugin : IRegionModule | 36 | public class RegionScriptEnginePlugin : IRegionModule |
37 | { | 37 | { |
38 | // This is a region module. | 38 | // This is a region module. |
39 | // This means: Every time a new region is created, a new instance of this module is also created. | 39 | // This means: Every time a new region is created, a new instance of this module is also created. |
40 | // This module is responsible for starting the script engine for this region. | 40 | // This module is responsible for starting the script engine for this region. |
41 | 41 | ||
42 | private string tempScriptEngineName = "DotNetEngine"; | 42 | private string tempScriptEngineName = "DotNetEngine"; |
43 | public RegionScriptEngineBase scriptEngine; | 43 | public RegionScriptEngineBase scriptEngine; |
44 | public void Initialise(Scene scene, IConfigSource source) | 44 | public void Initialise(Scene scene, IConfigSource source) |
45 | { | 45 | { |
46 | return; | 46 | return; |
47 | // New region is being created | 47 | // New region is being created |
48 | // Create a new script engine | 48 | // Create a new script engine |
49 | try | 49 | try |
50 | { | 50 | { |
51 | lock (ComponentRegistry.scriptEngines) | 51 | lock (ComponentRegistry.scriptEngines) |
52 | { | 52 | { |
53 | scriptEngine = | 53 | scriptEngine = |
54 | Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as | 54 | Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as |
55 | RegionScriptEngineBase; | 55 | RegionScriptEngineBase; |
56 | } | 56 | } |
57 | scriptEngine.Initialize(scene, source); | 57 | scriptEngine.Initialize(scene, source); |
58 | } | 58 | } |
59 | catch (Exception ex) | 59 | catch (Exception ex) |
60 | { | 60 | { |
61 | scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString()); | 61 | scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString()); |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
65 | public void PostInitialise() | 65 | public void PostInitialise() |
66 | { | 66 | { |
67 | // Nothing | 67 | // Nothing |
68 | } | 68 | } |
69 | 69 | ||
70 | public void Close() | 70 | public void Close() |
71 | { | 71 | { |
72 | if (scriptEngine != null) | 72 | if (scriptEngine != null) |
73 | scriptEngine.Close(); | 73 | scriptEngine.Close(); |
74 | } | 74 | } |
75 | 75 | ||
76 | public string Name | 76 | public string Name |
77 | { | 77 | { |
78 | get { return "ScriptEngine Region Loader"; } | 78 | get { return "ScriptEngine Region Loader"; } |
79 | } | 79 | } |
80 | 80 | ||
81 | public bool IsSharedModule | 81 | public bool IsSharedModule |
82 | { | 82 | { |
83 | get { return true; } | 83 | get { return true; } |
84 | } | 84 | } |
85 | } | 85 | } |
86 | } | 86 | } |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs index cd584d5..32c7748 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs | |||
@@ -1,89 +1,89 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Text; | 30 | using System.Text; |
31 | using log4net; | 31 | using log4net; |
32 | 32 | ||
33 | namespace OpenSim.ApplicationPlugins.ScriptEngine | 33 | namespace OpenSim.ApplicationPlugins.ScriptEngine |
34 | { | 34 | { |
35 | public class ScriptEnginePlugin : IApplicationPlugin | 35 | public class ScriptEnginePlugin : IApplicationPlugin |
36 | { | 36 | { |
37 | internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 37 | internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
38 | internal OpenSimBase m_OpenSim; | 38 | internal OpenSimBase m_OpenSim; |
39 | private ComponentLoader pluginLoader; | 39 | private ComponentLoader pluginLoader; |
40 | 40 | ||
41 | public void Initialise(OpenSimBase openSim) | 41 | public void Initialise(OpenSimBase openSim) |
42 | { | 42 | { |
43 | // Our objective: Load component .dll's | 43 | // Our objective: Load component .dll's |
44 | m_OpenSim = openSim; | 44 | m_OpenSim = openSim; |
45 | pluginLoader = new ComponentLoader(this); | 45 | pluginLoader = new ComponentLoader(this); |
46 | 46 | ||
47 | m_log.Info("[" + Name + "]: Script Engine Component System"); | 47 | m_log.Info("[" + Name + "]: Script Engine Component System"); |
48 | m_log.Info("[" + Name + "]: Loading Script Engine Components"); | 48 | m_log.Info("[" + Name + "]: Loading Script Engine Components"); |
49 | pluginLoader.Load("ScriptEngines"); | 49 | pluginLoader.Load("ScriptEngines"); |
50 | 50 | ||
51 | } | 51 | } |
52 | #region IApplicationPlugin stuff | 52 | #region IApplicationPlugin stuff |
53 | /// <summary> | 53 | /// <summary> |
54 | /// Returns the plugin version | 54 | /// Returns the plugin version |
55 | /// </summary> | 55 | /// </summary> |
56 | /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> | 56 | /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> |
57 | public string Version | 57 | public string Version |
58 | { | 58 | { |
59 | get { return "1.0.0.0"; } | 59 | get { return "1.0.0.0"; } |
60 | } | 60 | } |
61 | 61 | ||
62 | /// <summary> | 62 | /// <summary> |
63 | /// Returns the plugin name | 63 | /// Returns the plugin name |
64 | /// </summary> | 64 | /// </summary> |
65 | /// <returns>Plugin name, eg MySQL User Provider</returns> | 65 | /// <returns>Plugin name, eg MySQL User Provider</returns> |
66 | public string Name | 66 | public string Name |
67 | { | 67 | { |
68 | get { return "ScriptEngine"; } | 68 | get { return "ScriptEngine"; } |
69 | } | 69 | } |
70 | 70 | ||
71 | /// <summary> | 71 | /// <summary> |
72 | /// Default-initialises the plugin | 72 | /// Default-initialises the plugin |
73 | /// </summary> | 73 | /// </summary> |
74 | public void Initialise() | 74 | public void Initialise() |
75 | { | 75 | { |
76 | //throw new NotImplementedException(); | 76 | //throw new NotImplementedException(); |
77 | } | 77 | } |
78 | 78 | ||
79 | ///<summary> | 79 | ///<summary> |
80 | ///Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. | 80 | ///Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. |
81 | ///</summary> | 81 | ///</summary> |
82 | ///<filterpriority>2</filterpriority> | 82 | ///<filterpriority>2</filterpriority> |
83 | public void Dispose() | 83 | public void Dispose() |
84 | { | 84 | { |
85 | //throw new NotImplementedException(); | 85 | //throw new NotImplementedException(); |
86 | } | 86 | } |
87 | #endregion | 87 | #endregion |
88 | } | 88 | } |
89 | } | 89 | } |