diff options
author | Sean Dague | 2008-05-14 19:13:54 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-14 19:13:54 +0000 |
commit | 4a07038bbe616d05fbb3dfad79ec72a3169de589 (patch) | |
tree | 2ce85f8ef8818acf92c7f7ce1adbb9b772feb45d /OpenSim | |
parent | From: Dr Schofield <hud@zurich.ibm.com> (diff) | |
download | opensim-SC-4a07038bbe616d05fbb3dfad79ec72a3169de589.zip opensim-SC-4a07038bbe616d05fbb3dfad79ec72a3169de589.tar.gz opensim-SC-4a07038bbe616d05fbb3dfad79ec72a3169de589.tar.bz2 opensim-SC-4a07038bbe616d05fbb3dfad79ec72a3169de589.tar.xz |
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.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/RestStreamHandler.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 27 |
2 files changed, 21 insertions, 11 deletions
diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs index 64c7d40..cab5208 100644 --- a/OpenSim/Framework/Servers/RestStreamHandler.cs +++ b/OpenSim/Framework/Servers/RestStreamHandler.cs | |||
@@ -34,6 +34,11 @@ namespace OpenSim.Framework.Servers | |||
34 | { | 34 | { |
35 | private RestMethod m_restMethod; | 35 | private RestMethod m_restMethod; |
36 | 36 | ||
37 | public RestMethod Method | ||
38 | { | ||
39 | get { return m_restMethod; } | ||
40 | } | ||
41 | |||
37 | public override byte[] Handle(string path, Stream request) | 42 | public override byte[] Handle(string path, Stream request) |
38 | { | 43 | { |
39 | Encoding encoding = Encoding.UTF8; | 44 | Encoding encoding = Encoding.UTF8; |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 639e3c2..bae7819 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -90,35 +90,40 @@ namespace OpenSim | |||
90 | private string m_standaloneUserSource; | 90 | private string m_standaloneUserSource; |
91 | 91 | ||
92 | protected string m_assetStorage = "local"; | 92 | protected string m_assetStorage = "local"; |
93 | 93 | ||
94 | public ConsoleCommand CreateAccount = null; | 94 | public ConsoleCommand CreateAccount = null; |
95 | protected bool m_dumpAssetsToFile; | 95 | protected bool m_dumpAssetsToFile; |
96 | 96 | ||
97 | protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); | 97 | protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); |
98 | 98 | ||
99 | protected IniConfigSource m_config; | 99 | protected IniConfigSource m_config; |
100 | 100 | ||
101 | public IniConfigSource ConfigSource | 101 | public IniConfigSource ConfigSource |
102 | { | 102 | { |
103 | get { return m_config; } | 103 | get { return m_config; } |
104 | set { m_config = value; } | 104 | set { m_config = value; } |
105 | } | 105 | } |
106 | 106 | ||
107 | public BaseHttpServer HttpServer | ||
108 | { | ||
109 | get { return m_httpServer; } | ||
110 | } | ||
111 | |||
112 | public List<IClientNetworkServer> ClientServers | 107 | public List<IClientNetworkServer> ClientServers |
113 | { | 108 | { |
114 | get { return m_clientServers; } | 109 | get { return m_clientServers; } |
115 | } | 110 | } |
116 | 111 | ||
117 | public List<RegionInfo> RegionData | 112 | public List<RegionInfo> RegionData |
118 | { | 113 | { |
119 | get { return m_regionData; } | 114 | get { return m_regionData; } |
120 | } | 115 | } |
121 | 116 | ||
117 | public new BaseHttpServer HttpServer | ||
118 | { | ||
119 | get { return m_httpServer; } | ||
120 | } | ||
121 | |||
122 | public new uint HttpServerPort | ||
123 | { | ||
124 | get { return m_httpServerPort; } | ||
125 | } | ||
126 | |||
122 | protected ModuleLoader m_moduleLoader; | 127 | protected ModuleLoader m_moduleLoader; |
123 | 128 | ||
124 | public ModuleLoader ModuleLoader | 129 | public ModuleLoader ModuleLoader |