OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: Dr Scofield <DrScofield@xyzzyxyzzy.net> 

the attached patch set adds the (still work-in-progress but already
working) RestPlugin base class and the RestRegionPlugin code. we are using
XML serialization.

currently working:

GET /admin/regions/                 -> returns UUID list of known regions
   GET /admin/regions/<UUID>    -> returns detailed region information

we'll be adding support for POST/DELETE/PUT and also for
/admin/regions/<UUID>/name etc.
0.6.0-stable
Sean Dague 2008-05-14 19:13:54 +00:00
parent 8fe9943293
commit 4a07038bbe
4 changed files with 138 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Servers/RestStreamHandler.cs
View File

@ -34,6 +34,11 @@ namespace OpenSim.Framework.Servers
{ {
private RestMethod m_restMethod; private RestMethod m_restMethod;
public RestMethod Method
{
get { return m_restMethod; }
}
public override byte[] Handle(string path, Stream request) public override byte[] Handle(string path, Stream request)
{ {
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;

27
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -90,35 +90,40 @@ namespace OpenSim
private string m_standaloneUserSource; private string m_standaloneUserSource;
protected string m_assetStorage = "local"; protected string m_assetStorage = "local";
public ConsoleCommand CreateAccount = null; public ConsoleCommand CreateAccount = null;
protected bool m_dumpAssetsToFile; protected bool m_dumpAssetsToFile;
protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
protected IniConfigSource m_config; protected IniConfigSource m_config;
public IniConfigSource ConfigSource public IniConfigSource ConfigSource
{ {
get { return m_config; } get { return m_config; }
set { m_config = value; } set { m_config = value; }
} }
public BaseHttpServer HttpServer
{
get { return m_httpServer; }
}
public List<IClientNetworkServer> ClientServers public List<IClientNetworkServer> ClientServers
{ {
get { return m_clientServers; } get { return m_clientServers; }
} }
public List<RegionInfo> RegionData public List<RegionInfo> RegionData
{ {
get { return m_regionData; } get { return m_regionData; }
} }
public new BaseHttpServer HttpServer
{
get { return m_httpServer; }
}
public new uint HttpServerPort
{
get { return m_httpServerPort; }
}
protected ModuleLoader m_moduleLoader; protected ModuleLoader m_moduleLoader;
public ModuleLoader ModuleLoader public ModuleLoader ModuleLoader

12
bin/OpenSim.ini.example
View File

@ -162,6 +162,14 @@ shout_distance = 100
enabled = false enabled = false
access_password = unknown access_password = unknown
[RestPlugins]
enabled = false
password = unknown
prefix = /admin
[RestRegionPlugin]
enabled = false
; Uncomment the following for IRC bridge ; Uncomment the following for IRC bridge
; experimental, so if it breaks... keep both parts... yada yada ; experimental, so if it breaks... keep both parts... yada yada
; also, not good error detection when it fails ; also, not good error detection when it fails
@ -326,10 +334,6 @@ CleanUpOldScriptsOnStartup=true
; Set the following to true to allow administrator owned scripts to execute console commands ; Set the following to true to allow administrator owned scripts to execute console commands
AllowosConsoleCommand=false AllowosConsoleCommand=false
; Maximum number of llListen events we allow globally in the region
; Set this to 0 to have no limit imposed.
max_listens_per_region = 1000
; Maximum number of llListen events we allow per script ; Maximum number of llListen events we allow per script
; Set this to 0 to have no limit imposed. ; Set this to 0 to have no limit imposed.
max_listens_per_script = 64 max_listens_per_script = 64

109
prebuild.xml
View File

@ -1075,6 +1075,115 @@
</Files> </Files>
</Project> </Project>
<!-- REST plugins -->
<Project name="OpenSim.ApplicationPlugins.Rest"
path="OpenSim/ApplicationPlugins/Rest" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="Mono.Addins.dll" />
<Reference name="System"/>
<Reference name="System.Xml"/>
<Reference name="System.Xml.Serialization"/>
<Reference name="libsecondlife.dll" />
<Reference name="Nini.dll" />
<Reference name="XMLRPC.dll" />
<Reference name="OpenSim"/>
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="log4net"/>
<Files>
<Match pattern="*.cs" recurse="false"/>
</Files>
</Project>
<Project name="OpenSim.ApplicationPlugins.Rest.Regions"
path="OpenSim/ApplicationPlugins/Rest/Regions" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../../bin/</ReferencePath>
<Reference name="Mono.Addins.dll" />
<Reference name="System"/>
<Reference name="System.IO"/>
<Reference name="System.Xml"/>
<Reference name="System.Xml.Serialization"/>
<Reference name="libsecondlife.dll" />
<Reference name="Nini.dll" />
<Reference name="XMLRPC.dll" />
<Reference name="OpenSim"/>
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.ApplicationPlugins.Rest"/>
<Reference name="log4net"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project>
<!-- /REST plugins -->
<Project name="OpenSim.ApplicationPlugins.RemoteInventoryController" path="OpenSim/ApplicationPlugins/RemoteInventoryController" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="Mono.Addins.dll" />
<Reference name="System"/>
<Reference name="System.Xml"/>
<Reference name="libsecondlife.dll" />
<Reference name="Nini.dll" />
<Reference name="XMLRPC.dll" />
<Reference name="OpenSim"/>
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Communications.Cache"/>
<Reference name="log4net"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project>
<!-- Scene Server API Example Apps --> <!-- Scene Server API Example Apps -->
<Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library"> <Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">