diff options
author | Sean Dague | 2009-02-26 22:54:50 +0000 |
---|---|---|
committer | Sean Dague | 2009-02-26 22:54:50 +0000 |
commit | cddaaf3e13fdadf473bd8fd63e37c4805b48dde8 (patch) | |
tree | 83132771fc3890abddc997b119c631235b1de366 /OpenSim/Grid/UserServer.Modules | |
parent | Added IRegionCreator interface that all ApplicationPlugins that are creators ... (diff) | |
download | opensim-SC-cddaaf3e13fdadf473bd8fd63e37c4805b48dde8.zip opensim-SC-cddaaf3e13fdadf473bd8fd63e37c4805b48dde8.tar.gz opensim-SC-cddaaf3e13fdadf473bd8fd63e37c4805b48dde8.tar.bz2 opensim-SC-cddaaf3e13fdadf473bd8fd63e37c4805b48dde8.tar.xz |
svn attribute fixes so that we can play nice between windows and linux
Diffstat (limited to 'OpenSim/Grid/UserServer.Modules')
-rw-r--r-- | OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs index e79e786..33b55b6 100644 --- a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs | |||
@@ -1,77 +1,77 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using log4net; | 32 | using log4net; |
33 | using log4net.Config; | 33 | using log4net.Config; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
39 | using OpenSim.Grid.Communications.OGS1; | 39 | using OpenSim.Grid.Communications.OGS1; |
40 | using OpenSim.Grid.Framework; | 40 | using OpenSim.Grid.Framework; |
41 | 41 | ||
42 | namespace OpenSim.Grid.UserServer.Modules | 42 | namespace OpenSim.Grid.UserServer.Modules |
43 | { | 43 | { |
44 | public class GridInfoServiceModule | 44 | public class GridInfoServiceModule |
45 | { | 45 | { |
46 | protected IGridServiceCore m_core; | 46 | protected IGridServiceCore m_core; |
47 | protected GridInfoService m_gridInfoService; | 47 | protected GridInfoService m_gridInfoService; |
48 | protected BaseHttpServer m_httpServer; | 48 | protected BaseHttpServer m_httpServer; |
49 | 49 | ||
50 | public GridInfoServiceModule() | 50 | public GridInfoServiceModule() |
51 | { | 51 | { |
52 | } | 52 | } |
53 | 53 | ||
54 | public void Initialise(IGridServiceCore core) | 54 | public void Initialise(IGridServiceCore core) |
55 | { | 55 | { |
56 | m_core = core; | 56 | m_core = core; |
57 | m_gridInfoService = new GridInfoService(); | 57 | m_gridInfoService = new GridInfoService(); |
58 | } | 58 | } |
59 | 59 | ||
60 | public void PostInitialise() | 60 | public void PostInitialise() |
61 | { | 61 | { |
62 | 62 | ||
63 | } | 63 | } |
64 | 64 | ||
65 | public void RegisterHandlers(BaseHttpServer httpServer) | 65 | public void RegisterHandlers(BaseHttpServer httpServer) |
66 | { | 66 | { |
67 | m_httpServer = httpServer; | 67 | m_httpServer = httpServer; |
68 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", | 68 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", |
69 | m_gridInfoService.RestGetGridInfoMethod)); | 69 | m_gridInfoService.RestGetGridInfoMethod)); |
70 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 70 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); |
71 | } | 71 | } |
72 | 72 | ||
73 | public void Close() | 73 | public void Close() |
74 | { | 74 | { |
75 | } | 75 | } |
76 | } | 76 | } |
77 | } | 77 | } |