diff options
Diffstat (limited to 'OpenGridServices.GridServer')
-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/Main.cs | 237 | ||||
-rw-r--r-- | OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | 49 | ||||
-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/default.build | 64 | ||||
-rw-r--r-- | OpenGridServices.GridServer/src/Main.cs | 94 | ||||
-rw-r--r-- | OpenGridServices.GridServer/src/OGS-GridServer.csproj | 63 |
9 files changed, 286 insertions, 221 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/Main.cs b/OpenGridServices.GridServer/Main.cs new file mode 100644 index 0000000..de49b1e --- /dev/null +++ b/OpenGridServices.GridServer/Main.cs | |||
@@ -0,0 +1,237 @@ | |||
1 | /* | ||
2 | Copyright (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 | |||
30 | using System; | ||
31 | using System.IO; | ||
32 | using System.Text; | ||
33 | using libsecondlife; | ||
34 | using ServerConsole; | ||
35 | |||
36 | namespace OpenGridServices | ||
37 | { | ||
38 | /// <summary> | ||
39 | /// </summary> | ||
40 | public class OpenGrid_Main | ||
41 | { | ||
42 | |||
43 | public static OpenGrid_Main thegrid; | ||
44 | public string GridOwner; | ||
45 | public string DefaultStartupMsg; | ||
46 | public string DefaultAssetServer; | ||
47 | public string AssetSendKey; | ||
48 | public string AssetRecvKey; | ||
49 | public string DefaultUserServer; | ||
50 | public string UserSendKey; | ||
51 | public string UserRecvKey; | ||
52 | |||
53 | public GridHTTPServer _httpd; | ||
54 | public SimProfileManager _regionmanager; | ||
55 | |||
56 | [STAThread] | ||
57 | public static void Main( string[] args ) | ||
58 | { | ||
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 | /// <summary> | ||
95 | /// Description of ServerConsole. | ||
96 | /// </summary> | ||
97 | public class MServerConsole : ConsoleBase | ||
98 | { | ||
99 | |||
100 | private ConsoleType ConsType; | ||
101 | StreamWriter Log; | ||
102 | public conscmd_callback cmdparser; | ||
103 | public string componentname; | ||
104 | |||
105 | // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! | ||
106 | // constype - the type of console to use (see enum ConsoleType) | ||
107 | // sparam - depending on the console type: | ||
108 | // TCP - the IP to bind to (127.0.0.1 if blank) | ||
109 | // Local - param ignored | ||
110 | // and for the iparam: | ||
111 | // TCP - the port to bind to | ||
112 | // Local - param ignored | ||
113 | // LogFile - duh | ||
114 | // componentname - which component of the OGS system? (user, asset etc) | ||
115 | // cmdparser - a reference to a conscmd_callback object | ||
116 | |||
117 | public MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) { | ||
118 | ConsType = constype; | ||
119 | this.componentname = componentname; | ||
120 | this.cmdparser = cmdparser; | ||
121 | switch(constype) { | ||
122 | case ConsoleType.Local: | ||
123 | Console.WriteLine("ServerConsole.cs - creating new local console"); | ||
124 | Console.WriteLine("Logs will be saved to current directory in " + LogFile); | ||
125 | Log=File.AppendText(LogFile); | ||
126 | Log.WriteLine("========================================================================"); | ||
127 | Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString()); | ||
128 | break; | ||
129 | |||
130 | case ConsoleType.TCP: | ||
131 | break; | ||
132 | |||
133 | default: | ||
134 | Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); | ||
135 | break; | ||
136 | } | ||
137 | } | ||
138 | |||
139 | public override void Close() { | ||
140 | Log.WriteLine("Shutdown at " + DateTime.Now.ToString()); | ||
141 | Log.Close(); | ||
142 | } | ||
143 | |||
144 | // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here | ||
145 | public override void WriteLine(string Line) { | ||
146 | Log.WriteLine(Line); | ||
147 | Console.WriteLine(Line); | ||
148 | return; | ||
149 | } | ||
150 | |||
151 | public override string ReadLine() { | ||
152 | string TempStr=Console.ReadLine(); | ||
153 | Log.WriteLine(TempStr); | ||
154 | return TempStr; | ||
155 | } | ||
156 | |||
157 | public override int Read() { | ||
158 | int TempInt= Console.Read(); | ||
159 | Log.Write((char)TempInt); | ||
160 | return TempInt; | ||
161 | } | ||
162 | |||
163 | public override void Write(string Line) { | ||
164 | Console.Write(Line); | ||
165 | Log.Write(Line); | ||
166 | return; | ||
167 | } | ||
168 | |||
169 | |||
170 | // Displays a prompt and waits for the user to enter a string, then returns that string | ||
171 | // Done with no echo and suitable for passwords | ||
172 | public override string PasswdPrompt(string prompt) { | ||
173 | // FIXME: Needs to be better abstracted | ||
174 | Log.WriteLine(prompt); | ||
175 | this.Write(prompt); | ||
176 | ConsoleColor oldfg=Console.ForegroundColor; | ||
177 | Console.ForegroundColor=Console.BackgroundColor; | ||
178 | string temp=Console.ReadLine(); | ||
179 | Console.ForegroundColor=oldfg; | ||
180 | return temp; | ||
181 | } | ||
182 | |||
183 | // Displays a command prompt and waits for the user to enter a string, then returns that string | ||
184 | public override string CmdPrompt(string prompt) { | ||
185 | this.Write(prompt); | ||
186 | return this.ReadLine(); | ||
187 | } | ||
188 | |||
189 | // Displays a command prompt and returns a default value if the user simply presses enter | ||
190 | public override string CmdPrompt(string prompt, string defaultresponse) { | ||
191 | string temp=CmdPrompt(prompt); | ||
192 | if(temp=="") { | ||
193 | return defaultresponse; | ||
194 | } else { | ||
195 | return temp; | ||
196 | } | ||
197 | } | ||
198 | |||
199 | // Displays a command prompt and returns a default value, user may only enter 1 of 2 options | ||
200 | public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) { | ||
201 | bool itisdone=false; | ||
202 | string temp=CmdPrompt(prompt,defaultresponse); | ||
203 | while(itisdone==false) { | ||
204 | if((temp==OptionA) || (temp==OptionB)) { | ||
205 | itisdone=true; | ||
206 | } else { | ||
207 | this.WriteLine("Valid options are " + OptionA + " or " + OptionB); | ||
208 | temp=CmdPrompt(prompt,defaultresponse); | ||
209 | } | ||
210 | } | ||
211 | return temp; | ||
212 | } | ||
213 | |||
214 | // Runs a command with a number of parameters | ||
215 | public override Object RunCmd(string Cmd, string[] cmdparams) { | ||
216 | cmdparser.RunCmd(Cmd, cmdparams); | ||
217 | return null; | ||
218 | } | ||
219 | |||
220 | // Shows data about something | ||
221 | public override void ShowCommands(string ShowWhat) { | ||
222 | cmdparser.Show(ShowWhat); | ||
223 | } | ||
224 | |||
225 | public override void MainConsolePrompt() { | ||
226 | string[] tempstrarray; | ||
227 | string tempstr = this.CmdPrompt(this.componentname + "# "); | ||
228 | tempstrarray = tempstr.Split(' '); | ||
229 | string cmd=tempstrarray[0]; | ||
230 | Array.Reverse(tempstrarray); | ||
231 | Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1); | ||
232 | Array.Reverse(tempstrarray); | ||
233 | string[] cmdparams=(string[])tempstrarray; | ||
234 | RunCmd(cmd,cmdparams); | ||
235 | } | ||
236 | } | ||
237 | } | ||
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build new file mode 100644 index 0000000..e119279 --- /dev/null +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -0,0 +1,49 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenGridServices.GridServer" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="ConsoleCmds.cs" /> | ||
15 | <include name="GridHttp.cs" /> | ||
16 | <include name="Main.cs" /> | ||
17 | <include name="SimProfiles.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | ||
19 | </sources> | ||
20 | <references basedir="${project::get-base-directory()}"> | ||
21 | <lib> | ||
22 | <include name="${project::get-base-directory()}" /> | ||
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
24 | </lib> | ||
25 | <include name="System.dll" /> | ||
26 | <include name="System.Data.dll" /> | ||
27 | <include name="System.Xml.dll" /> | ||
28 | <include name="../bin/OpenSim.Framework.dll" /> | ||
29 | <include name="../bin/OpenSim.Framework.Console.dll" /> | ||
30 | <include name="../bin/OpenGridServices.ServerConsole.dll" /> | ||
31 | <include name="../bin/libsecondlife.dll" /> | ||
32 | </references> | ||
33 | </csc> | ||
34 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | ||
35 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | ||
36 | <copy todir="${project::get-base-directory()}/../bin/"> | ||
37 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
38 | <include name="*.dll"/> | ||
39 | <include name="*.exe"/> | ||
40 | </fileset> | ||
41 | </copy> | ||
42 | </target> | ||
43 | <target name="clean"> | ||
44 | <delete dir="${bin.dir}" failonerror="false" /> | ||
45 | <delete dir="${obj.dir}" failonerror="false" /> | ||
46 | </target> | ||
47 | <target name="doc" description="Creates documentation."> | ||
48 | </target> | ||
49 | </project> | ||
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/default.build b/OpenGridServices.GridServer/default.build deleted file mode 100644 index b113b83..0000000 --- a/OpenGridServices.GridServer/default.build +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="GridServer" default="build" basedir="./"> | ||
3 | <property name="debug" value="true" overwrite="false" /> | ||
4 | <target name="clean" description="remove all generated files"> | ||
5 | <delete> | ||
6 | <fileset failonempty="false"> | ||
7 | <include name="bin/*.dll" /> | ||
8 | <include name="bin/*.exe" /> | ||
9 | <include name="bin/*.mdb" /> | ||
10 | </fileset> | ||
11 | </delete> | ||
12 | </target> | ||
13 | |||
14 | <target name="svnupdate" description="updates to latest SVN"> | ||
15 | <exec program="svn"> | ||
16 | <arg value="update" /> | ||
17 | </exec> | ||
18 | </target> | ||
19 | |||
20 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
21 | |||
22 | </target> | ||
23 | |||
24 | <target name="build" description="compiles the source code"> | ||
25 | |||
26 | <loadfile file="../VERSION" property="svnver"/> | ||
27 | <asminfo output="src/AssemblyInfo.cs" language="CSharp"> | ||
28 | <imports> | ||
29 | <import namespace="System" /> | ||
30 | <import namespace="System.Reflection" /> | ||
31 | <import namespace="System.Runtime.InteropServices" /> | ||
32 | </imports> | ||
33 | <attributes> | ||
34 | <attribute type="ComVisibleAttribute" value="false" /> | ||
35 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
36 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
37 | <attribute type="AssemblyTitleAttribute" value="ogs-GridServer" /> | ||
38 | <attribute type="AssemblyDescriptionAttribute" value="The core OGS Grid Server" /> | ||
39 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
40 | </attributes> | ||
41 | </asminfo> | ||
42 | |||
43 | <csc target="exe" output="bin/GridServer.exe" debug="${debug}" verbose="true" warninglevel="4"> | ||
44 | <references failonempty="true"> | ||
45 | <include name="System" /> | ||
46 | <include name="System.Xml" /> | ||
47 | <include name="../common/bin/ServerConsole.dll" /> | ||
48 | <include name="../common/bin/libsecondlife.dll" /> | ||
49 | </references> | ||
50 | <sources> | ||
51 | <include name="../common/src/VersionInfo.cs" /> | ||
52 | <include name="../common/src/OGS-Console.cs" /> | ||
53 | <include name="../common/src/Util.cs" /> | ||
54 | <include name="src/*.cs" /> | ||
55 | </sources> | ||
56 | </csc> | ||
57 | |||
58 | <copy todir="bin/"> | ||
59 | <fileset basedir="../common/bin"> | ||
60 | <include name="*.*" /> | ||
61 | </fileset> | ||
62 | </copy> | ||
63 | </target> | ||
64 | </project> | ||
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 | /* | ||
2 | Copyright (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 | |||
30 | using System; | ||
31 | using System.Text; | ||
32 | using libsecondlife; | ||
33 | using ServerConsole; | ||
34 | |||
35 | namespace 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 | ||