aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Regions
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-05 20:44:20 +0000
committerJustin Clark-Casey (justincc)2011-12-05 20:44:20 +0000
commit4567555c49cb560dd6f109bbfec42086af3de56f (patch)
treebfb0a6fd21d2070940399c0e36dc7d0de1e7eb0d /OpenSim/ApplicationPlugins/Rest/Regions
parentFor the GetTexture capability, if a data range is requested that covers the w... (diff)
downloadopensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.zip
opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.tar.gz
opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.tar.bz2
opensim-SC_OLD-4567555c49cb560dd6f109bbfec42086af3de56f.tar.xz
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Regions')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs12
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs6
3 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index dea166d..d99ba57 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -41,7 +41,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
41 { 41 {
42 #region GET methods 42 #region GET methods
43 public string GetHandler(string request, string path, string param, 43 public string GetHandler(string request, string path, string param,
44 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 44 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
45 { 45 {
46 // foreach (string h in httpRequest.Headers.AllKeys) 46 // foreach (string h in httpRequest.Headers.AllKeys)
47 // foreach (string v in httpRequest.Headers.GetValues(h)) 47 // foreach (string v in httpRequest.Headers.GetValues(h))
@@ -64,7 +64,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
64 } 64 }
65 } 65 }
66 66
67 public string GetHandlerRegions(OSHttpResponse httpResponse) 67 public string GetHandlerRegions(IOSHttpResponse httpResponse)
68 { 68 {
69 RestXmlWriter rxw = new RestXmlWriter(new StringWriter()); 69 RestXmlWriter rxw = new RestXmlWriter(new StringWriter());
70 70
@@ -95,7 +95,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
95 return rxw.ToString(); 95 return rxw.ToString();
96 } 96 }
97 97
98 public string GetHandlerRegion(OSHttpResponse httpResponse, string param) 98 public string GetHandlerRegion(IOSHttpResponse httpResponse, string param)
99 { 99 {
100 // be resilient and don't get confused by a terminating '/' 100 // be resilient and don't get confused by a terminating '/'
101 param = param.TrimEnd(new char[]{'/'}); 101 param = param.TrimEnd(new char[]{'/'});
@@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
180 } 180 }
181 #endregion GET methods 181 #endregion GET methods
182 182
183 protected string RegionTerrain(OSHttpResponse httpResponse, Scene scene) 183 protected string RegionTerrain(IOSHttpResponse httpResponse, Scene scene)
184 { 184 {
185 httpResponse.SendChunked = true; 185 httpResponse.SendChunked = true;
186 httpResponse.ContentType = "text/xml"; 186 httpResponse.ContentType = "text/xml";
@@ -190,7 +190,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
190 // "GET", "terrain not implemented"); 190 // "GET", "terrain not implemented");
191 } 191 }
192 192
193 protected string RegionStats(OSHttpResponse httpResponse, Scene scene) 193 protected string RegionStats(IOSHttpResponse httpResponse, Scene scene)
194 { 194 {
195 int users = scene.GetRootAgentCount(); 195 int users = scene.GetRootAgentCount();
196 int objects = scene.Entities.Count - users; 196 int objects = scene.Entities.Count - users;
@@ -213,7 +213,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
213 return rxw.ToString(); 213 return rxw.ToString();
214 } 214 }
215 215
216 protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max) 216 protected string RegionPrims(IOSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
217 { 217 {
218 httpResponse.SendChunked = true; 218 httpResponse.SendChunked = true;
219 httpResponse.ContentType = "text/xml"; 219 httpResponse.ContentType = "text/xml";
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
index 279db4c..468faea 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
40 { 40 {
41 #region GET methods 41 #region GET methods
42 public string GetRegionInfoHandler(string request, string path, string param, 42 public string GetRegionInfoHandler(string request, string path, string param,
43 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 43 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
44 { 44 {
45 // foreach (string h in httpRequest.Headers.AllKeys) 45 // foreach (string h in httpRequest.Headers.AllKeys)
46 // foreach (string v in httpRequest.Headers.GetValues(h)) 46 // foreach (string v in httpRequest.Headers.GetValues(h))
@@ -64,7 +64,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
64 } 64 }
65 } 65 }
66 66
67 public string GetRegionInfoHandlerRegions(OSHttpResponse httpResponse) 67 public string GetRegionInfoHandlerRegions(IOSHttpResponse httpResponse)
68 { 68 {
69 RestXmlWriter rxw = new RestXmlWriter(new StringWriter()); 69 RestXmlWriter rxw = new RestXmlWriter(new StringWriter());
70 70
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index e0318e5..f666f45 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
40 #region POST methods 40 #region POST methods
41 41
42 public string PostHandler(string request, string path, string param, 42 public string PostHandler(string request, string path, string param,
43 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 43 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
44 { 44 {
45 // foreach (string h in httpRequest.Headers.AllKeys) 45 // foreach (string h in httpRequest.Headers.AllKeys)
46 // foreach (string v in httpRequest.Headers.GetValues(h)) 46 // foreach (string v in httpRequest.Headers.GetValues(h))
@@ -92,7 +92,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
92 } 92 }
93 } 93 }
94 94
95 public string CreateRegion(OSHttpRequest request, OSHttpResponse response) 95 public string CreateRegion(IOSHttpRequest request, IOSHttpResponse response)
96 { 96 {
97 RestXmlWriter rxw = new RestXmlWriter(new StringWriter()); 97 RestXmlWriter rxw = new RestXmlWriter(new StringWriter());
98 98
@@ -108,7 +108,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
108 return rxw.ToString(); 108 return rxw.ToString();
109 } 109 }
110 110
111 public string LoadPrims(string requestBody, OSHttpRequest request, OSHttpResponse response, Scene scene) 111 public string LoadPrims(string requestBody, IOSHttpRequest request, IOSHttpResponse response, Scene scene)
112 { 112 {
113 IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>(); 113 IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
114 if (serialiser != null) 114 if (serialiser != null)