diff options
author | lbsa71 | 2007-04-11 12:32:58 +0000 |
---|---|---|
committer | lbsa71 | 2007-04-11 12:32:58 +0000 |
commit | c84ddd8b0d9f67926458f27d1f6d40c44ff8f355 (patch) | |
tree | 01a7d667b018f12a52028adf978f660a565f564b /OpenGridServices.GridServer | |
parent | added missing files (diff) | |
download | opensim-SC-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.zip opensim-SC-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.tar.gz opensim-SC-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.tar.bz2 opensim-SC-c84ddd8b0d9f67926458f27d1f6d40c44ff8f355.tar.xz |
* Introduced BaseHttpServer as base for UserHTTPServer and GridHTTPServer
Diffstat (limited to '')
3 files changed, 10 insertions, 2 deletions
diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs index ed56b63..5f8bd56 100644 --- a/OpenGridServices.GridServer/GridHttp.cs +++ b/OpenGridServices.GridServer/GridHttp.cs | |||
@@ -40,14 +40,15 @@ using System.Collections.Generic; | |||
40 | using libsecondlife; | 40 | using libsecondlife; |
41 | using OpenSim.Framework.Sims; | 41 | using OpenSim.Framework.Sims; |
42 | using OpenSim.Framework.Console; | 42 | using OpenSim.Framework.Console; |
43 | using OpenSim.Servers; | ||
43 | 44 | ||
44 | namespace OpenGridServices.GridServer | 45 | namespace OpenGridServices.GridServer |
45 | { | 46 | { |
46 | public class GridHTTPServer { | 47 | public class GridHTTPServer : BaseHttpServer { |
47 | public Thread HTTPD; | 48 | public Thread HTTPD; |
48 | public HttpListener Listener; | 49 | public HttpListener Listener; |
49 | 50 | ||
50 | public GridHTTPServer() { | 51 | public GridHTTPServer() : base( 8001 ) { |
51 | MainConsole.Instance.WriteLine("Starting up HTTP Server"); | 52 | MainConsole.Instance.WriteLine("Starting up HTTP Server"); |
52 | HTTPD = new Thread(new ThreadStart(StartHTTP)); | 53 | HTTPD = new Thread(new ThreadStart(StartHTTP)); |
53 | HTTPD.Start(); | 54 | HTTPD.Start(); |
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 836a98b..96ad76d 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj | |||
@@ -92,6 +92,12 @@ | |||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
95 | <ProjectReference Include="..\Servers\OpenSim.Servers.csproj"> | ||
96 | <Name>OpenSim.Servers</Name> | ||
97 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
99 | <Private>False</Private> | ||
100 | </ProjectReference> | ||
95 | </ItemGroup> | 101 | </ItemGroup> |
96 | <ItemGroup> | 102 | <ItemGroup> |
97 | <Compile Include="GridHttp.cs"> | 103 | <Compile Include="GridHttp.cs"> |
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index 90eaf1f..ece9986 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -26,6 +26,7 @@ | |||
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../bin/OpenSim.Framework.dll" /> | 27 | <include name="../bin/OpenSim.Framework.dll" /> |
28 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
29 | <include name="../bin/OpenSim.Servers.dll" /> | ||
29 | <include name="../bin/libsecondlife.dll" /> | 30 | <include name="../bin/libsecondlife.dll" /> |
30 | <include name="../bin/Db4objects.Db4o.dll" /> | 31 | <include name="../bin/Db4objects.Db4o.dll" /> |
31 | </references> | 32 | </references> |