From 3376b82501000692d6dac24b051af738cdaf2737 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 24 May 2007 12:16:50 +0000
Subject: Some more code refactoring, plus a restructuring of the directories
 so that the Grid servers can be a separate solution to the region server.

---
 OpenSim.Framework.Console/AssemblyInfo.cs          |  31 ----
 OpenSim.Framework.Console/ConsoleBase.cs           | 166 ---------------------
 OpenSim.Framework.Console/ConsoleCallbacksBase.cs  |  12 --
 OpenSim.Framework.Console/MainConsole.cs           |  48 ------
 .../OpenSim.Framework.Console.csproj               |  89 -----------
 .../OpenSim.Framework.Console.dll.build            |  42 ------
 6 files changed, 388 deletions(-)
 delete mode 100644 OpenSim.Framework.Console/AssemblyInfo.cs
 delete mode 100644 OpenSim.Framework.Console/ConsoleBase.cs
 delete mode 100644 OpenSim.Framework.Console/ConsoleCallbacksBase.cs
 delete mode 100644 OpenSim.Framework.Console/MainConsole.cs
 delete mode 100644 OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
 delete mode 100644 OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build

(limited to 'OpenSim.Framework.Console')

diff --git a/OpenSim.Framework.Console/AssemblyInfo.cs b/OpenSim.Framework.Console/AssemblyInfo.cs
deleted file mode 100644
index 00a9b7d..0000000
--- a/OpenSim.Framework.Console/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("ServerConsole")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ServerConsole")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/OpenSim.Framework.Console/ConsoleBase.cs
deleted file mode 100644
index 6a1c53c..0000000
--- a/OpenSim.Framework.Console/ConsoleBase.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.IO;
-
-namespace OpenSim.Framework.Console
-{
-    public enum LogPriority : int
-    {
-        CRITICAL,
-        HIGH,
-        MEDIUM,
-        NORMAL,
-        LOW,
-        VERBOSE,
-        EXTRAVERBOSE
-    }
-
-    public class ConsoleBase
-    {
-        StreamWriter Log;
-        public conscmd_callback cmdparser;
-        public string componentname;
-        private bool m_silent;
-
-        public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
-        {
-            this.componentname = componentname;
-            this.cmdparser = cmdparser;
-            this.m_silent = silent;
-            System.Console.WriteLine("ServerConsole.cs - creating new local console");
-            System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
-            Log = File.AppendText(LogFile);
-            Log.WriteLine("========================================================================");
-            Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
-        }
-
-        public void Close()
-        {
-            Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
-            Log.Close();
-        }
-
-        public void Write(string format, params object[] args)
-        {
-            WriteLine(LogPriority.NORMAL,format,args);
-            return;
-        }
-
-        [Obsolete("WriteLine(msg,args) has been depreciated, use WriteLine(priority,msg,args) instead.")]
-        public void WriteLine(string format, params object[] args)
-        {
-            Log.WriteLine(format, args);
-            Log.Flush();
-	    if(!m_silent)
-            {
-            System.Console.WriteLine(format, args);
-            }
-            return;
-        }
-
-        public void WriteLine(LogPriority importance, string format, params object[] args)
-        {
-            Log.WriteLine(format, args);
-            Log.Flush();
-            if (!m_silent)
-            {
-                System.Console.WriteLine(format, args);
-            }
-            return;
-        }
-
-        public string ReadLine()
-        {
-            string TempStr = System.Console.ReadLine();
-            Log.WriteLine(TempStr);
-            return TempStr;
-        }
-
-        public int Read()
-        {
-            int TempInt = System.Console.Read();
-            Log.Write((char)TempInt);
-            return TempInt;
-        }
-
-        // Displays a prompt and waits for the user to enter a string, then returns that string
-        // Done with no echo and suitable for passwords
-        public string PasswdPrompt(string prompt)
-        {
-            // FIXME: Needs to be better abstracted
-            Log.WriteLine(prompt);
-            this.Write(prompt);
-            ConsoleColor oldfg = System.Console.ForegroundColor;
-            System.Console.ForegroundColor = System.Console.BackgroundColor;
-            string temp = System.Console.ReadLine();
-            System.Console.ForegroundColor = oldfg;
-            return temp;
-        }
-
-        // Displays a command prompt and waits for the user to enter a string, then returns that string
-        public string CmdPrompt(string prompt)
-        {
-            this.Write(String.Format("{0}: ", prompt));
-            return this.ReadLine();
-        }
-
-        // Displays a command prompt and returns a default value if the user simply presses enter
-        public string CmdPrompt(string prompt, string defaultresponse)
-        {
-            string temp = CmdPrompt(String.Format( "{0} [{1}]", prompt, defaultresponse ));
-            if (temp == "")
-            {
-                return defaultresponse;
-            }
-            else
-            {
-                return temp;
-            }
-        }
-
-        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
-        public string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB)
-        {
-            bool itisdone = false;
-            string temp = CmdPrompt(prompt, defaultresponse);
-            while (itisdone == false)
-            {
-                if ((temp == OptionA) || (temp == OptionB))
-                {
-                    itisdone = true;
-                }
-                else
-                {
-                    this.WriteLine(LogPriority.MEDIUM,"Valid options are " + OptionA + " or " + OptionB);
-                    temp = CmdPrompt(prompt, defaultresponse);
-                }
-            }
-            return temp;
-        }
-
-        // Runs a command with a number of parameters
-        public Object RunCmd(string Cmd, string[] cmdparams)
-        {
-            cmdparser.RunCmd(Cmd, cmdparams);
-            return null;
-        }
-
-        // Shows data about something
-        public void ShowCommands(string ShowWhat)
-        {
-            cmdparser.Show(ShowWhat);
-        }
-
-        public void MainConsolePrompt()
-        {
-            string[] tempstrarray;
-            string tempstr = this.CmdPrompt(this.componentname + "# ");
-            tempstrarray = tempstr.Split(' ');
-            string cmd = tempstrarray[0];
-            Array.Reverse(tempstrarray);
-            Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
-            Array.Reverse(tempstrarray);
-            string[] cmdparams = (string[])tempstrarray;
-            RunCmd(cmd, cmdparams);
-        }
-    }
-}
diff --git a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
deleted file mode 100644
index bb589d2..0000000
--- a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Console
-{    
-    public interface conscmd_callback
-    {
-        void RunCmd(string cmd, string[] cmdparams);
-        void Show(string ShowWhat);
-    }
-}
diff --git a/OpenSim.Framework.Console/MainConsole.cs b/OpenSim.Framework.Console/MainConsole.cs
deleted file mode 100644
index 02c4ae8..0000000
--- a/OpenSim.Framework.Console/MainConsole.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-
-namespace OpenSim.Framework.Console
-{
-	public class MainConsole {
-		
-		private static ConsoleBase instance;
-		
-		public static ConsoleBase Instance 
-		{
-			get 
-			{
-				return instance;
-			}
-			set
-			{
-				instance = value;
-			}
-		}
-    }
-
-}
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
deleted file mode 100644
index 0961492..0000000
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Framework.Console</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Framework.Console</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ConsoleBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainConsole.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
deleted file mode 100644
index fa90bb6..0000000
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Framework.Console" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="ConsoleBase.cs" />
-                <include name="ConsoleCallbacksBase.cs" />
-                <include name="MainConsole.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
-- 
cgit v1.1