aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-18 11:43:37 +0000
committerMelanie Thielker2009-05-18 11:43:37 +0000
commitcb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40 (patch)
tree268e2332a35ce9de3cff6ff573f4ad2b807d0d20
parentFrom: Alan Webb <alan_webb@us.ibm.com> (diff)
downloadopensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.zip
opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.tar.gz
opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.tar.bz2
opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.tar.xz
Move the connectors under services for reasons of application logic. Remove
the user server skeleton in preparation for introducing a generic server
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs2
-rw-r--r--OpenSim/Servers/Base/ServicesServerBase.cs5
-rw-r--r--OpenSim/Servers/UserServer/UserServerConnector.cs57
-rw-r--r--OpenSim/Servers/UserServer/UserServerMain.cs49
-rw-r--r--OpenSim/Services/AssetService/HGAssetService.cs2
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs (renamed from OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs)2
-rw-r--r--prebuild.xml36
7 files changed, 10 insertions, 143 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
index ec982e5..e90877b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Servers.Connectors; 34using OpenSim.Services.Connectors;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs
index b090e8c..6129407 100644
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ b/OpenSim/Servers/Base/ServicesServerBase.cs
@@ -125,7 +125,10 @@ namespace OpenSim.Servers.Base
125 125
126 // Refresh the startupConfig post merge 126 // Refresh the startupConfig post merge
127 // 127 //
128 startupConfig = argvConfig.Configs["Startup"]; 128 if (m_Config.Configs["Startup"] != null)
129 {
130 startupConfig = m_Config.Configs["Startup"];
131 }
129 132
130 // Allow derived classes to load config before the console is 133 // Allow derived classes to load config before the console is
131 // opened. 134 // opened.
diff --git a/OpenSim/Servers/UserServer/UserServerConnector.cs b/OpenSim/Servers/UserServer/UserServerConnector.cs
deleted file mode 100644
index 15b09bc..0000000
--- a/OpenSim/Servers/UserServer/UserServerConnector.cs
+++ /dev/null
@@ -1,57 +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
28using System;
29using Nini.Config;
30using OpenSim.Servers.Base;
31using OpenSim.Services.Interfaces;
32using OpenSim.Framework.Servers.HttpServer;
33
34namespace OpenSim.Servers.UserServer
35{
36 public class UserServiceConnector
37 {
38 private IUserService m_UserService;
39
40 public UserServiceConnector(IConfigSource config, IHttpServer server)
41 {
42 IConfig serverConfig = config.Configs["UserService"];
43 if (serverConfig == null)
44 throw new Exception("No section 'Server' in config file");
45
46 string userService = serverConfig.GetString("LocalServiceModule",
47 String.Empty);
48
49 if (userService == String.Empty)
50 throw new Exception("No UserService in config file");
51
52 Object[] args = new Object[] { config };
53 m_UserService =
54 ServerUtils.LoadPlugin<IUserService>(userService, args);
55 }
56 }
57}
diff --git a/OpenSim/Servers/UserServer/UserServerMain.cs b/OpenSim/Servers/UserServer/UserServerMain.cs
deleted file mode 100644
index 7dea5d7..0000000
--- a/OpenSim/Servers/UserServer/UserServerMain.cs
+++ /dev/null
@@ -1,49 +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
28using System;
29using OpenSim.Servers.Base;
30
31namespace OpenSim.Servers.UserServer
32{
33 public class UserServer
34 {
35 protected static HttpServerBase m_Server = null;
36
37 protected static UserServiceConnector m_UserServiceConnector;
38
39 static int Main(string[] args)
40 {
41 m_Server = new HttpServerBase("User", args);
42
43 m_UserServiceConnector = new UserServiceConnector(m_Server.Config,
44 m_Server.HttpServer);
45
46 return m_Server.Run();
47 }
48 }
49}
diff --git a/OpenSim/Services/AssetService/HGAssetService.cs b/OpenSim/Services/AssetService/HGAssetService.cs
index 195c69f..415a0f5 100644
--- a/OpenSim/Services/AssetService/HGAssetService.cs
+++ b/OpenSim/Services/AssetService/HGAssetService.cs
@@ -31,8 +31,8 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Servers.Connectors;
35using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
35using OpenSim.Services.Connectors;
36 36
37namespace OpenSim.Services.AssetService 37namespace OpenSim.Services.AssetService
38{ 38{
diff --git a/OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index df9507a..0903164 100644
--- a/OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers.HttpServer; 36using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38 38
39namespace OpenSim.Servers.Connectors 39namespace OpenSim.Services.Connectors
40{ 40{
41 public class AssetServicesConnector : IAssetService 41 public class AssetServicesConnector : IAssetService
42 { 42 {
diff --git a/prebuild.xml b/prebuild.xml
index 4c7510e..62286aa 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1297,7 +1297,7 @@
1297 </Files> 1297 </Files>
1298 </Project> 1298 </Project>
1299 1299
1300 <Project name="OpenSim.Servers.Connectors" path="OpenSim/Servers/Connectors" type="Library"> 1300 <Project name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
1301 <Configuration name="Debug"> 1301 <Configuration name="Debug">
1302 <Options> 1302 <Options>
1303 <OutputPath>../../../bin/</OutputPath> 1303 <OutputPath>../../../bin/</OutputPath>
@@ -1349,7 +1349,7 @@
1349 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1349 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1350 <Reference name="OpenSim.Services.Interfaces"/> 1350 <Reference name="OpenSim.Services.Interfaces"/>
1351 <Reference name="OpenSim.Services.Base"/> 1351 <Reference name="OpenSim.Services.Base"/>
1352 <Reference name="OpenSim.Servers.Connectors"/> 1352 <Reference name="OpenSim.Services.Connectors"/>
1353 <Reference name="OpenSim.Data"/> 1353 <Reference name="OpenSim.Data"/>
1354 <Reference name="Nini.dll" /> 1354 <Reference name="Nini.dll" />
1355 <Reference name="log4net.dll"/> 1355 <Reference name="log4net.dll"/>
@@ -1387,36 +1387,6 @@
1387 </Files> 1387 </Files>
1388 </Project> 1388 </Project>
1389 1389
1390 <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/UserServer" type="Exe">
1391 <Configuration name="Debug">
1392 <Options>
1393 <OutputPath>../../../bin/</OutputPath>
1394 </Options>
1395 </Configuration>
1396 <Configuration name="Release">
1397 <Options>
1398 <OutputPath>../../../bin/</OutputPath>
1399 </Options>
1400 </Configuration>
1401
1402 <ReferencePath>../../../bin/</ReferencePath>
1403 <Reference name="System"/>
1404 <Reference name="OpenMetaverseTypes.dll"/>
1405 <Reference name="OpenMetaverse.dll"/>
1406 <Reference name="OpenSim.Framework"/>
1407 <Reference name="OpenSim.Framework.Console"/>
1408 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1409 <Reference name="OpenSim.Servers.Base"/>
1410 <Reference name="OpenSim.Services.Base" />
1411 <Reference name="OpenSim.Services.Interfaces"/>
1412 <Reference name="Nini.dll" />
1413 <Reference name="log4net.dll"/>
1414
1415 <Files>
1416 <Match pattern="*.cs" recurse="true"/>
1417 </Files>
1418 </Project>
1419
1420 <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library"> 1390 <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
1421 <Configuration name="Debug"> 1391 <Configuration name="Debug">
1422 <Options> 1392 <Options>
@@ -1506,7 +1476,7 @@
1506 <Reference name="OpenSim.Data" /> 1476 <Reference name="OpenSim.Data" />
1507 <Reference name="OpenSim.Region.Framework" /> 1477 <Reference name="OpenSim.Region.Framework" />
1508 <Reference name="OpenSim.Servers.Base" /> 1478 <Reference name="OpenSim.Servers.Base" />
1509 <Reference name="OpenSim.Servers.Connectors" /> 1479 <Reference name="OpenSim.Services.Connectors" />
1510 <Reference name="OpenSim.Services.Base" /> 1480 <Reference name="OpenSim.Services.Base" />
1511 <Reference name="OpenSim.Services.Interfaces" /> 1481 <Reference name="OpenSim.Services.Interfaces" />
1512 <Reference name="OpenSim.Framework.Serialization"/> 1482 <Reference name="OpenSim.Framework.Serialization"/>