diff options
author | Melanie Thielker | 2009-05-05 04:37:06 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-05 04:37:06 +0000 |
commit | d1c9a41be0c3648251259f955f31cf7a4135e7f7 (patch) | |
tree | be74fc2c39b668577e0b43d05fec2fd2291e9323 | |
parent | Committing the user server executable skeleton (diff) | |
download | opensim-SC_OLD-d1c9a41be0c3648251259f955f31cf7a4135e7f7.zip opensim-SC_OLD-d1c9a41be0c3648251259f955f31cf7a4135e7f7.tar.gz opensim-SC_OLD-d1c9a41be0c3648251259f955f31cf7a4135e7f7.tar.bz2 opensim-SC_OLD-d1c9a41be0c3648251259f955f31cf7a4135e7f7.tar.xz |
Plumb the new server connector logic
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs | 85 | ||||
-rw-r--r-- | OpenSim/Servers/Base/HttpServerBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Servers/Base/ServicesServerBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Servers/User/UserServerConnector.cs | 44 | ||||
-rw-r--r-- | OpenSim/Servers/User/UserServerMain.cs | 11 | ||||
-rw-r--r-- | OpenSim/Services/UserService/UserService.cs | 33 | ||||
-rw-r--r-- | prebuild.xml | 225 |
8 files changed, 295 insertions, 114 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 2920a96..80582be 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
@@ -11,6 +11,7 @@ | |||
11 | <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> | 11 | <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> |
12 | <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> | 12 | <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> |
13 | <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> | 13 | <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> |
14 | <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.LocalUserServicesConnector" /> | ||
14 | </Extension> | 15 | </Extension> |
15 | 16 | ||
16 | <Extension path = "/OpenSim/WindModule"> | 17 | <Extension path = "/OpenSim/WindModule"> |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs new file mode 100644 index 0000000..38f32ed --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs | |||
@@ -0,0 +1,85 @@ | |||
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 Nini.Config; | ||
29 | using OpenSim.Region.Framework.Interfaces; | ||
30 | using OpenSim.Region.Framework.Scenes; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using OpenSim.Services.UserService; | ||
33 | |||
34 | namespace OpenSim.Region.CoreModules.ServiceConnectors.User | ||
35 | { | ||
36 | public class LocalUserServicesConnector : INonSharedRegionModule | ||
37 | { | ||
38 | private IUserServices m_UserServices; | ||
39 | |||
40 | private bool m_Enabled = false; | ||
41 | |||
42 | public string Name | ||
43 | { | ||
44 | get { return "LocalUserServicesConnector"; } | ||
45 | } | ||
46 | |||
47 | public void Initialise(IConfigSource source) | ||
48 | { | ||
49 | IConfig moduleConfig = source.Configs["Modules"]; | ||
50 | if (moduleConfig != null) | ||
51 | { | ||
52 | string name = moduleConfig.GetString("UserServices", ""); | ||
53 | if (name == Name) | ||
54 | { | ||
55 | m_Enabled = true; | ||
56 | m_UserServices = new UserService(source); | ||
57 | } | ||
58 | } | ||
59 | } | ||
60 | |||
61 | public void Close() | ||
62 | { | ||
63 | if (!m_Enabled) | ||
64 | return; | ||
65 | } | ||
66 | |||
67 | public void AddRegion(Scene scene) | ||
68 | { | ||
69 | if (!m_Enabled) | ||
70 | return; | ||
71 | } | ||
72 | |||
73 | public void RemoveRegion(Scene scene) | ||
74 | { | ||
75 | if (!m_Enabled) | ||
76 | return; | ||
77 | } | ||
78 | |||
79 | public void RegionLoaded(Scene scene) | ||
80 | { | ||
81 | if (!m_Enabled) | ||
82 | return; | ||
83 | } | ||
84 | } | ||
85 | } | ||
diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Servers/Base/HttpServerBase.cs index f36c6c9..5286744 100644 --- a/OpenSim/Servers/Base/HttpServerBase.cs +++ b/OpenSim/Servers/Base/HttpServerBase.cs | |||
@@ -47,6 +47,11 @@ namespace OpenSim.Servers.Base | |||
47 | // | 47 | // |
48 | protected BaseHttpServer m_HttpServer = null; | 48 | protected BaseHttpServer m_HttpServer = null; |
49 | 49 | ||
50 | public IHttpServer HttpServer | ||
51 | { | ||
52 | get { return m_HttpServer; } | ||
53 | } | ||
54 | |||
50 | // Handle all the automagical stuff | 55 | // Handle all the automagical stuff |
51 | // | 56 | // |
52 | public HttpServerBase(string prompt, string[] args) : base(prompt, args) | 57 | public HttpServerBase(string prompt, string[] args) : base(prompt, args) |
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs index 2673cbe..b090e8c 100644 --- a/OpenSim/Servers/Base/ServicesServerBase.cs +++ b/OpenSim/Servers/Base/ServicesServerBase.cs | |||
@@ -55,6 +55,11 @@ namespace OpenSim.Servers.Base | |||
55 | // | 55 | // |
56 | protected IConfigSource m_Config = null; | 56 | protected IConfigSource m_Config = null; |
57 | 57 | ||
58 | public IConfigSource Config | ||
59 | { | ||
60 | get { return m_Config; } | ||
61 | } | ||
62 | |||
58 | // Run flag | 63 | // Run flag |
59 | // | 64 | // |
60 | private bool m_Running = true; | 65 | private bool m_Running = true; |
diff --git a/OpenSim/Servers/User/UserServerConnector.cs b/OpenSim/Servers/User/UserServerConnector.cs new file mode 100644 index 0000000..b86fdb7 --- /dev/null +++ b/OpenSim/Servers/User/UserServerConnector.cs | |||
@@ -0,0 +1,44 @@ | |||
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 Nini.Config; | ||
29 | using OpenSim.Services.Interfaces; | ||
30 | using OpenSim.Services.UserService; | ||
31 | using OpenSim.Framework.Servers.HttpServer; | ||
32 | |||
33 | namespace OpenSim.Servers.UserServer | ||
34 | { | ||
35 | public class UserServiceConnector | ||
36 | { | ||
37 | private IUserServices m_UserServices; | ||
38 | |||
39 | public UserServiceConnector(IConfigSource config, IHttpServer server) | ||
40 | { | ||
41 | m_UserServices = new UserService(config); | ||
42 | } | ||
43 | } | ||
44 | } | ||
diff --git a/OpenSim/Servers/User/UserServerMain.cs b/OpenSim/Servers/User/UserServerMain.cs index d4f5e6d..7dea5d7 100644 --- a/OpenSim/Servers/User/UserServerMain.cs +++ b/OpenSim/Servers/User/UserServerMain.cs | |||
@@ -28,16 +28,21 @@ | |||
28 | using System; | 28 | using System; |
29 | using OpenSim.Servers.Base; | 29 | using OpenSim.Servers.Base; |
30 | 30 | ||
31 | namespace OpenSim.Servers.Base | 31 | namespace OpenSim.Servers.UserServer |
32 | { | 32 | { |
33 | public class SimpleServer | 33 | public class UserServer |
34 | { | 34 | { |
35 | protected static ServicesServerBase m_Server = null; | 35 | protected static HttpServerBase m_Server = null; |
36 | |||
37 | protected static UserServiceConnector m_UserServiceConnector; | ||
36 | 38 | ||
37 | static int Main(string[] args) | 39 | static int Main(string[] args) |
38 | { | 40 | { |
39 | m_Server = new HttpServerBase("User", args); | 41 | m_Server = new HttpServerBase("User", args); |
40 | 42 | ||
43 | m_UserServiceConnector = new UserServiceConnector(m_Server.Config, | ||
44 | m_Server.HttpServer); | ||
45 | |||
41 | return m_Server.Run(); | 46 | return m_Server.Run(); |
42 | } | 47 | } |
43 | } | 48 | } |
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs index dc6a81e..07c55ed 100644 --- a/OpenSim/Services/UserService/UserService.cs +++ b/OpenSim/Services/UserService/UserService.cs | |||
@@ -1,8 +1,39 @@ | |||
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 Nini.Config; | ||
1 | using OpenSim.Services.Interfaces; | 29 | using OpenSim.Services.Interfaces; |
2 | 30 | ||
3 | namespace OpenSim.Services.UserService | 31 | namespace OpenSim.Services.UserService |
4 | { | 32 | { |
5 | class UserServiceCore : IUserServices | 33 | public class UserService : IUserServices |
6 | { | 34 | { |
35 | public UserService(IConfigSource config) | ||
36 | { | ||
37 | } | ||
7 | } | 38 | } |
8 | } | 39 | } |
diff --git a/prebuild.xml b/prebuild.xml index 84fc576..6d9a7ea 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1207,6 +1207,119 @@ | |||
1207 | </Files> | 1207 | </Files> |
1208 | </Project> | 1208 | </Project> |
1209 | 1209 | ||
1210 | <Project name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> | ||
1211 | <Configuration name="Debug"> | ||
1212 | <Options> | ||
1213 | <OutputPath>../../../bin/</OutputPath> | ||
1214 | </Options> | ||
1215 | </Configuration> | ||
1216 | <Configuration name="Release"> | ||
1217 | <Options> | ||
1218 | <OutputPath>../../../bin/</OutputPath> | ||
1219 | </Options> | ||
1220 | </Configuration> | ||
1221 | |||
1222 | <ReferencePath>../../../bin/</ReferencePath> | ||
1223 | <Reference name="System"/> | ||
1224 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1225 | <Reference name="OpenMetaverse.dll"/> | ||
1226 | <Reference name="OpenSim.Framework"/> | ||
1227 | <Reference name="OpenSim.Framework.Console"/> | ||
1228 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1229 | <Reference name="Nini.dll" /> | ||
1230 | <Reference name="log4net.dll"/> | ||
1231 | |||
1232 | <Files> | ||
1233 | <Match pattern="*.cs" recurse="true"/> | ||
1234 | </Files> | ||
1235 | </Project> | ||
1236 | |||
1237 | <Project name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library"> | ||
1238 | <Configuration name="Debug"> | ||
1239 | <Options> | ||
1240 | <OutputPath>../../../bin/</OutputPath> | ||
1241 | </Options> | ||
1242 | </Configuration> | ||
1243 | <Configuration name="Release"> | ||
1244 | <Options> | ||
1245 | <OutputPath>../../../bin/</OutputPath> | ||
1246 | </Options> | ||
1247 | </Configuration> | ||
1248 | |||
1249 | <ReferencePath>../../../bin/</ReferencePath> | ||
1250 | <Reference name="System"/> | ||
1251 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1252 | <Reference name="OpenMetaverse.dll"/> | ||
1253 | <Reference name="OpenSim.Framework"/> | ||
1254 | <Reference name="OpenSim.Framework.Console"/> | ||
1255 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1256 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1257 | <Reference name="Nini.dll" /> | ||
1258 | <Reference name="log4net.dll"/> | ||
1259 | |||
1260 | <Files> | ||
1261 | <Match pattern="*.cs" recurse="true"/> | ||
1262 | </Files> | ||
1263 | </Project> | ||
1264 | |||
1265 | <Project name="OpenSim.Servers.Base" path="OpenSim/Servers/Base" type="Library"> | ||
1266 | <Configuration name="Debug"> | ||
1267 | <Options> | ||
1268 | <OutputPath>../../../bin/</OutputPath> | ||
1269 | </Options> | ||
1270 | </Configuration> | ||
1271 | <Configuration name="Release"> | ||
1272 | <Options> | ||
1273 | <OutputPath>../../../bin/</OutputPath> | ||
1274 | </Options> | ||
1275 | </Configuration> | ||
1276 | |||
1277 | <ReferencePath>../../../bin/</ReferencePath> | ||
1278 | <Reference name="System"/> | ||
1279 | <Reference name="System.Xml"/> | ||
1280 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1281 | <Reference name="OpenMetaverse.dll"/> | ||
1282 | <Reference name="OpenSim.Framework"/> | ||
1283 | <Reference name="OpenSim.Framework.Console"/> | ||
1284 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1285 | <Reference name="Nini.dll" /> | ||
1286 | <Reference name="log4net.dll"/> | ||
1287 | |||
1288 | <Files> | ||
1289 | <Match pattern="*.cs" recurse="true"/> | ||
1290 | </Files> | ||
1291 | </Project> | ||
1292 | |||
1293 | <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/User" type="Exe"> | ||
1294 | <Configuration name="Debug"> | ||
1295 | <Options> | ||
1296 | <OutputPath>../../../bin/</OutputPath> | ||
1297 | </Options> | ||
1298 | </Configuration> | ||
1299 | <Configuration name="Release"> | ||
1300 | <Options> | ||
1301 | <OutputPath>../../../bin/</OutputPath> | ||
1302 | </Options> | ||
1303 | </Configuration> | ||
1304 | |||
1305 | <ReferencePath>../../../bin/</ReferencePath> | ||
1306 | <Reference name="System"/> | ||
1307 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1308 | <Reference name="OpenMetaverse.dll"/> | ||
1309 | <Reference name="OpenSim.Framework"/> | ||
1310 | <Reference name="OpenSim.Framework.Console"/> | ||
1311 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1312 | <Reference name="OpenSim.Servers.Base"/> | ||
1313 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1314 | <Reference name="OpenSim.Services.UserService"/> | ||
1315 | <Reference name="Nini.dll" /> | ||
1316 | <Reference name="log4net.dll"/> | ||
1317 | |||
1318 | <Files> | ||
1319 | <Match pattern="*.cs" recurse="true"/> | ||
1320 | </Files> | ||
1321 | </Project> | ||
1322 | |||
1210 | <Project name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | 1323 | <Project name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> |
1211 | <Configuration name="Debug"> | 1324 | <Configuration name="Debug"> |
1212 | <Options> | 1325 | <Options> |
@@ -1232,6 +1345,8 @@ | |||
1232 | <Reference name="OpenSim.Framework.Communications"/> | 1345 | <Reference name="OpenSim.Framework.Communications"/> |
1233 | <Reference name="OpenSim.Data" /> | 1346 | <Reference name="OpenSim.Data" /> |
1234 | <Reference name="OpenSim.Region.Framework" /> | 1347 | <Reference name="OpenSim.Region.Framework" /> |
1348 | <Reference name="OpenSim.Services.Interfaces" /> | ||
1349 | <Reference name="OpenSim.Services.UserService" /> | ||
1235 | <Reference name="OpenSim.Framework.Serialization"/> | 1350 | <Reference name="OpenSim.Framework.Serialization"/> |
1236 | <Reference name="OpenSim.Framework.Console"/> | 1351 | <Reference name="OpenSim.Framework.Console"/> |
1237 | <Reference name="OpenSim.Framework.Servers"/> | 1352 | <Reference name="OpenSim.Framework.Servers"/> |
@@ -2802,116 +2917,6 @@ | |||
2802 | </Files> | 2917 | </Files> |
2803 | </Project> | 2918 | </Project> |
2804 | 2919 | ||
2805 | <Project name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> | ||
2806 | <Configuration name="Debug"> | ||
2807 | <Options> | ||
2808 | <OutputPath>../../../bin/</OutputPath> | ||
2809 | </Options> | ||
2810 | </Configuration> | ||
2811 | <Configuration name="Release"> | ||
2812 | <Options> | ||
2813 | <OutputPath>../../../bin/</OutputPath> | ||
2814 | </Options> | ||
2815 | </Configuration> | ||
2816 | |||
2817 | <ReferencePath>../../../bin/</ReferencePath> | ||
2818 | <Reference name="System"/> | ||
2819 | <Reference name="OpenMetaverseTypes.dll"/> | ||
2820 | <Reference name="OpenMetaverse.dll"/> | ||
2821 | <Reference name="OpenSim.Framework"/> | ||
2822 | <Reference name="OpenSim.Framework.Console"/> | ||
2823 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
2824 | <Reference name="Nini.dll" /> | ||
2825 | <Reference name="log4net.dll"/> | ||
2826 | |||
2827 | <Files> | ||
2828 | <Match pattern="*.cs" recurse="true"/> | ||
2829 | </Files> | ||
2830 | </Project> | ||
2831 | |||
2832 | <Project name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library"> | ||
2833 | <Configuration name="Debug"> | ||
2834 | <Options> | ||
2835 | <OutputPath>../../../bin/</OutputPath> | ||
2836 | </Options> | ||
2837 | </Configuration> | ||
2838 | <Configuration name="Release"> | ||
2839 | <Options> | ||
2840 | <OutputPath>../../../bin/</OutputPath> | ||
2841 | </Options> | ||
2842 | </Configuration> | ||
2843 | |||
2844 | <ReferencePath>../../../bin/</ReferencePath> | ||
2845 | <Reference name="System"/> | ||
2846 | <Reference name="OpenMetaverseTypes.dll"/> | ||
2847 | <Reference name="OpenMetaverse.dll"/> | ||
2848 | <Reference name="OpenSim.Framework"/> | ||
2849 | <Reference name="OpenSim.Framework.Console"/> | ||
2850 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
2851 | <Reference name="OpenSim.Services.Interfaces"/> | ||
2852 | <Reference name="Nini.dll" /> | ||
2853 | <Reference name="log4net.dll"/> | ||
2854 | |||
2855 | <Files> | ||
2856 | <Match pattern="*.cs" recurse="true"/> | ||
2857 | </Files> | ||
2858 | </Project> | ||
2859 | |||
2860 | <Project name="OpenSim.Servers.Base" path="OpenSim/Servers/Base" type="Library"> | ||
2861 | <Configuration name="Debug"> | ||
2862 | <Options> | ||
2863 | <OutputPath>../../../bin/</OutputPath> | ||
2864 | </Options> | ||
2865 | </Configuration> | ||
2866 | <Configuration name="Release"> | ||
2867 | <Options> | ||
2868 | <OutputPath>../../../bin/</OutputPath> | ||
2869 | </Options> | ||
2870 | </Configuration> | ||
2871 | |||
2872 | <ReferencePath>../../../bin/</ReferencePath> | ||
2873 | <Reference name="System"/> | ||
2874 | <Reference name="System.Xml"/> | ||
2875 | <Reference name="OpenMetaverseTypes.dll"/> | ||
2876 | <Reference name="OpenMetaverse.dll"/> | ||
2877 | <Reference name="OpenSim.Framework"/> | ||
2878 | <Reference name="OpenSim.Framework.Console"/> | ||
2879 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
2880 | <Reference name="Nini.dll" /> | ||
2881 | <Reference name="log4net.dll"/> | ||
2882 | |||
2883 | <Files> | ||
2884 | <Match pattern="*.cs" recurse="true"/> | ||
2885 | </Files> | ||
2886 | </Project> | ||
2887 | |||
2888 | <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/User" type="Exe"> | ||
2889 | <Configuration name="Debug"> | ||
2890 | <Options> | ||
2891 | <OutputPath>../../../bin/</OutputPath> | ||
2892 | </Options> | ||
2893 | </Configuration> | ||
2894 | <Configuration name="Release"> | ||
2895 | <Options> | ||
2896 | <OutputPath>../../../bin/</OutputPath> | ||
2897 | </Options> | ||
2898 | </Configuration> | ||
2899 | |||
2900 | <ReferencePath>../../../bin/</ReferencePath> | ||
2901 | <Reference name="System"/> | ||
2902 | <Reference name="OpenMetaverseTypes.dll"/> | ||
2903 | <Reference name="OpenMetaverse.dll"/> | ||
2904 | <Reference name="OpenSim.Framework"/> | ||
2905 | <Reference name="OpenSim.Framework.Console"/> | ||
2906 | <Reference name="OpenSim.Servers.Base"/> | ||
2907 | <Reference name="Nini.dll" /> | ||
2908 | <Reference name="log4net.dll"/> | ||
2909 | |||
2910 | <Files> | ||
2911 | <Match pattern="*.cs" recurse="true"/> | ||
2912 | </Files> | ||
2913 | </Project> | ||
2914 | |||
2915 | <!-- Tools --> | 2920 | <!-- Tools --> |
2916 | 2921 | ||
2917 | <Project name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe"> | 2922 | <Project name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe"> |