aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.GridServer/src
diff options
context:
space:
mode:
authorgareth2007-03-25 00:27:36 +0000
committergareth2007-03-25 00:27:36 +0000
commit11d7cc89a9203a8155f3e71b92162e5d2c09bd99 (patch)
tree34ca2bbd44c5e5cb9d0b416ba5040c553fea1437 /OpenGridServices.GridServer/src
parentMoved gridserver into main trunk (but no prebuild yet) (diff)
downloadopensim-SC_OLD-11d7cc89a9203a8155f3e71b92162e5d2c09bd99.zip
opensim-SC_OLD-11d7cc89a9203a8155f3e71b92162e5d2c09bd99.tar.gz
opensim-SC_OLD-11d7cc89a9203a8155f3e71b92162e5d2c09bd99.tar.bz2
opensim-SC_OLD-11d7cc89a9203a8155f3e71b92162e5d2c09bd99.tar.xz
Finished adding the grid server to prebuild
Diffstat (limited to '')
-rw-r--r--OpenGridServices.GridServer/ConsoleCmds.cs (renamed from OpenGridServices.GridServer/src/ConsoleCmds.cs)0
-rw-r--r--OpenGridServices.GridServer/GridHttp.cs (renamed from OpenGridServices.GridServer/src/GridHttp.cs)0
-rw-r--r--OpenGridServices.GridServer/Properties/AssemblyInfo.cs (renamed from OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices.GridServer/SimProfiles.cs (renamed from OpenGridServices.GridServer/src/SimProfiles.cs)0
-rw-r--r--OpenGridServices.GridServer/src/Main.cs94
-rw-r--r--OpenGridServices.GridServer/src/OGS-GridServer.csproj63
6 files changed, 0 insertions, 157 deletions
diff --git a/OpenGridServices.GridServer/src/ConsoleCmds.cs b/OpenGridServices.GridServer/ConsoleCmds.cs
index 82a2279..82a2279 100644
--- a/OpenGridServices.GridServer/src/ConsoleCmds.cs
+++ b/OpenGridServices.GridServer/ConsoleCmds.cs
diff --git a/OpenGridServices.GridServer/src/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs
index 496a3bc..496a3bc 100644
--- a/OpenGridServices.GridServer/src/GridHttp.cs
+++ b/OpenGridServices.GridServer/GridHttp.cs
diff --git a/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs b/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/OpenGridServices.GridServer/src/Properties/AssemblyInfo.cs
+++ b/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.GridServer/src/SimProfiles.cs b/OpenGridServices.GridServer/SimProfiles.cs
index 6db8331..6db8331 100644
--- a/OpenGridServices.GridServer/src/SimProfiles.cs
+++ b/OpenGridServices.GridServer/SimProfiles.cs
diff --git a/OpenGridServices.GridServer/src/Main.cs b/OpenGridServices.GridServer/src/Main.cs
deleted file mode 100644
index d29a1ae..0000000
--- a/OpenGridServices.GridServer/src/Main.cs
+++ /dev/null
@@ -1,94 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3
4
5* All rights reserved.
6*
7* Redistribution and use in source and binary forms, with or without
8* modification, are permitted provided that the following conditions are met:
9* * Redistributions of source code must retain the above copyright
10* notice, this list of conditions and the following disclaimer.
11* * Redistributions in binary form must reproduce the above copyright
12* notice, this list of conditions and the following disclaimer in the
13* documentation and/or other materials provided with the distribution.
14* * Neither the name of the <organization> nor the
15* names of its contributors may be used to endorse or promote products
16* derived from this software without specific prior written permission.
17*
18* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
19* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
22* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28*/
29
30using System;
31using System.Text;
32using libsecondlife;
33using ServerConsole;
34
35namespace OpenGridServices
36{
37 /// <summary>
38 /// </summary>
39 public class OpenGrid_Main
40 {
41
42 public static OpenGrid_Main thegrid;
43 public string GridOwner;
44 public string DefaultStartupMsg;
45 public string DefaultAssetServer;
46 public string AssetSendKey;
47 public string AssetRecvKey;
48 public string DefaultUserServer;
49 public string UserSendKey;
50 public string UserRecvKey;
51
52 public GridHTTPServer _httpd;
53 public SimProfileManager _regionmanager;
54
55 [STAThread]
56 public static void Main( string[] args )
57 {
58 Console.WriteLine("OpenGrid " + VersionInfo.Version + "\n");
59 Console.WriteLine("Starting...\n");
60 ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenGrid", new GridConsole());
61
62 thegrid = new OpenGrid_Main();
63 thegrid.Startup();
64
65 ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n");
66
67 while(true) {
68 ServerConsole.MainConsole.Instance.MainConsolePrompt();
69 }
70 }
71
72 public void Startup() {
73 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
74
75 this.GridOwner=ServerConsole.MainConsole.Instance.CmdPrompt("Grid owner [OGS development team]: ","OGS development team");
76 this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!]: ","Welcome to OGS!");
77
78 this.DefaultAssetServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default asset server [no default]: ");
79 this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to asset server: ");
80 this.AssetRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from asset server: ");
81
82 this.DefaultUserServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default user server [no default]: ");
83 this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
84 this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
85
86 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process");
87 _httpd = new GridHTTPServer();
88
89 this._regionmanager=new SimProfileManager();
90 _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey);
91
92 }
93 }
94}
diff --git a/OpenGridServices.GridServer/src/OGS-GridServer.csproj b/OpenGridServices.GridServer/src/OGS-GridServer.csproj
deleted file mode 100644
index b957d40..0000000
--- a/OpenGridServices.GridServer/src/OGS-GridServer.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ProductVersion>8.0.50727</ProductVersion>
6 <SchemaVersion>2.0</SchemaVersion>
7 <ProjectGuid>{FE50A574-C8ED-433B-95F0-213A5EED2AB2}</ProjectGuid>
8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>OGS_GridServer</RootNamespace>
11 <AssemblyName>OGS-GridServer</AssemblyName>
12 </PropertyGroup>
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 <DebugSymbols>true</DebugSymbols>
15 <DebugType>full</DebugType>
16 <Optimize>false</Optimize>
17 <OutputPath>bin\Debug\</OutputPath>
18 <DefineConstants>DEBUG;TRACE</DefineConstants>
19 <ErrorReport>prompt</ErrorReport>
20 <WarningLevel>4</WarningLevel>
21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23 <DebugType>pdbonly</DebugType>
24 <Optimize>true</Optimize>
25 <OutputPath>bin\Release\</OutputPath>
26 <DefineConstants>TRACE</DefineConstants>
27 <ErrorReport>prompt</ErrorReport>
28 <WarningLevel>4</WarningLevel>
29 </PropertyGroup>
30 <ItemGroup>
31 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
32 <SpecificVersion>False</SpecificVersion>
33 <HintPath>..\..\common\bin\libsecondlife.dll</HintPath>
34 </Reference>
35 <Reference Include="System" />
36 <Reference Include="System.Data" />
37 <Reference Include="System.Xml" />
38 </ItemGroup>
39 <ItemGroup>
40 <Compile Include="..\..\common\src\OGS-Console.cs">
41 <Link>OGS-Console.cs</Link>
42 </Compile>
43 <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
44 <Link>VersionInfo.cs</Link>
45 </Compile>
46 <Compile Include="ConsoleCmds.cs" />
47 <Compile Include="GridHttp.cs" />
48 <Compile Include="Main.cs" />
49 <Compile Include="Properties\AssemblyInfo.cs" />
50 <Compile Include="SimProfiles.cs" />
51 </ItemGroup>
52 <ItemGroup>
53 <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
54 <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
55 <Name>OpenSim.Framework</Name>
56 </ProjectReference>
57 <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
58 <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
59 <Name>ServerConsole</Name>
60 </ProjectReference>
61 </ItemGroup>
62 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
63</Project> \ No newline at end of file
generated by cgit v1.1 at 2024-11-12 08:03:31 +0000