diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Communications/CAPSService.cs | 55 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | 2 |
2 files changed, 1 insertions, 56 deletions
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs deleted file mode 100644 index 0507173..0000000 --- a/OpenSim/Framework/Communications/CAPSService.cs +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using OpenSim.Framework.Servers; | ||
30 | |||
31 | namespace OpenSim.Framework.Communications | ||
32 | { | ||
33 | public class CAPSService | ||
34 | { | ||
35 | private readonly BaseHttpServer m_server; | ||
36 | |||
37 | public CAPSService(BaseHttpServer httpServer) | ||
38 | { | ||
39 | m_server = httpServer; | ||
40 | AddCapsSeedHandler("/CapsSeed/", CapsRequest); | ||
41 | } | ||
42 | |||
43 | private void AddCapsSeedHandler(string path, RestMethod restMethod) | ||
44 | { | ||
45 | m_server.AddStreamHandler(new RestStreamHandler("POST", path, restMethod)); | ||
46 | } | ||
47 | |||
48 | public string CapsRequest(string request, string path, string param, | ||
49 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
50 | { | ||
51 | System.Console.WriteLine("new caps request " + request + " from path " + path); | ||
52 | return String.Empty; | ||
53 | } | ||
54 | } | ||
55 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs index 13ccce2..a9a9ecd 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
59 | SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin()); | 59 | SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin()); |
60 | AssetCache ac = new AssetCache(assetService); | 60 | AssetCache ac = new AssetCache(assetService); |
61 | 61 | ||
62 | StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); | 62 | StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); |
63 | IConfigSource configSource = new IniConfigSource(); | 63 | IConfigSource configSource = new IniConfigSource(); |
64 | 64 | ||
65 | TestScene testScene = new TestScene( | 65 | TestScene testScene = new TestScene( |