From c570b107f890180bcaf5e5a030525af04feab1d4 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 5 Jul 2007 00:24:40 +0000
Subject: * Java engine fully back in Sugilite
---
.../Environment/OpenSim.Region.Environment.csproj | 59 +++++++++++++---------
.../scripting/Engines/JVMEngine/JavaEngine.cs | 29 +++++++++++
.../scripting/Engines/JVMEngine/OpenSimJVM.cs | 31 ++++--------
.../Scenes/scripting/Engines/JVMEngine/Thread.cs | 1 -
.../Environment/Scenes/scripting/ScriptManager.cs | 3 ++
5 files changed, 75 insertions(+), 48 deletions(-)
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 365c7ff..3b86468 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -1,4 +1,4 @@
-
+
Local
8.0.50727
@@ -6,7 +6,8 @@
{DCBA491C-0000-0000-0000-000000000000}
Debug
AnyCPU
-
+
+
OpenSim.Region.Environment
@@ -15,9 +16,11 @@
IE50
false
Library
-
+
+
OpenSim.Region.Environment
-
+
+
@@ -28,7 +31,8 @@
TRACE;DEBUG
-
+
+
True
4096
False
@@ -37,7 +41,8 @@
False
False
4
-
+
+
False
@@ -46,7 +51,8 @@
TRACE
-
+
+
False
4096
True
@@ -55,34 +61,36 @@
False
False
4
-
+
+
-
+
..\..\..\bin\Axiom.MathLib.dll
False
-
+
..\..\..\bin\Db4objects.Db4o.dll
False
-
+
..\..\..\bin\libsecondlife.dll
False
-
+
Microsoft.JScript.dll
False
-
+
System.dll
False
-
+
+
System.Xml.dll
False
-
+
..\..\..\bin\XMLRPC.dll
False
@@ -92,55 +100,55 @@
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Communications
{CB52B7E7-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.GenericConfig.Xml
{C74E4A30-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Framework.Servers
{2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Caches
{61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Capabilities
{39038E85-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Physics.Manager
{F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Region.Terrain.BasicTerrain
{C9E0F891-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
@@ -192,6 +200,7 @@
Code
+
Code
@@ -281,4 +290,4 @@
-
+
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs
new file mode 100644
index 0000000..1773156
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Environment.Scripting;
+using OpenSim.Scripting.EmbeddedJVM;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+ public class JavaEngine : IScriptCompiler
+ {
+ public string FileExt()
+ {
+ return ".java";
+ }
+
+ public Dictionary compile(string filename)
+ {
+ JVMScript script = new JVMScript();
+ Dictionary returns = new Dictionary();
+
+ script.LoadScript(filename);
+
+ returns.Add(filename, script);
+
+ return returns;
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs
index 7ed734b..aaa1609 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Scripting.EmbeddedJVM
{
- public class OpenSimJVM : IScript
+ public class JVMScript : IScript
{
private List _threads = new List();
private BlockingQueue CompileScripts = new BlockingQueue();
@@ -47,7 +47,7 @@ namespace OpenSim.Scripting.EmbeddedJVM
ScriptInfo scriptInfo;
- public OpenSimJVM()
+ public JVMScript()
{
}
@@ -55,37 +55,27 @@ namespace OpenSim.Scripting.EmbeddedJVM
public void Initialise(ScriptInfo info)
{
scriptInfo = info;
- }
-
- public string getName()
- {
- return "JVM Scripting Engine";
- }
- public bool Init(Scene world)
- {
- Console.WriteLine("Creating OpenSim JVM scripting engine");
_mainMemory = new MainMemory();
Thread.GlobalMemory = this._mainMemory;
- Thread.World = world;
+ Thread.World = info.world;
compileThread = new System.Threading.Thread(new ThreadStart(CompileScript));
compileThread.IsBackground = true;
compileThread.Start();
- return true;
+
}
- public string GetName()
+ public string getName()
{
- return "OpenSimJVM";
+ return "JVM Scripting Engine";
}
- public void LoadScript(string script, string scriptName, uint entityID)
+ public void LoadScript(string script)
{
- Console.WriteLine("OpenSimJVM - loading new script: " + scriptName);
+ Console.WriteLine("OpenSimJVM - loading new script: " + script);
CompileInfo comp = new CompileInfo();
- comp.entityId = entityID;
comp.script = script;
- comp.scriptName = scriptName;
+ comp.scriptName = script;
this.CompileScripts.Enqueue(comp);
}
@@ -96,7 +86,6 @@ namespace OpenSim.Scripting.EmbeddedJVM
CompileInfo comp = this.CompileScripts.Dequeue();
string script = comp.script;
string scriptName = comp.scriptName;
- uint entityID = comp.entityId;
try
{
//need to compile the script into a java class file
@@ -127,7 +116,6 @@ namespace OpenSim.Scripting.EmbeddedJVM
Thread newThread = new Thread();
this._threads.Add(newThread);
- newThread.EntityId = entityID;
newThread.currentClass = class1;
newThread.scriptInfo = scriptInfo;
@@ -165,7 +153,6 @@ namespace OpenSim.Scripting.EmbeddedJVM
{
public string script;
public string scriptName;
- public uint entityId;
public CompileInfo()
{
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Thread.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Thread.cs
index 806f833..3993436 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Thread.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Thread.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Scripting.EmbeddedJVM
private StackFrame currentFrame;
public int excutionCounter = 0;
public bool running = false;
- public uint EntityId = 0;
public ScriptInfo scriptInfo;
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index 250a4f0..153f4d7 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -59,6 +59,9 @@ namespace OpenSim.Region.Environment.Scripting
JScriptEngine jscriptCompiler = new JScriptEngine();
compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
+
+ JavaEngine javaCompiler = new JavaEngine();
+ compilers.Add(javaCompiler.FileExt(), javaCompiler);
}
public void Compile(string filename)
--
cgit v1.1