diff options
Diffstat (limited to '')
-rw-r--r-- | OGS/OGS.sln | 38 | ||||
-rw-r--r-- | OGS/ServerConsole/Properties/AssemblyInfo.cs | 33 | ||||
-rw-r--r-- | OGS/ServerConsole/ServerConsole.cs | 98 | ||||
-rw-r--r-- | OGS/ServerConsole/ServerConsole.csproj | 40 | ||||
-rw-r--r-- | OGS/ServerConsole/default.build | 48 | ||||
-rw-r--r-- | OGS/common/OGS-Console.cs | 181 | ||||
-rw-r--r-- | OGS/common/VersionInfo/VersionInfo.cs | 37 | ||||
-rw-r--r-- | OGS/common/bin/ServerConsole.dll | bin | 16384 -> 0 bytes | |||
-rw-r--r-- | OGS/common/bin/ServerConsole.pdb | bin | 11776 -> 0 bytes | |||
-rw-r--r-- | OGS/common/bin/libsecondlife.dll | bin | 2338816 -> 0 bytes | |||
-rw-r--r-- | OGS/common/src/OGS-Console.cs | 181 | ||||
-rw-r--r-- | OGS/common/src/VersionInfo.cs.template | 37 |
12 files changed, 0 insertions, 693 deletions
diff --git a/OGS/OGS.sln b/OGS/OGS.sln deleted file mode 100644 index 20eb03a..0000000 --- a/OGS/OGS.sln +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 9.00 | ||
3 | # Visual C# Express 2005 | ||
4 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-UserServer", "userserver\src\OGS-UserServer.csproj", "{D45B6E48-5668-478D-B9CB-6D46E665FACF}" | ||
5 | EndProject | ||
6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}" | ||
7 | EndProject | ||
8 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole\ServerConsole.csproj", "{7667E6E2-F227-41A2-B1B2-315613E1BAFC}" | ||
9 | EndProject | ||
10 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "..\OpenSim.FrameWork\OpenSim.Framework.csproj", "{2E46A825-3168-492F-93BC-637126B5B72B}" | ||
11 | EndProject | ||
12 | Global | ||
13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
14 | Debug|Any CPU = Debug|Any CPU | ||
15 | Release|Any CPU = Release|Any CPU | ||
16 | EndGlobalSection | ||
17 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
18 | {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
19 | {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
20 | {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
21 | {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.Build.0 = Release|Any CPU | ||
22 | {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
23 | {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
24 | {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
25 | {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.Build.0 = Release|Any CPU | ||
26 | {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
27 | {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
28 | {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
29 | {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
30 | {2E46A825-3168-492F-93BC-637126B5B72B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
31 | {2E46A825-3168-492F-93BC-637126B5B72B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
32 | {2E46A825-3168-492F-93BC-637126B5B72B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
33 | {2E46A825-3168-492F-93BC-637126B5B72B}.Release|Any CPU.Build.0 = Release|Any CPU | ||
34 | EndGlobalSection | ||
35 | GlobalSection(SolutionProperties) = preSolution | ||
36 | HideSolutionNode = FALSE | ||
37 | EndGlobalSection | ||
38 | EndGlobal | ||
diff --git a/OGS/ServerConsole/Properties/AssemblyInfo.cs b/OGS/ServerConsole/Properties/AssemblyInfo.cs deleted file mode 100644 index 0028e2a..0000000 --- a/OGS/ServerConsole/Properties/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("ServerConsole")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("ServerConsole")] | ||
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("c4d85def-4c2e-449d-bf4a-449b8cf03736")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | [assembly: AssemblyVersion("1.0.0.0")] | ||
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/OGS/ServerConsole/ServerConsole.cs b/OGS/ServerConsole/ServerConsole.cs deleted file mode 100644 index d50a7e2..0000000 --- a/OGS/ServerConsole/ServerConsole.cs +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) OpenSim project, http://sim.opensecondlife.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | * | ||
26 | */ | ||
27 | using System; | ||
28 | |||
29 | namespace ServerConsole | ||
30 | { | ||
31 | public class MainConsole { | ||
32 | |||
33 | private static ConsoleBase instance; | ||
34 | |||
35 | public static ConsoleBase Instance | ||
36 | { | ||
37 | get | ||
38 | { | ||
39 | return instance; | ||
40 | } | ||
41 | set | ||
42 | { | ||
43 | instance = value; | ||
44 | } | ||
45 | } | ||
46 | |||
47 | public MainConsole() | ||
48 | { | ||
49 | |||
50 | } | ||
51 | } | ||
52 | |||
53 | public abstract class conscmd_callback { | ||
54 | public abstract void RunCmd(string cmd, string[] cmdparams); | ||
55 | public abstract void Show(string ShowWhat); | ||
56 | } | ||
57 | |||
58 | public abstract class ConsoleBase | ||
59 | { | ||
60 | |||
61 | public enum ConsoleType { | ||
62 | Local, // Use stdio | ||
63 | TCP, // Use TCP/telnet | ||
64 | SimChat // Use in-world chat (for gods) | ||
65 | } | ||
66 | |||
67 | public abstract void Close(); | ||
68 | |||
69 | // 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 | ||
70 | public abstract void WriteLine(string Line) ; | ||
71 | |||
72 | public abstract string ReadLine(); | ||
73 | |||
74 | public abstract int Read() ; | ||
75 | |||
76 | public abstract void Write(string Line) ; | ||
77 | |||
78 | public abstract string PasswdPrompt(string prompt); | ||
79 | |||
80 | // Displays a command prompt and waits for the user to enter a string, then returns that string | ||
81 | public abstract string CmdPrompt(string prompt) ; | ||
82 | |||
83 | // Displays a command prompt and returns a default value if the user simply presses enter | ||
84 | public abstract string CmdPrompt(string prompt, string defaultresponse); | ||
85 | |||
86 | // Displays a command prompt and returns a default value, user may only enter 1 of 2 options | ||
87 | public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) ; | ||
88 | |||
89 | // Runs a command with a number of parameters | ||
90 | public abstract Object RunCmd(string Cmd, string[] cmdparams) ; | ||
91 | |||
92 | // Shows data about something | ||
93 | public abstract void ShowCommands(string ShowWhat) ; | ||
94 | |||
95 | // Displays a prompt to the user and then runs the command they entered | ||
96 | public abstract void MainConsolePrompt() ; | ||
97 | } | ||
98 | } | ||
diff --git a/OGS/ServerConsole/ServerConsole.csproj b/OGS/ServerConsole/ServerConsole.csproj deleted file mode 100644 index d23ca52..0000000 --- a/OGS/ServerConsole/ServerConsole.csproj +++ /dev/null | |||
@@ -1,40 +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>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</ProjectGuid> | ||
8 | <OutputType>Library</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>ServerConsole</RootNamespace> | ||
11 | <AssemblyName>ServerConsole</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>..\common\bin\</OutputPath> | ||
26 | <DefineConstants>TRACE</DefineConstants> | ||
27 | <ErrorReport>prompt</ErrorReport> | ||
28 | <WarningLevel>4</WarningLevel> | ||
29 | </PropertyGroup> | ||
30 | <ItemGroup> | ||
31 | <Reference Include="System" /> | ||
32 | <Reference Include="System.Data" /> | ||
33 | <Reference Include="System.Xml" /> | ||
34 | </ItemGroup> | ||
35 | <ItemGroup> | ||
36 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
37 | <Compile Include="ServerConsole.cs" /> | ||
38 | </ItemGroup> | ||
39 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
40 | </Project> \ No newline at end of file | ||
diff --git a/OGS/ServerConsole/default.build b/OGS/ServerConsole/default.build deleted file mode 100644 index 64a4f04..0000000 --- a/OGS/ServerConsole/default.build +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="ServerConsole" default="build" basedir="."> | ||
3 | <property name="debug" value="true" overwrite="false" /> | ||
4 | <target name="clean" description="remove all generated files"> | ||
5 | <delete file="../common/bin/ServerConsole.dll" failonerror="false" /> | ||
6 | <delete file="../common/bin/ServerConsole.dll.mdb" failonerror="false" /> | ||
7 | </target> | ||
8 | |||
9 | <target name="svnupdate" description="updates to latest SVN"> | ||
10 | <exec program="svn"> | ||
11 | <arg value="update" /> | ||
12 | </exec> | ||
13 | </target> | ||
14 | |||
15 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
16 | |||
17 | </target> | ||
18 | |||
19 | <target name="build" description="compiles the source code"> | ||
20 | |||
21 | <loadfile file="../VERSION" property="svnver"/> | ||
22 | <asminfo output="AssemblyInfo.cs" language="CSharp"> | ||
23 | <imports> | ||
24 | <import namespace="System" /> | ||
25 | <import namespace="System.Reflection" /> | ||
26 | <import namespace="System.Runtime.InteropServices" /> | ||
27 | </imports> | ||
28 | <attributes> | ||
29 | <attribute type="ComVisibleAttribute" value="false" /> | ||
30 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
31 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
32 | <attribute type="AssemblyTitleAttribute" value="ogs-serverconsole" /> | ||
33 | <attribute type="AssemblyDescriptionAttribute" value="The default server console" /> | ||
34 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
35 | </attributes> | ||
36 | </asminfo> | ||
37 | |||
38 | <csc target="library" output="../common/bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4"> | ||
39 | <references> | ||
40 | <include name="System" /> | ||
41 | <include name="System.Xml" /> | ||
42 | </references> | ||
43 | <sources> | ||
44 | <include name="*.cs" /> | ||
45 | </sources> | ||
46 | </csc> | ||
47 | </target> | ||
48 | </project> | ||
diff --git a/OGS/common/OGS-Console.cs b/OGS/common/OGS-Console.cs deleted file mode 100644 index c35c75c..0000000 --- a/OGS/common/OGS-Console.cs +++ /dev/null | |||
@@ -1,181 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) OpenSim project, http://sim.opensecondlife.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | * | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | ||
32 | using System.IO; | ||
33 | using System.Net; | ||
34 | using ServerConsole; | ||
35 | |||
36 | namespace OpenGridServices | ||
37 | { | ||
38 | /// <summary> | ||
39 | /// Description of ServerConsole. | ||
40 | /// </summary> | ||
41 | public class MServerConsole : ConsoleBase | ||
42 | { | ||
43 | |||
44 | private ConsoleType ConsType; | ||
45 | StreamWriter Log; | ||
46 | public conscmd_callback cmdparser; | ||
47 | public string componentname; | ||
48 | |||
49 | // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! | ||
50 | // constype - the type of console to use (see enum ConsoleType) | ||
51 | // sparam - depending on the console type: | ||
52 | // TCP - the IP to bind to (127.0.0.1 if blank) | ||
53 | // Local - param ignored | ||
54 | // and for the iparam: | ||
55 | // TCP - the port to bind to | ||
56 | // Local - param ignored | ||
57 | // LogFile - duh | ||
58 | // componentname - which component of the OGS system? (user, asset etc) | ||
59 | // cmdparser - a reference to a conscmd_callback object | ||
60 | |||
61 | public MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) { | ||
62 | ConsType = constype; | ||
63 | this.componentname = componentname; | ||
64 | this.cmdparser = cmdparser; | ||
65 | switch(constype) { | ||
66 | case ConsoleType.Local: | ||
67 | Console.WriteLine("ServerConsole.cs - creating new local console"); | ||
68 | Console.WriteLine("Logs will be saved to current directory in " + LogFile); | ||
69 | Log=File.AppendText(LogFile); | ||
70 | Log.WriteLine("========================================================================"); | ||
71 | Log.WriteLine(componentname + " " + VersionInfo.Version + " Started at " + DateTime.Now.ToString()); | ||
72 | break; | ||
73 | |||
74 | case ConsoleType.TCP: | ||
75 | break; | ||
76 | |||
77 | default: | ||
78 | Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); | ||
79 | break; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | public override void Close() { | ||
84 | Log.WriteLine("Shutdown at " + DateTime.Now.ToString()); | ||
85 | Log.Close(); | ||
86 | } | ||
87 | |||
88 | // 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 | ||
89 | public override void WriteLine(string Line) { | ||
90 | Log.WriteLine(Line); | ||
91 | Console.WriteLine(Line); | ||
92 | return; | ||
93 | } | ||
94 | |||
95 | public override string ReadLine() { | ||
96 | string TempStr=Console.ReadLine(); | ||
97 | Log.WriteLine(TempStr); | ||
98 | return TempStr; | ||
99 | } | ||
100 | |||
101 | public override int Read() { | ||
102 | int TempInt= Console.Read(); | ||
103 | Log.Write((char)TempInt); | ||
104 | return TempInt; | ||
105 | } | ||
106 | |||
107 | public override void Write(string Line) { | ||
108 | Console.Write(Line); | ||
109 | Log.Write(Line); | ||
110 | return; | ||
111 | } | ||
112 | |||
113 | |||
114 | // Displays a prompt and waits for the user to enter a string, then returns that string | ||
115 | // Done with no echo and suitable for passwords | ||
116 | public override string PasswdPrompt(string prompt) { | ||
117 | // FIXME: Needs to be better abstracted | ||
118 | Log.WriteLine(prompt); | ||
119 | this.Write(prompt); | ||
120 | ConsoleColor oldfg=Console.ForegroundColor; | ||
121 | Console.ForegroundColor=Console.BackgroundColor; | ||
122 | string temp=Console.ReadLine(); | ||
123 | Console.ForegroundColor=oldfg; | ||
124 | return temp; | ||
125 | } | ||
126 | |||
127 | // Displays a command prompt and waits for the user to enter a string, then returns that string | ||
128 | public override string CmdPrompt(string prompt) { | ||
129 | this.Write(prompt); | ||
130 | return this.ReadLine(); | ||
131 | } | ||
132 | |||
133 | // Displays a command prompt and returns a default value if the user simply presses enter | ||
134 | public override string CmdPrompt(string prompt, string defaultresponse) { | ||
135 | string temp=CmdPrompt(prompt); | ||
136 | if(temp=="") { | ||
137 | return defaultresponse; | ||
138 | } else { | ||
139 | return temp; | ||
140 | } | ||
141 | } | ||
142 | |||
143 | // Displays a command prompt and returns a default value, user may only enter 1 of 2 options | ||
144 | public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) { | ||
145 | bool itisdone=false; | ||
146 | string temp=CmdPrompt(prompt,defaultresponse); | ||
147 | while(itisdone==false) { | ||
148 | if((temp==OptionA) || (temp==OptionB)) { | ||
149 | itisdone=true; | ||
150 | } else { | ||
151 | this.WriteLine("Valid options are " + OptionA + " or " + OptionB); | ||
152 | temp=CmdPrompt(prompt,defaultresponse); | ||
153 | } | ||
154 | } | ||
155 | return temp; | ||
156 | } | ||
157 | |||
158 | // Runs a command with a number of parameters | ||
159 | public override Object RunCmd(string Cmd, string[] cmdparams) { | ||
160 | cmdparser.RunCmd(Cmd, cmdparams); | ||
161 | return null; | ||
162 | } | ||
163 | |||
164 | // Shows data about something | ||
165 | public override void ShowCommands(string ShowWhat) { | ||
166 | cmdparser.Show(ShowWhat); | ||
167 | } | ||
168 | |||
169 | public override void MainConsolePrompt() { | ||
170 | string[] tempstrarray; | ||
171 | string tempstr = this.CmdPrompt(this.componentname + "# "); | ||
172 | tempstrarray = tempstr.Split(' '); | ||
173 | string cmd=tempstrarray[0]; | ||
174 | Array.Reverse(tempstrarray); | ||
175 | Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1); | ||
176 | Array.Reverse(tempstrarray); | ||
177 | string[] cmdparams=(string[])tempstrarray; | ||
178 | RunCmd(cmd,cmdparams); | ||
179 | } | ||
180 | } | ||
181 | } | ||
diff --git a/OGS/common/VersionInfo/VersionInfo.cs b/OGS/common/VersionInfo/VersionInfo.cs deleted file mode 100644 index 9763e62..0000000 --- a/OGS/common/VersionInfo/VersionInfo.cs +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | */ | ||
26 | |||
27 | using System; | ||
28 | |||
29 | namespace OpenGridServices | ||
30 | { | ||
31 | /// <summary> | ||
32 | /// </summary> | ||
33 | public class VersionInfo | ||
34 | { | ||
35 | public static string Version = "0.1, Build 1173843165, Revision 193:206M"; | ||
36 | } | ||
37 | } | ||
diff --git a/OGS/common/bin/ServerConsole.dll b/OGS/common/bin/ServerConsole.dll deleted file mode 100644 index 842e0d0..0000000 --- a/OGS/common/bin/ServerConsole.dll +++ /dev/null | |||
Binary files differ | |||
diff --git a/OGS/common/bin/ServerConsole.pdb b/OGS/common/bin/ServerConsole.pdb deleted file mode 100644 index b0f3b63..0000000 --- a/OGS/common/bin/ServerConsole.pdb +++ /dev/null | |||
Binary files differ | |||
diff --git a/OGS/common/bin/libsecondlife.dll b/OGS/common/bin/libsecondlife.dll deleted file mode 100644 index 89d692a..0000000 --- a/OGS/common/bin/libsecondlife.dll +++ /dev/null | |||
Binary files differ | |||
diff --git a/OGS/common/src/OGS-Console.cs b/OGS/common/src/OGS-Console.cs deleted file mode 100644 index c35c75c..0000000 --- a/OGS/common/src/OGS-Console.cs +++ /dev/null | |||
@@ -1,181 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) OpenSim project, http://sim.opensecondlife.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | * | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | ||
32 | using System.IO; | ||
33 | using System.Net; | ||
34 | using ServerConsole; | ||
35 | |||
36 | namespace OpenGridServices | ||
37 | { | ||
38 | /// <summary> | ||
39 | /// Description of ServerConsole. | ||
40 | /// </summary> | ||
41 | public class MServerConsole : ConsoleBase | ||
42 | { | ||
43 | |||
44 | private ConsoleType ConsType; | ||
45 | StreamWriter Log; | ||
46 | public conscmd_callback cmdparser; | ||
47 | public string componentname; | ||
48 | |||
49 | // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! | ||
50 | // constype - the type of console to use (see enum ConsoleType) | ||
51 | // sparam - depending on the console type: | ||
52 | // TCP - the IP to bind to (127.0.0.1 if blank) | ||
53 | // Local - param ignored | ||
54 | // and for the iparam: | ||
55 | // TCP - the port to bind to | ||
56 | // Local - param ignored | ||
57 | // LogFile - duh | ||
58 | // componentname - which component of the OGS system? (user, asset etc) | ||
59 | // cmdparser - a reference to a conscmd_callback object | ||
60 | |||
61 | public MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) { | ||
62 | ConsType = constype; | ||
63 | this.componentname = componentname; | ||
64 | this.cmdparser = cmdparser; | ||
65 | switch(constype) { | ||
66 | case ConsoleType.Local: | ||
67 | Console.WriteLine("ServerConsole.cs - creating new local console"); | ||
68 | Console.WriteLine("Logs will be saved to current directory in " + LogFile); | ||
69 | Log=File.AppendText(LogFile); | ||
70 | Log.WriteLine("========================================================================"); | ||
71 | Log.WriteLine(componentname + " " + VersionInfo.Version + " Started at " + DateTime.Now.ToString()); | ||
72 | break; | ||
73 | |||
74 | case ConsoleType.TCP: | ||
75 | break; | ||
76 | |||
77 | default: | ||
78 | Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); | ||
79 | break; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | public override void Close() { | ||
84 | Log.WriteLine("Shutdown at " + DateTime.Now.ToString()); | ||
85 | Log.Close(); | ||
86 | } | ||
87 | |||
88 | // 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 | ||
89 | public override void WriteLine(string Line) { | ||
90 | Log.WriteLine(Line); | ||
91 | Console.WriteLine(Line); | ||
92 | return; | ||
93 | } | ||
94 | |||
95 | public override string ReadLine() { | ||
96 | string TempStr=Console.ReadLine(); | ||
97 | Log.WriteLine(TempStr); | ||
98 | return TempStr; | ||
99 | } | ||
100 | |||
101 | public override int Read() { | ||
102 | int TempInt= Console.Read(); | ||
103 | Log.Write((char)TempInt); | ||
104 | return TempInt; | ||
105 | } | ||
106 | |||
107 | public override void Write(string Line) { | ||
108 | Console.Write(Line); | ||
109 | Log.Write(Line); | ||
110 | return; | ||
111 | } | ||
112 | |||
113 | |||
114 | // Displays a prompt and waits for the user to enter a string, then returns that string | ||
115 | // Done with no echo and suitable for passwords | ||
116 | public override string PasswdPrompt(string prompt) { | ||
117 | // FIXME: Needs to be better abstracted | ||
118 | Log.WriteLine(prompt); | ||
119 | this.Write(prompt); | ||
120 | ConsoleColor oldfg=Console.ForegroundColor; | ||
121 | Console.ForegroundColor=Console.BackgroundColor; | ||
122 | string temp=Console.ReadLine(); | ||
123 | Console.ForegroundColor=oldfg; | ||
124 | return temp; | ||
125 | } | ||
126 | |||
127 | // Displays a command prompt and waits for the user to enter a string, then returns that string | ||
128 | public override string CmdPrompt(string prompt) { | ||
129 | this.Write(prompt); | ||
130 | return this.ReadLine(); | ||
131 | } | ||
132 | |||
133 | // Displays a command prompt and returns a default value if the user simply presses enter | ||
134 | public override string CmdPrompt(string prompt, string defaultresponse) { | ||
135 | string temp=CmdPrompt(prompt); | ||
136 | if(temp=="") { | ||
137 | return defaultresponse; | ||
138 | } else { | ||
139 | return temp; | ||
140 | } | ||
141 | } | ||
142 | |||
143 | // Displays a command prompt and returns a default value, user may only enter 1 of 2 options | ||
144 | public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) { | ||
145 | bool itisdone=false; | ||
146 | string temp=CmdPrompt(prompt,defaultresponse); | ||
147 | while(itisdone==false) { | ||
148 | if((temp==OptionA) || (temp==OptionB)) { | ||
149 | itisdone=true; | ||
150 | } else { | ||
151 | this.WriteLine("Valid options are " + OptionA + " or " + OptionB); | ||
152 | temp=CmdPrompt(prompt,defaultresponse); | ||
153 | } | ||
154 | } | ||
155 | return temp; | ||
156 | } | ||
157 | |||
158 | // Runs a command with a number of parameters | ||
159 | public override Object RunCmd(string Cmd, string[] cmdparams) { | ||
160 | cmdparser.RunCmd(Cmd, cmdparams); | ||
161 | return null; | ||
162 | } | ||
163 | |||
164 | // Shows data about something | ||
165 | public override void ShowCommands(string ShowWhat) { | ||
166 | cmdparser.Show(ShowWhat); | ||
167 | } | ||
168 | |||
169 | public override void MainConsolePrompt() { | ||
170 | string[] tempstrarray; | ||
171 | string tempstr = this.CmdPrompt(this.componentname + "# "); | ||
172 | tempstrarray = tempstr.Split(' '); | ||
173 | string cmd=tempstrarray[0]; | ||
174 | Array.Reverse(tempstrarray); | ||
175 | Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1); | ||
176 | Array.Reverse(tempstrarray); | ||
177 | string[] cmdparams=(string[])tempstrarray; | ||
178 | RunCmd(cmd,cmdparams); | ||
179 | } | ||
180 | } | ||
181 | } | ||
diff --git a/OGS/common/src/VersionInfo.cs.template b/OGS/common/src/VersionInfo.cs.template deleted file mode 100644 index 8f73b4b..0000000 --- a/OGS/common/src/VersionInfo.cs.template +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions are met: | ||
6 | * * Redistributions of source code must retain the above copyright | ||
7 | * notice, this list of conditions and the following disclaimer. | ||
8 | * * Redistributions in binary form must reproduce the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer in the | ||
10 | * documentation and/or other materials provided with the distribution. | ||
11 | * * Neither the name of the <organization> nor the | ||
12 | * names of its contributors may be used to endorse or promote products | ||
13 | * derived from this software without specific prior written permission. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
16 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
17 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
18 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
19 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
20 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
22 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | */ | ||
26 | |||
27 | using System; | ||
28 | |||
29 | namespace OpenGridServices | ||
30 | { | ||
31 | /// <summary> | ||
32 | /// </summary> | ||
33 | public class VersionInfo | ||
34 | { | ||
35 | public static string Version = "@@VERSION"; | ||
36 | } | ||
37 | } | ||