aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices
diff options
context:
space:
mode:
authorAdam Frisby2007-06-05 13:18:44 +0000
committerAdam Frisby2007-06-05 13:18:44 +0000
commit75f9b25b41b5a80025e17808b5b2d9fe7295d54e (patch)
treecd96e948447cc9a030c7ce537d25da06ea40db5e /OpenGridServices
parent* "We are" message is now a status text message. (diff)
downloadopensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.zip
opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.gz
opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.bz2
opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.xz
* Fixed OGS build
* Converted to new console interfaces * Fixed other minor issues which somehow snuck in
Diffstat (limited to '')
-rw-r--r--OpenGridServices.InventoryServer/InventoryManager.cs97
-rw-r--r--OpenGridServices.InventoryServer/Main.cs61
-rw-r--r--OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj78
-rw-r--r--OpenGridServices.InventoryServer/Properties/AssemblyInfo.cs33
-rw-r--r--OpenGridServices.build3
-rw-r--r--OpenGridServices.sln129
-rw-r--r--OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs34
-rw-r--r--OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs4
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/Main.cs16
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/GridManager.cs26
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/Main.cs12
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/Main.cs12
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/UserManager.cs23
-rw-r--r--OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs24
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.cs54
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.csproj41
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.exe.build1
17 files changed, 195 insertions, 453 deletions
diff --git a/OpenGridServices.InventoryServer/InventoryManager.cs b/OpenGridServices.InventoryServer/InventoryManager.cs
deleted file mode 100644
index 01fd825..0000000
--- a/OpenGridServices.InventoryServer/InventoryManager.cs
+++ /dev/null
@@ -1,97 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5using OpenGrid.Framework.Data;
6using libsecondlife;
7using System.Reflection;
8
9using System.Xml;
10using Nwc.XmlRpc;
11using OpenSim.Framework.Sims;
12using OpenSim.Framework.Inventory;
13using OpenSim.Framework.Utilities;
14
15using System.Security.Cryptography;
16
17namespace OpenGridServices.InventoryServer
18{
19 class InventoryManager
20 {
21 Dictionary<string, IInventoryData> _plugins = new Dictionary<string, IInventoryData>();
22
23 /// <summary>
24 /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded.
25 /// </summary>
26 /// <param name="FileName">The filename to the inventory server plugin DLL</param>
27 public void AddPlugin(string FileName)
28 {
29 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Invenstorage: Attempting to load " + FileName);
30 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
31
32 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
33 foreach (Type pluginType in pluginAssembly.GetTypes())
34 {
35 if (!pluginType.IsAbstract)
36 {
37 Type typeInterface = pluginType.GetInterface("IInventoryData", true);
38
39 if (typeInterface != null)
40 {
41 IInventoryData plug = (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
42 plug.Initialise();
43 this._plugins.Add(plug.getName(), plug);
44 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Invenstorage: Added IUserData Interface");
45 }
46
47 typeInterface = null;
48 }
49 }
50
51 pluginAssembly = null;
52 }
53
54 public List<InventoryFolderBase> getRootFolders(LLUUID user)
55 {
56 foreach (KeyValuePair<string, IInventoryData> kvp in _plugins)
57 {
58 try
59 {
60 return kvp.Value.getUserRootFolders(user);
61 }
62 catch (Exception e)
63 {
64 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Unable to get root folders via " + kvp.Key + " (" + e.ToString() + ")");
65 }
66 }
67 }
68
69 public XmlRpcResponse XmlRpcInventoryRequest(XmlRpcRequest request)
70 {
71 XmlRpcResponse response = new XmlRpcResponse();
72 Hashtable requestData = (Hashtable)request.Params[0];
73
74 Hashtable responseData = new Hashtable();
75
76 // Stuff happens here
77
78 if (requestData.ContainsKey("Access-type"))
79 {
80 if (requestData["access-type"] == "rootfolders")
81 {
82// responseData["rootfolders"] =
83 }
84 }
85 else
86 {
87 responseData["error"] = "No access-type specified.";
88 }
89
90
91 // Stuff stops happening here
92
93 response.Value = responseData;
94 return response;
95 }
96 }
97}
diff --git a/OpenGridServices.InventoryServer/Main.cs b/OpenGridServices.InventoryServer/Main.cs
deleted file mode 100644
index 727b28d..0000000
--- a/OpenGridServices.InventoryServer/Main.cs
+++ /dev/null
@@ -1,61 +0,0 @@
1
2using System;
3using System.Collections;
4using System.Collections.Generic;
5using System.Reflection;
6using System.IO;
7using System.Text;
8using libsecondlife;
9using OpenSim.Framework.User;
10using OpenSim.Framework.Sims;
11using OpenSim.Framework.Inventory;
12using OpenSim.Framework.Interfaces;
13using OpenSim.Framework.Console;
14using OpenSim.Servers;
15using OpenSim.Framework.Utilities;
16
17namespace OpenGridServices.InventoryServer
18{
19 public class OpenInventory_Main : BaseServer, conscmd_callback
20 {
21 ConsoleBase m_console;
22 InventoryManager m_inventoryManager;
23
24 public static void Main(string[] args)
25 {
26 }
27
28 public OpenInventory_Main()
29 {
30 m_console = new ConsoleBase("opengrid-inventory-console.log", "OpenInventory", this, false);
31 MainConsole.Instance = m_console;
32 }
33
34 public void Startup()
35 {
36 MainConsole.Instance.WriteLine("Initialising inventory manager...");
37 m_inventoryManager = new InventoryManager();
38
39 MainConsole.Instance.WriteLine("Starting HTTP server");
40 BaseHttpServer httpServer = new BaseHttpServer(8004);
41
42 httpServer.AddXmlRPCHandler("rootfolders", m_inventoryManager.XmlRpcInventoryRequest);
43 //httpServer.AddRestHandler("GET","/rootfolders/",Rest
44 }
45
46 public void RunCmd(string cmd, string[] cmdparams)
47 {
48 switch (cmd)
49 {
50 case "shutdown":
51 m_console.Close();
52 Environment.Exit(0);
53 break;
54 }
55 }
56
57 public void Show(string ShowWhat)
58 {
59 }
60 }
61}
diff --git a/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj b/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
deleted file mode 100644
index 4cfab2f..0000000
--- a/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
+++ /dev/null
@@ -1,78 +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>{596B9D58-F27D-430B-99D2-4C1B95F74A76}</ProjectGuid>
8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>OpenGridServices.InventoryServer</RootNamespace>
11 <AssemblyName>OpenGridServices.InventoryServer</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>..\bin\libsecondlife.dll</HintPath>
34 </Reference>
35 <Reference Include="OpenSim.Framework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
36 <SpecificVersion>False</SpecificVersion>
37 <HintPath>..\bin\OpenSim.Framework.dll</HintPath>
38 </Reference>
39 <Reference Include="OpenSim.Framework.Console, Version=1.0.2706.24499, Culture=neutral, processorArchitecture=MSIL">
40 <SpecificVersion>False</SpecificVersion>
41 <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
42 </Reference>
43 <Reference Include="OpenSim.Servers, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44 <SpecificVersion>False</SpecificVersion>
45 <HintPath>..\bin\OpenSim.Servers.dll</HintPath>
46 </Reference>
47 <Reference Include="System" />
48 <Reference Include="System.Data" />
49 <Reference Include="System.Xml" />
50 <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
51 <SpecificVersion>False</SpecificVersion>
52 <HintPath>..\bin\XMLRPC.dll</HintPath>
53 </Reference>
54 </ItemGroup>
55 <ItemGroup>
56 <Compile Include="InventoryManager.cs" />
57 <Compile Include="Main.cs" />
58 <Compile Include="Properties\AssemblyInfo.cs" />
59 </ItemGroup>
60 <ItemGroup>
61 <ProjectReference Include="..\OpenGridServices\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
62 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
63 <Name>OpenGrid.Framework.Data</Name>
64 </ProjectReference>
65 <ProjectReference Include="..\OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj">
66 <Project>{7924FD35-0000-0000-0000-000000000000}</Project>
67 <Name>OpenGrid.Framework.Manager</Name>
68 </ProjectReference>
69 </ItemGroup>
70 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
71 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
72 Other similar extension points exist, see Microsoft.Common.targets.
73 <Target Name="BeforeBuild">
74 </Target>
75 <Target Name="AfterBuild">
76 </Target>
77 -->
78</Project> \ No newline at end of file
diff --git a/OpenGridServices.InventoryServer/Properties/AssemblyInfo.cs b/OpenGridServices.InventoryServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index ba8dc8b..0000000
--- a/OpenGridServices.InventoryServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using 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("OpenGridServices.InventoryServer")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenGridServices.InventoryServer")]
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("d410d983-9489-46db-ac77-a7470291c01d")]
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/OpenGridServices.build b/OpenGridServices.build
index d240dc0..518e716 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -56,6 +56,7 @@
56 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> 56 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
57 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" /> 57 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
58 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" /> 58 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
59 <nant buildfile="OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build" target="clean" />
59 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> 60 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
60 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" /> 61 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
61 </target> 62 </target>
@@ -70,6 +71,7 @@
70 <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="build" /> 71 <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="build" />
71 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 72 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
72 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> 73 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
74 <nant buildfile="OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build" target="build" />
73 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 75 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
74 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> 76 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
75 <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> 77 <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
@@ -93,6 +95,7 @@
93 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> 95 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
94 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" /> 96 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
95 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" /> 97 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
98 <nant buildfile="OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build" target="doc" />
96 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> 99 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
97 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" /> 100 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
98 </target> 101 </target>
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 641f710..d7b056e 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -20,75 +20,72 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSS
20EndProject 20EndProject
21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGridServices\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}" 21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGridServices\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
22EndProject 22EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.InventoryServer", "OpenGridServices\OpenGridServices.InventoryServer\OpenGridServices.InventoryServer.csproj", "{338FA00B-0000-0000-0000-000000000000}"
24EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices\OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices\OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}"
24EndProject 26EndProject
25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" 27Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"
26EndProject 28EndProject
27Global 29Global
28 GlobalSection(SolutionConfigurationPlatforms) = preSolution 30 GlobalSection(SolutionConfigurationPlatforms) = preSolution
29 Debug|Any CPU = Debug|Any CPU 31 Debug|Any CPU = Debug|Any CPU
30 Release|Any CPU = Release|Any CPU 32 Release|Any CPU = Release|Any CPU
31 EndGlobalSection 33 EndGlobalSection
32 GlobalSection(ProjectDependencies) = postSolution 34 GlobalSection(ProjectConfigurationPlatforms) = postSolution
33 ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) 35 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34 ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) 36 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
35 ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) 37 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
36 ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000}) 38 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
37 ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) 39 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38 ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000}) 40 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
39 ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) 41 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
40 EndGlobalSection 42 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
41 GlobalSection(ProjectConfigurationPlatforms) = postSolution 43 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 44 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
43 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 45 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
44 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 46 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
45 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 47 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 48 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
47 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 49 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
48 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 50 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
49 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 51 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 52 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 53 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 54 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
53 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 55 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 56 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 57 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 58 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
57 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 59 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 60 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 61 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 62 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
61 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 63 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 64 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 65 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 66 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
65 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 67 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 68 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 69 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 70 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
69 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 71 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 72 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 73 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 74 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
73 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 75 {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 76 {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 77 {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 78 {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
77 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 79 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 80 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 81 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 82 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
81 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 83 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 84 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
83 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 85 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
84 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 86 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
85 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 87 EndGlobalSection
86 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 88 GlobalSection(SolutionProperties) = preSolution
87 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 89 HideSolutionNode = FALSE
88 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 90 EndGlobalSection
89 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
90 EndGlobalSection
91 GlobalSection(SolutionProperties) = preSolution
92 HideSolutionNode = FALSE
93 EndGlobalSection
94EndGlobal 91EndGlobal
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index cbe64e6..19cf6ac 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -43,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o
43 /// <returns>A grid configuration object</returns> 43 /// <returns>A grid configuration object</returns>
44 public GridConfig GetConfigObject() 44 public GridConfig GetConfigObject()
45 { 45 {
46 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll"); 46 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
47 return ( new DbGridConfig()); 47 return ( new DbGridConfig());
48 } 48 }
49 } 49 }
@@ -62,7 +62,7 @@ namespace OpenGrid.Config.GridConfigDb4o
62 /// User configuration for the Grid Config interfaces 62 /// User configuration for the Grid Config interfaces
63 /// </summary> 63 /// </summary>
64 public void LoadDefaults() { 64 public void LoadDefaults() {
65 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 65 OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
66 66
67 // About the grid options 67 // About the grid options
68 this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team"); 68 this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
@@ -94,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o
94 IObjectSet result = db.Get(typeof(DbGridConfig)); 94 IObjectSet result = db.Get(typeof(DbGridConfig));
95 // Found? 95 // Found?
96 if(result.Count==1) { 96 if(result.Count==1) {
97 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); 97 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
98 foreach (DbGridConfig cfg in result) { 98 foreach (DbGridConfig cfg in result) {
99 // Import each setting into this class 99 // Import each setting into this class
100 // Grid Settings 100 // Grid Settings
@@ -113,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o
113 } 113 }
114 // Create a new configuration object from this class 114 // Create a new configuration object from this class
115 } else { 115 } else {
116 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 116 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
117 117
118 // Load default settings into this class 118 // Load default settings into this class
119 LoadDefaults(); 119 LoadDefaults();
120 120
121 // Saves to the database file... 121 // Saves to the database file...
122 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Writing out default settings to local database"); 122 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Writing out default settings to local database");
123 db.Set(this); 123 db.Set(this);
124 124
125 // Closes file locks 125 // Closes file locks
126 db.Close(); 126 db.Close();
127 } 127 }
128 } catch(Exception e) { 128 } catch(Exception e) {
129 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured"); 129 OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
130 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 130 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
131 } 131 }
132 132
133 // Grid Settings 133 // Grid Settings
134 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid settings loaded:"); 134 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid settings loaded:");
135 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid owner: " + this.GridOwner); 135 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid owner: " + this.GridOwner);
136 136
137 // Asset Settings 137 // Asset Settings
138 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default asset server: " + this.DefaultAssetServer); 138 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
139 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to asset server: " + this.AssetSendKey); 139 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
140 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from asset server: " + this.AssetRecvKey); 140 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
141 141
142 // User Settings 142 // User Settings
143 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default user server: " + this.DefaultUserServer); 143 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default user server: " + this.DefaultUserServer);
144 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to user server: " + this.UserSendKey); 144 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
145 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from user server: " + this.UserRecvKey); 145 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
146 146
147 // Region Settings 147 // Region Settings
148 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to sims: " + this.SimSendKey); 148 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
149 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from sims: " + this.SimRecvKey); 149 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
150 } 150 }
151 151
152 /// <summary> 152 /// <summary>
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
index e1d25a6..c892f0f 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
@@ -83,8 +83,8 @@ namespace OpenGrid.Framework.Manager {
83 /// </summary> 83 /// </summary>
84 public static void ShutdownServer() 84 public static void ShutdownServer()
85 { 85 {
86 Console.WriteLine("Shutting down the grid server - recieved a grid manager request"); 86 Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
87 Console.WriteLine("Terminating in three seconds..."); 87 Console.WriteLine("Terminating in three seconds...");
88 Thread.Sleep(3000); 88 Thread.Sleep(3000);
89 thecallback("shutdown"); 89 thecallback("shutdown");
90 } 90 }
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index 334d3c5..de76645 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -72,7 +72,7 @@ namespace OpenGridServices.AssetServer
72 72
73 private void Work() 73 private void Work()
74 { 74 {
75 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "\nEnter help for a list of commands\n"); 75 m_console.Notice("Enter help for a list of commands");
76 76
77 while (true) 77 while (true)
78 { 78 {
@@ -88,10 +88,10 @@ namespace OpenGridServices.AssetServer
88 88
89 public void Startup() 89 public void Startup()
90 { 90 {
91 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Setting up asset DB"); 91 m_console.Verbose( "Main.cs:Startup() - Setting up asset DB");
92 setupDB(); 92 setupDB();
93 93
94 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process"); 94 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
95 AssetHttpServer httpServer = new AssetHttpServer(8003); 95 AssetHttpServer httpServer = new AssetHttpServer(8003);
96 96
97 97
@@ -121,7 +121,7 @@ namespace OpenGridServices.AssetServer
121 121
122 public string assetGetMethod(string request, string path, string param) 122 public string assetGetMethod(string request, string path, string param)
123 { 123 {
124 Console.WriteLine("got a request " +param); 124 Console.WriteLine("got a request " + param);
125 byte[] assetdata = getAssetData(new LLUUID(param), false); 125 byte[] assetdata = getAssetData(new LLUUID(param), false);
126 if (assetdata != null) 126 if (assetdata != null)
127 { 127 {
@@ -167,13 +167,13 @@ namespace OpenGridServices.AssetServer
167 try 167 try
168 { 168 {
169 db = Db4oFactory.OpenFile("assets.yap"); 169 db = Db4oFactory.OpenFile("assets.yap");
170 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:setupDB() - creation"); 170 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Main.cs:setupDB() - creation");
171 } 171 }
172 catch (Exception e) 172 catch (Exception e)
173 { 173 {
174 db.Close(); 174 db.Close();
175 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs:setupDB() - Exception occured"); 175 OpenSim.Framework.Console.MainConsole.Instance.Warn("Main.cs:setupDB() - Exception occured");
176 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); 176 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
177 } 177 }
178 if (!yapfile) 178 if (!yapfile)
179 { 179 {
@@ -322,7 +322,7 @@ namespace OpenGridServices.AssetServer
322 switch (cmd) 322 switch (cmd)
323 { 323 {
324 case "help": 324 case "help":
325 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown this asset server (USE CAUTION!)"); 325 m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
326 break; 326 break;
327 327
328 case "shutdown": 328 case "shutdown":
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
index 6315a4a..81da18e 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
@@ -26,10 +26,10 @@ namespace OpenGridServices.GridServer
26 /// <param name="FileName">The filename to the grid server plugin DLL</param> 26 /// <param name="FileName">The filename to the grid server plugin DLL</param>
27 public void AddPlugin(string FileName) 27 public void AddPlugin(string FileName)
28 { 28 {
29 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Attempting to load " + FileName); 29 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName);
30 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 30 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
31 31
32 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 32 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
33 foreach (Type pluginType in pluginAssembly.GetTypes()) 33 foreach (Type pluginType in pluginAssembly.GetTypes())
34 { 34 {
35 if (!pluginType.IsAbstract) 35 if (!pluginType.IsAbstract)
@@ -42,7 +42,7 @@ namespace OpenGridServices.GridServer
42 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 42 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
43 plug.Initialise(); 43 plug.Initialise();
44 this._plugins.Add(plug.getName(), plug); 44 this._plugins.Add(plug.getName(), plug);
45 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Added IGridData Interface"); 45 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Added IGridData Interface");
46 } 46 }
47 47
48 typeInterface = null; 48 typeInterface = null;
@@ -55,7 +55,7 @@ namespace OpenGridServices.GridServer
55 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 55 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
56 plug.Initialise(); 56 plug.Initialise();
57 this._logplugins.Add(plug.getName(), plug); 57 this._logplugins.Add(plug.getName(), plug);
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Added ILogData Interface"); 58 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Storage: Added ILogData Interface");
59 } 59 }
60 60
61 typeInterface = null; 61 typeInterface = null;
@@ -83,7 +83,7 @@ namespace OpenGridServices.GridServer
83 } 83 }
84 catch (Exception e) 84 catch (Exception e)
85 { 85 {
86 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: unable to write log via " + kvp.Key); 86 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key);
87 } 87 }
88 } 88 }
89 } 89 }
@@ -102,7 +102,7 @@ namespace OpenGridServices.GridServer
102 } 102 }
103 catch (Exception e) 103 catch (Exception e)
104 { 104 {
105 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 105 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
106 } 106 }
107 } 107 }
108 return null; 108 return null;
@@ -123,7 +123,7 @@ namespace OpenGridServices.GridServer
123 } 123 }
124 catch (Exception e) 124 catch (Exception e)
125 { 125 {
126 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); 126 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
127 } 127 }
128 } 128 }
129 return null; 129 return null;
@@ -147,7 +147,7 @@ namespace OpenGridServices.GridServer
147 } 147 }
148 catch (Exception e) 148 catch (Exception e)
149 { 149 {
150 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: Unable to query regionblock via " + kvp.Key); 150 OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
151 } 151 }
152 } 152 }
153 153
@@ -335,7 +335,7 @@ namespace OpenGridServices.GridServer
335 335
336 simProfileList.Add(simProfileBlock); 336 simProfileList.Add(simProfileBlock);
337 } 337 }
338 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); 338 OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
339 } 339 }
340 else 340 else
341 { 341 {
@@ -361,7 +361,7 @@ namespace OpenGridServices.GridServer
361 } 361 }
362 } 362 }
363 } 363 }
364 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); 364 OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
365 } 365 }
366 366
367 responseData["sim-profiles"] = simProfileList; 367 responseData["sim-profiles"] = simProfileList;
@@ -522,18 +522,18 @@ namespace OpenGridServices.GridServer
522 522
523 try 523 try
524 { 524 {
525 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Updating / adding via " + _plugins.Count + " storage provider(s) registered."); 525 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
526 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 526 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
527 { 527 {
528 try 528 try
529 { 529 {
530 kvp.Value.AddProfile(TheSim); 530 kvp.Value.AddProfile(TheSim);
531 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"New sim added to grid (" + TheSim.regionName + ")"); 531 OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
532 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); 532 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
533 } 533 }
534 catch (Exception e) 534 catch (Exception e)
535 { 535 {
536 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); 536 OpenSim.Framework.Console.MainConsole.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
537 } 537 }
538 } 538 }
539 return "OK"; 539 return "OK";
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs
index 71f878a..9aabae1 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/Main.cs
@@ -116,17 +116,17 @@ namespace OpenGridServices.GridServer
116 this.ConfigDB(this.localXMLConfig); 116 this.ConfigDB(this.localXMLConfig);
117 this.localXMLConfig.Close(); 117 this.localXMLConfig.Close();
118 118
119 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration"); 119 m_console.Verbose( "Main.cs:Startup() - Loading configuration");
120 Cfg = this.LoadConfigDll(this.ConfigDll); 120 Cfg = this.LoadConfigDll(this.ConfigDll);
121 Cfg.InitConfig(); 121 Cfg.InitConfig();
122 if (setuponly) Environment.Exit(0); 122 if (setuponly) Environment.Exit(0);
123 123
124 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Connecting to Storage Server"); 124 m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
125 m_gridManager = new GridManager(); 125 m_gridManager = new GridManager();
126 m_gridManager.AddPlugin(GridDll); // Made of win 126 m_gridManager.AddPlugin(GridDll); // Made of win
127 m_gridManager.config = Cfg; 127 m_gridManager.config = Cfg;
128 128
129 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process"); 129 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
130 BaseHttpServer httpServer = new BaseHttpServer(8001); 130 BaseHttpServer httpServer = new BaseHttpServer(8001);
131 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 131 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
132 132
@@ -143,7 +143,7 @@ namespace OpenGridServices.GridServer
143 // I have no idea what this was supposed to do - looks like an infinite recursion to me. 143 // I have no idea what this was supposed to do - looks like an infinite recursion to me.
144 // case "regions": 144 // case "regions":
145 //// DIRTY HACK ALERT 145 //// DIRTY HACK ALERT
146 //Console.WriteLine("/regions/ accessed"); 146 //Console.Notice("/regions/ accessed");
147 //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1])); 147 //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));
148 //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod); 148 //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);
149 //break; 149 //break;
@@ -155,7 +155,7 @@ namespace OpenGridServices.GridServer
155 155
156 httpServer.Start(); 156 httpServer.Start();
157 157
158 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting sim status checker"); 158 m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
159 159
160 System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates. 160 System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.
161 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); 161 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
@@ -232,7 +232,7 @@ namespace OpenGridServices.GridServer
232 switch (cmd) 232 switch (cmd)
233 { 233 {
234 case "help": 234 case "help":
235 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown the grid (USE CAUTION!)"); 235 m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
236 break; 236 break;
237 237
238 case "shutdown": 238 case "shutdown":
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index 3b17cff..d4fe355 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -81,7 +81,7 @@ namespace OpenGridServices.UserServer
81 81
82 private void Work() 82 private void Work()
83 { 83 {
84 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"\nEnter help for a list of commands\n"); 84 m_console.Notice("Enter help for a list of commands\n");
85 85
86 while (true) 86 while (true)
87 { 87 {
@@ -96,16 +96,16 @@ namespace OpenGridServices.UserServer
96 this.ConfigDB(this.localXMLConfig); 96 this.ConfigDB(this.localXMLConfig);
97 this.localXMLConfig.Close(); 97 this.localXMLConfig.Close();
98 98
99 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration"); 99 MainConsole.Instance.Verbose("Main.cs:Startup() - Loading configuration");
100 Cfg = this.LoadConfigDll(this.ConfigDll); 100 Cfg = this.LoadConfigDll(this.ConfigDll);
101 Cfg.InitConfig(); 101 Cfg.InitConfig();
102 102
103 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection"); 103 MainConsole.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");
104 m_userManager = new UserManager(); 104 m_userManager = new UserManager();
105 m_userManager._config = Cfg; 105 m_userManager._config = Cfg;
106 m_userManager.AddPlugin(StorageDll); 106 m_userManager.AddPlugin(StorageDll);
107 107
108 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); 108 MainConsole.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
109 BaseHttpServer httpServer = new BaseHttpServer(8002); 109 BaseHttpServer httpServer = new BaseHttpServer(8002);
110 110
111 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 111 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
@@ -144,8 +144,8 @@ namespace OpenGridServices.UserServer
144 switch (cmd) 144 switch (cmd)
145 { 145 {
146 case "help": 146 case "help":
147 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"create user - create a new user"); 147 m_console.Notice("create user - create a new user");
148 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - shutdown the grid (USE CAUTION!)"); 148 m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
149 break; 149 break;
150 150
151 case "create": 151 case "create":
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
index 21ecc50..7dd404d 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -27,10 +27,10 @@ namespace OpenGridServices.UserServer
27 /// <param name="FileName">The filename to the user server plugin DLL</param> 27 /// <param name="FileName">The filename to the user server plugin DLL</param>
28 public void AddPlugin(string FileName) 28 public void AddPlugin(string FileName)
29 { 29 {
30 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Attempting to load " + FileName); 30 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
31 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 31 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
32 32
33 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 33 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
34 foreach (Type pluginType in pluginAssembly.GetTypes()) 34 foreach (Type pluginType in pluginAssembly.GetTypes())
35 { 35 {
36 if (!pluginType.IsAbstract) 36 if (!pluginType.IsAbstract)
@@ -42,7 +42,7 @@ namespace OpenGridServices.UserServer
42 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 42 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
43 plug.Initialise(); 43 plug.Initialise();
44 this._plugins.Add(plug.getName(), plug); 44 this._plugins.Add(plug.getName(), plug);
45 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Added IUserData Interface"); 45 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
46 } 46 }
47 47
48 typeInterface = null; 48 typeInterface = null;
@@ -78,7 +78,7 @@ namespace OpenGridServices.UserServer
78 } 78 }
79 catch (Exception e) 79 catch (Exception e)
80 { 80 {
81 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 81 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
82 } 82 }
83 } 83 }
84 } 84 }
@@ -100,7 +100,7 @@ namespace OpenGridServices.UserServer
100 } 100 }
101 catch (Exception e) 101 catch (Exception e)
102 { 102 {
103 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 103 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
104 } 104 }
105 } 105 }
106 106
@@ -125,7 +125,7 @@ namespace OpenGridServices.UserServer
125 } 125 }
126 catch (Exception e) 126 catch (Exception e)
127 { 127 {
128 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 128 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
129 } 129 }
130 } 130 }
131 131
@@ -157,7 +157,7 @@ namespace OpenGridServices.UserServer
157 } 157 }
158 catch (Exception e) 158 catch (Exception e)
159 { 159 {
160 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 160 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
161 } 161 }
162 } 162 }
163 163
@@ -179,7 +179,7 @@ namespace OpenGridServices.UserServer
179 } 179 }
180 catch (Exception e) 180 catch (Exception e)
181 { 181 {
182 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 182 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
183 } 183 }
184 } 184 }
185 185
@@ -201,7 +201,7 @@ namespace OpenGridServices.UserServer
201 } 201 }
202 catch (Exception e) 202 catch (Exception e)
203 { 203 {
204 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 204 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
205 } 205 }
206 } 206 }
207 207
@@ -224,7 +224,7 @@ namespace OpenGridServices.UserServer
224 } 224 }
225 catch (Exception e) 225 catch (Exception e)
226 { 226 {
227 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 227 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
228 } 228 }
229 } 229 }
230 230
@@ -348,8 +348,7 @@ namespace OpenGridServices.UserServer
348 /// <returns>Authenticated?</returns> 348 /// <returns>Authenticated?</returns>
349 public bool AuthenticateUser(ref UserProfileData profile, string password) 349 public bool AuthenticateUser(ref UserProfileData profile, string password)
350 { 350 {
351 OpenSim.Framework.Console.MainConsole.Instance.WriteLine( 351 OpenSim.Framework.Console.MainConsole.Instance.Verbose(
352 OpenSim.Framework.Console.LogPriority.LOW,
353 "Authenticating " + profile.username + " " + profile.surname); 352 "Authenticating " + profile.username + " " + profile.surname);
354 353
355 password = password.Remove(0, 3); //remove $1$ 354 password = password.Remove(0, 3); //remove $1$
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index a281889..25ba74a 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
@@ -36,7 +36,7 @@ namespace OpenUser.Config.UserConfigDb4o
36 { 36 {
37 public UserConfig GetConfigObject() 37 public UserConfig GetConfigObject()
38 { 38 {
39 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll"); 39 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
40 return ( new DbUserConfig()); 40 return ( new DbUserConfig());
41 } 41 }
42 } 42 }
@@ -46,7 +46,7 @@ namespace OpenUser.Config.UserConfigDb4o
46 private IObjectContainer db; 46 private IObjectContainer db;
47 47
48 public void LoadDefaults() { 48 public void LoadDefaults() {
49 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 49 OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
50 50
51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
52 52
@@ -60,7 +60,7 @@ namespace OpenUser.Config.UserConfigDb4o
60 db = Db4oFactory.OpenFile("openuser.yap"); 60 db = Db4oFactory.OpenFile("openuser.yap");
61 IObjectSet result = db.Get(typeof(DbUserConfig)); 61 IObjectSet result = db.Get(typeof(DbUserConfig));
62 if(result.Count==1) { 62 if(result.Count==1) {
63 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); 63 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
64 foreach (DbUserConfig cfg in result) { 64 foreach (DbUserConfig cfg in result) {
65 this.GridServerURL=cfg.GridServerURL; 65 this.GridServerURL=cfg.GridServerURL;
66 this.GridSendKey=cfg.GridSendKey; 66 this.GridSendKey=cfg.GridSendKey;
@@ -68,22 +68,22 @@ namespace OpenUser.Config.UserConfigDb4o
68 this.DefaultStartupMsg=cfg.DefaultStartupMsg; 68 this.DefaultStartupMsg=cfg.DefaultStartupMsg;
69 } 69 }
70 } else { 70 } else {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 71 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
72 LoadDefaults(); 72 LoadDefaults();
73 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Writing out default settings to local database"); 73 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Writing out default settings to local database");
74 db.Set(this); 74 db.Set(this);
75 db.Close(); 75 db.Close();
76 } 76 }
77 } catch(Exception e) { 77 } catch(Exception e) {
78 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured"); 78 OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 79 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
80 } 80 }
81 81
82 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"User settings loaded:"); 82 OpenSim.Framework.Console.MainConsole.Instance.Verbose("User settings loaded:");
83 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default startup message: " + this.DefaultStartupMsg); 83 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
84 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid server URL: " + this.GridServerURL); 84 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid server URL: " + this.GridServerURL);
85 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to grid: " + this.GridSendKey); 85 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
86 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from grid: " + this.GridRecvKey); 86 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
87 } 87 }
88 88
89 89
diff --git a/OpenGridServices/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs
index 1de9475..8200b5b 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.cs
+++ b/OpenGridServices/ServiceManager/ServiceManager.cs
@@ -52,8 +52,8 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
52 XmlNode rootnode = doc.FirstChild; 52 XmlNode rootnode = doc.FirstChild;
53 if (rootnode.Name != "regions") 53 if (rootnode.Name != "regions")
54 { 54 {
55 EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag"); 55 EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag");
56 Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag"); 56 Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag");
57 (new ServiceController("OpenGridServices-master")).Stop(); 57 (new ServiceController("OpenGridServices-master")).Stop();
58 } 58 }
59 59
@@ -72,8 +72,8 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
72 } 72 }
73 73
74 private static string SetupGrid() 74 private static string SetupGrid()
75 { 75 {
76 Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server"); 76 Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server");
77 try { 77 try {
78 Process p = new Process(); 78 Process p = new Process();
79 79
@@ -92,8 +92,8 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
92 string configxml = reader.ReadToEnd(); 92 string configxml = reader.ReadToEnd();
93 93
94 return configxml; 94 return configxml;
95 } catch(Exception e) { 95 } catch(Exception e) {
96 Console.WriteLine("An error occurred while running the grid server, please rectify it and try again"); 96 Console.WriteLine("An error occurred while running the grid server, please rectify it and try again");
97 Console.WriteLine(e.ToString()); 97 Console.WriteLine(e.ToString());
98 Environment.Exit(1); 98 Environment.Exit(1);
99 } 99 }
@@ -121,9 +121,9 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
121 121
122 string listenaddr; 122 string listenaddr;
123 string simconfigxml; 123 string simconfigxml;
124 LLUUID SimUUID; 124 LLUUID SimUUID;
125 125
126 Console.WriteLine("Setting up region servers"); 126 Console.WriteLine("Setting up region servers");
127 Console.Write("Please specify a path to store your region data (e.g /etc/opensim/regions: "); 127 Console.Write("Please specify a path to store your region data (e.g /etc/opensim/regions: ");
128 string regionpath=Console.ReadLine(); 128 string regionpath=Console.ReadLine();
129 129
@@ -134,11 +134,11 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
134 baseport=Convert.ToUInt16(Console.ReadLine()); 134 baseport=Convert.ToUInt16(Console.ReadLine());
135 135
136 136
137 listenaddr=Console.ReadLine(); 137 listenaddr=Console.ReadLine();
138 138
139 Console.WriteLine("Now ready to configure regions, please answer the questions about each region in turn"); 139 Console.WriteLine("Now ready to configure regions, please answer the questions about each region in turn");
140 for(int i=0; i<=numofregions; i++) { 140 for(int i=0; i<=numofregions; i++) {
141 Console.WriteLine("Configuring region number " + i.ToString()); 141 Console.WriteLine("Configuring region number " + i.ToString());
142 142
143 Console.Write("Region name: "); 143 Console.Write("Region name: ");
144 regionname=Console.ReadLine(); 144 regionname=Console.ReadLine();
@@ -177,13 +177,13 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
177 bool region=false; 177 bool region=false;
178 while(choice!="OK") 178 while(choice!="OK")
179 { 179 {
180 Console.Clear(); 180 Console.Clear();
181 Console.WriteLine("Please select the components you would like to run on this server:\n"); 181 Console.WriteLine("Please select the components you would like to run on this server:\n");
182 182
183 Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server - this service handles co-ordinates of regions/sims on the grid"); 183 Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server - this service handles co-ordinates of regions/sims on the grid");
184 Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server - this service handles user login, profiles, inventory and IM"); 184 Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server - this service handles user login, profiles, inventory and IM");
185 Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server - this service handles storage of assets such as textures, objects, sounds, scripts"); 185 Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server - this service handles storage of assets such as textures, objects, sounds, scripts");
186 Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features"); 186 Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features");
187 187
188 188
189 Console.Write("Type a number to toggle a choice or type OK to accept your current choices: "); 189 Console.Write("Type a number to toggle a choice or type OK to accept your current choices: ");
@@ -217,15 +217,15 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
217 public static void Main() 217 public static void Main()
218 { 218 {
219 if(!File.Exists("opengrid-master-cfg.xml")) 219 if(!File.Exists("opengrid-master-cfg.xml"))
220 { 220 {
221 Console.WriteLine("Could not find a config file, running initial setup"); 221 Console.WriteLine("Could not find a config file, running initial setup");
222 InitSetup(); 222 InitSetup();
223 } 223 }
224 Console.WriteLine("Starting up OGS master service"); 224 Console.WriteLine("Starting up OGS master service");
225 try { 225 try {
226 ServiceBase.Run(new OpenGridMasterService()); 226 ServiceBase.Run(new OpenGridMasterService());
227 } catch(Exception e) { 227 } catch(Exception e) {
228 Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!"); 228 Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!");
229 Console.WriteLine(e.ToString()); 229 Console.WriteLine(e.ToString());
230 } 230 }
231 } 231 }
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
index e23ce83..b461bd1 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ b/OpenGridServices/ServiceManager/ServiceManager.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>ServiceManager</AssemblyName> 13 <AssemblyName>ServiceManager</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>ServiceManager</RootNamespace> 21 <RootNamespace>ServiceManager</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,35 +61,40 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.ServiceProcess" > 72 <Reference Include="System.ServiceProcess">
66 <HintPath>System.ServiceProcess.dll</HintPath> 73 <HintPath>System.ServiceProcess.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Xml" > 76 <Reference Include="System.Xml">
70 <HintPath>System.Xml.dll</HintPath> 77 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="libsecondlife.dll" > 80 <Reference Include="libsecondlife.dll">
74 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 81 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="OpenSim.GenericConfig.Xml" > 84 <Reference Include="OpenSim.GenericConfig.Xml">
78 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath> 85 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
88 <Reference Include="OpenSim.Framework.dll">
89 <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
90 <Private>False</Private>
91 </Reference>
81 </ItemGroup> 92 </ItemGroup>
82 <ItemGroup> 93 <ItemGroup>
83 </ItemGroup> 94 </ItemGroup>
84 <ItemGroup> 95 <ItemGroup>
85 <Compile Include="ServiceManager.cs"> 96 <Compile Include="ServiceManager.cs">
86 <SubType>Code</SubType> 97 <SubType>Component</SubType>
87 </Compile> 98 </Compile>
88 </ItemGroup> 99 </ItemGroup>
89 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 100 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
@@ -93,4 +104,4 @@
93 <PostBuildEvent> 104 <PostBuildEvent>
94 </PostBuildEvent> 105 </PostBuildEvent>
95 </PropertyGroup> 106 </PropertyGroup>
96</Project> 107</Project> \ No newline at end of file
diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
index eb66f82..5e1dd72 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build
@@ -23,6 +23,7 @@
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> 25 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
26 <include name="../../bin/OpenSim.Framework.dll" />
26 </references> 27 </references>
27 </csc> 28 </csc>
28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 29 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
generated by cgit v1.1 at 2024-11-18 10:37:07 +0000