122 files changed, 385 insertions, 3705 deletions

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
deleted file mode 100644
index 563eaf7..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Types;

-using OpenGrid.Framework.Communications;

-namespace OpenGrid.Framework.Communications.OGS1

-{

-    public class GridCommsManager : CommunicationsManager

-    {

-        private OGS1GridServices gridInterComms = new OGS1GridServices();

-        public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)

-        {

-            GridServer = gridInterComms;

-            InterRegion = gridInterComms;

-            UserServer = new OGSUserServices();

-        }

-    }

-}

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
deleted file mode 100644
index 1667e6b..0000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenGrid.Framework.Communications;

-using OpenGrid.Framework.Data;

-using libsecondlife;

-

-namespace OpenGrid.Framework.Communications.OGS1

-{

-    public class OGSUserServices :IUserServices

-    {

-        public UserProfileData GetUserProfile(string firstName, string lastName)

-        {

-            return null;

-        }

-        public UserProfileData GetUserProfile(string name)

-        {

-            return null;

-        }

-        public UserProfileData GetUserProfile(LLUUID avatarID)

-        {

-            return null;

-        }

-    }

-}

diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
deleted file mode 100644
index d2d6140..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ /dev/null
@@ -1,111 +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>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data.DB4o</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="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="DB4oGridData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="DB4oManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="DB4oUserData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
deleted file mode 100644
index d6dd03d..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
+++ /dev/null
@@ -1,111 +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>{BC0F052F-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </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>
-  <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>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{12DD8EB8-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DB4oUserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties/AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
deleted file mode 100644
index 3b783ca..0000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
+++ /dev/null
@@ -1,111 +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>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data.DB4o</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>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="DB4oUserData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="DB4oManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="DB4oGridData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
deleted file mode 100644
index a572204..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
+++ /dev/null
@@ -1,113 +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>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data</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>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="GridData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="ILogData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="IniConfig.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="InventoryData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="SimProfileData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserProfileData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
deleted file mode 100644
index 3b6d24d..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
+++ /dev/null
@@ -1,110 +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>{12DD8EB8-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </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>
-  <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>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ILogData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="IniConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UserProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties/AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
deleted file mode 100644
index 990cd16..0000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
+++ /dev/null
@@ -1,113 +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>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data</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>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="GridData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="SimProfileData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="ILogData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="IniConfig.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="InventoryData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserProfileData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
deleted file mode 100644
index ae8a33c..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>E:\work\oslauth\sim\branches\Sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
deleted file mode 100644
index 9dc2383..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" ?>

-<project name="OpenGrid.Framework.UserManagement" 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="OpenGrid.Framework.UserManagement" dynamicprefix="true" >

-            </resources>

-            <sources failonempty="true">

-                <include name="LoginResponse.cs" />

-                <include name="UserManagerBase.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="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

-                <include name="../../bin/OpenSim.Framework.Console.dll" />

-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

-                <include name="../../bin/OpenSim.Servers.dll" />

-                <include name="System.dll" />

-                <include name="System.Data.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../bin/XMLRPC.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>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
deleted file mode 100644
index 43f56a4..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
+++ /dev/null
@@ -1,122 +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>{D1D78B8D-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.UserManager</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.UserManager</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="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.Framework" >

-      <HintPath>OpenSim.Framework.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.Framework.Console" >

-      <HintPath>OpenSim.Framework.Console.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.GenericConfig.Xml" >

-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.Servers" >

-      <HintPath>OpenSim.Servers.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="XMLRPC" >

-      <HintPath>XMLRPC.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="UserManagerBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
deleted file mode 100644
index 5941547..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
deleted file mode 100644
index 81a87f5..0000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>

-<project name="OpenGrid.Framework.UserManager" 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="OpenGrid.Framework.UserManager" dynamicprefix="true" >

-            </resources>

-            <sources failonempty="true">

-                <include name="UserManagerBase.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="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

-                <include name="../../bin/OpenSim.Framework.Console.dll" />

-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

-                <include name="../../bin/OpenSim.Servers.dll" />

-                <include name="System.dll" />

-                <include name="System.Data.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../bin/XMLRPC.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>

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
deleted file mode 100644
index 6e8eba7..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ /dev/null
@@ -1,125 +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>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>OpenSim.Servers</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

-    <RootNamespace>OpenSim.Servers</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="libsecondlife.dll">

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System">

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Xml">

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

-      <Name>OpenSim.Framework</Name>

-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

-    </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

-      <Name>OpenSim.Framework.Console</Name>

-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

-    </ProjectReference>

-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

-      <Name>XMLRPC</Name>

-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="BaseHttpServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="CheckSumServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="IRestHandler.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UDPServerBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcMethod.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
deleted file mode 100644
index 4103e73..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" ?>

-<project name="OpenSim.Servers" 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.Servers" dynamicprefix="true" >

-            </resources>

-            <sources failonempty="true">

-                <include name="BaseHttpServer.cs" />

-                <include name="CheckSumServer.cs" />

-                <include name="IRestHandler.cs" />

-                <include name="LocalUserProfileManager.cs" />

-                <include name="LoginResponse.cs" />

-                <include name="LoginServer.cs" />

-                <include name="UDPServerBase.cs" />

-                <include name="XmlRpcMethod.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="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

-                <include name="../../bin/OpenSim.Framework.Console.dll" />

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../bin/XMLRPC.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>

diff --git a/Common/XmlRpcCS/Logger.cs b/Common/XmlRpcCS/Logger.cs
deleted file mode 100644
index ebf804b..0000000
--- a/Common/XmlRpcCS/Logger.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-

-    /// <summary>Define levels of logging.</summary><remarks> This duplicates

-    /// similar enumerations in System.Diagnostics.EventLogEntryType. The 

-    /// duplication was merited because .NET Compact Framework lacked the EventLogEntryType enum.</remarks>

-    public enum LogLevel

-    {

-        /// <summary>Information level, log entry for informational reasons only.</summary>

-        Information,

-        /// <summary>Warning level, indicates a possible problem.</summary>

-        Warning,

-        /// <summary>Error level, implies a significant problem.</summary>

-        Error

-    }

-

-    ///<summary>

-    ///Logging singleton with swappable output delegate.

-    ///</summary>

-    ///<remarks>

-    ///This singleton provides a centralized log. The actual WriteEntry calls are passed

-    ///off to a delegate however. Having a delegate do the actual logginh allows you to

-    ///implement different logging mechanism and have them take effect throughout the system.

-    ///</remarks>

-    public class Logger

-    {

-        ///<summary>Delegate definition for logging.</summary>

-        ///<param name="message">The message <c>String</c> to log.</param>

-        ///<param name="level">The <c>LogLevel</c> of your message.</param>

-        public delegate void LoggerDelegate(String message, LogLevel level);

-        ///<summary>The LoggerDelegate that will recieve WriteEntry requests.</summary>

-        static public LoggerDelegate Delegate = null;

-

-        ///<summary>

-        ///Method logging events are sent to.

-        ///</summary>

-        ///<param name="message">The message <c>String</c> to log.</param>

-        ///<param name="level">The <c>LogLevel</c> of your message.</param>

-        static public void WriteEntry(String message, LogLevel level)

-        {

-            if (Delegate != null)

-                Delegate(message, level);

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/SimpleHttpRequest.cs b/Common/XmlRpcCS/SimpleHttpRequest.cs
deleted file mode 100644
index e5326c3..0000000
--- a/Common/XmlRpcCS/SimpleHttpRequest.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.IO;

-    using System.Net.Sockets;

-    using System.Collections;

-

-    ///<summary>Very basic HTTP request handler.</summary>

-    ///<remarks>This class is designed to accept a TcpClient and treat it as an HTTP request.

-    /// It will do some basic header parsing and manage the input and output streams associated

-    /// with the request.</remarks>

-    public class SimpleHttpRequest

-    {

-        private String _httpMethod = null;

-        private String _protocol;

-        private String _filePathFile = null;

-        private String _filePathDir = null;

-        private String __filePath;

-        private TcpClient _client;

-        private StreamReader _input;

-        private StreamWriter _output;

-        private Hashtable _headers;

-

-        /// <summary>A constructor which accepts the TcpClient.</summary>

-        /// <remarks>It creates the associated input and output streams, determines the request type,

-        /// and parses the remaining HTTP header.</remarks>

-        /// <param name="client">The <c>TcpClient</c> associated with the HTTP connection.</param>

-        public SimpleHttpRequest(TcpClient client)

-        {

-            _client = client;

-            _output = new StreamWriter(client.GetStream());

-            _input = new StreamReader(client.GetStream());

-            GetRequestMethod();

-            GetRequestHeaders();

-        }

-

-        /// <summary>The output <c>StreamWriter</c> associated with the request.</summary>

-        public StreamWriter Output

-        {

-            get { return _output; }

-        }

-

-        /// <summary>The input <c>StreamReader</c> associated with the request.</summary>

-        public StreamReader Input

-        {

-            get { return _input; }

-        }

-

-        /// <summary>The <c>TcpClient</c> with the request.</summary>

-        public TcpClient Client

-        {

-            get { return _client; }

-        }

-

-        private String _filePath

-        {

-            get { return __filePath; }

-            set

-            {

-                __filePath = value;

-                _filePathDir = null;

-                _filePathFile = null;

-            }

-        }

-

-        /// <summary>The type of HTTP request (i.e. PUT, GET, etc.).</summary>

-        public String HttpMethod

-        {

-            get { return _httpMethod; }

-        }

-

-        /// <summary>The level of the HTTP protocol.</summary>

-        public String Protocol

-        {

-            get { return _protocol; }

-        }

-

-        /// <summary>The "path" which is part of any HTTP request.</summary>

-        public String FilePath

-        {

-            get { return _filePath; }

-        }

-

-        /// <summary>The file portion of the "path" which is part of any HTTP request.</summary>

-        public String FilePathFile

-        {

-            get

-            {

-                if (_filePathFile != null)

-                    return _filePathFile;

-

-                int i = FilePath.LastIndexOf("/");

-

-                if (i == -1)

-                    return "";

-

-                i++;

-                _filePathFile = FilePath.Substring(i, FilePath.Length - i);

-                return _filePathFile;

-            }

-        }

-

-        /// <summary>The directory portion of the "path" which is part of any HTTP request.</summary>

-        public String FilePathDir

-        {

-            get

-            {

-                if (_filePathDir != null)

-                    return _filePathDir;

-

-                int i = FilePath.LastIndexOf("/");

-

-                if (i == -1)

-                    return "";

-

-                i++;

-                _filePathDir = FilePath.Substring(0, i);

-                return _filePathDir;

-            }

-        }

-

-        private void GetRequestMethod()

-        {

-            string req = _input.ReadLine();

-            if (req == null)

-                throw new ApplicationException("Void request.");

-

-            if (0 == String.Compare("GET ", req.Substring(0, 4), true))

-                _httpMethod = "GET";

-            else if (0 == String.Compare("POST ", req.Substring(0, 5), true))

-                _httpMethod = "POST";

-            else

-                throw new InvalidOperationException("Unrecognized method in query: " + req);

-

-            req = req.TrimEnd();

-            int idx = req.IndexOf(' ') + 1;

-            if (idx >= req.Length)

-                throw new ApplicationException("What do you want?");

-

-            string page_protocol = req.Substring(idx);

-            int idx2 = page_protocol.IndexOf(' ');

-            if (idx2 == -1)

-                idx2 = page_protocol.Length;

-

-            _filePath = page_protocol.Substring(0, idx2).Trim();

-            _protocol = page_protocol.Substring(idx2).Trim();

-        }

-

-        private void GetRequestHeaders()

-        {

-            String line;

-            int idx;

-

-            _headers = new Hashtable();

-

-            while ((line = _input.ReadLine()) != "")

-            {

-                if (line == null)

-                {

-                    break;

-                }

-

-                idx = line.IndexOf(':');

-                if (idx == -1 || idx == line.Length - 1)

-                {

-                    Logger.WriteEntry("Malformed header line: " + line, LogLevel.Information);

-                    continue;

-                }

-

-                String key = line.Substring(0, idx);

-                String value = line.Substring(idx + 1);

-

-                try

-                {

-                    _headers.Add(key, value);

-                }

-                catch (Exception)

-                {

-                    Logger.WriteEntry("Duplicate header key in line: " + line, LogLevel.Information);

-                }

-            }

-        }

-

-        /// <summary>

-        /// Format the object contents into a useful string representation.

-        /// </summary>

-        ///<returns><c>String</c> representation of the <c>SimpleHttpRequest</c> as the <i>HttpMethod FilePath Protocol</i>.</returns>

-        override public String ToString()

-        {

-            return HttpMethod + " " + FilePath + " " + Protocol;

-        }

-

-        /// <summary>

-        /// Close the <c>SimpleHttpRequest</c>. This flushes and closes all associated io streams.

-        /// </summary>

-        public void Close()

-        {

-            _output.Flush();

-            _output.Close();

-            _input.Close();

-            _client.Close();

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
deleted file mode 100644
index 61f8be0..0000000
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ /dev/null
@@ -1,138 +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>{8E81D43C-0000-0000-0000-000000000000}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>XMLRPC</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>XMLRPC</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>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Logger.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="SimpleHttpRequest.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcBoxcarRequest.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcClientProxy.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcDeserializer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcErrorCodes.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcException.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcExposedAttribute.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcRequest.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcRequestDeserializer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcRequestSerializer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcResponder.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcResponse.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcResponseDeserializer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcResponseSerializer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcSerializer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcSystemObject.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="XmlRpcXmlTokens.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
deleted file mode 100644
index 2eabfcd..0000000
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" ?>

-<project name="XMLRPC" 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="XMLRPC" dynamicprefix="true" >

-            </resources>

-            <sources failonempty="true">

-                <include name="Logger.cs" />

-                <include name="SimpleHttpRequest.cs" />

-                <include name="XmlRpcBoxcarRequest.cs" />

-                <include name="XmlRpcClientProxy.cs" />

-                <include name="XmlRpcDeserializer.cs" />

-                <include name="XmlRpcErrorCodes.cs" />

-                <include name="XmlRpcException.cs" />

-                <include name="XmlRpcExposedAttribute.cs" />

-                <include name="XmlRpcRequest.cs" />

-                <include name="XmlRpcRequestDeserializer.cs" />

-                <include name="XmlRpcRequestSerializer.cs" />

-                <include name="XmlRpcResponder.cs" />

-                <include name="XmlRpcResponse.cs" />

-                <include name="XmlRpcResponseDeserializer.cs" />

-                <include name="XmlRpcResponseSerializer.cs" />

-                <include name="XmlRpcSerializer.cs" />

-                <include name="XmlRpcServer.cs" />

-                <include name="XmlRpcSystemObject.cs" />

-                <include name="XmlRpcXmlTokens.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" />

-                <include name="System.Xml.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>

diff --git a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
deleted file mode 100644
index f87f7a5..0000000
--- a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc

-{

-  using System;

-  using System.Collections;

-  using System.IO;

-  using System.Xml;

-  using System.Net;

-  using System.Text;

-  using System.Reflection;

-

-  /// <summary>Class that collects individual <c>XmlRpcRequest</c> objects and submits them as a <i>boxcarred</i> request.</summary>

-  /// <remarks>A boxcared request is when a number of request are collected before being sent via XML-RPC, and then are sent via

-  /// a single HTTP connection. This results in a speed up from reduced connection time.  The results are then retuned collectively

-  /// as well.

-  ///</remarks>

-  /// <seealso cref="XmlRpcRequest"/>

-  public class XmlRpcBoxcarRequest : XmlRpcRequest

-  {

-    /// <summary>ArrayList to collect the requests to boxcar.</summary>

-    public IList Requests = new ArrayList();

-

-    /// <summary>Basic constructor.</summary>

-    public XmlRpcBoxcarRequest()

-      {

-      }

-

-    /// <summary>Returns the <c>String</c> "system.multiCall" which is the server method that handles boxcars.</summary>

-    public override String MethodName

-      {

-        get { return  "system.multiCall";  }

-      }

-

-    /// <summary>The <c>ArrayList</c> of boxcarred <paramref>Requests</paramref> as properly formed parameters.</summary>

-    public override IList Params

-      {

-        get {

-          _params.Clear();

-          ArrayList reqArray = new ArrayList();

-          foreach (XmlRpcRequest request in Requests)

-            {

-              Hashtable requestEntry = new Hashtable();

-              requestEntry.Add(XmlRpcXmlTokens.METHOD_NAME, request.MethodName);

-              requestEntry.Add(XmlRpcXmlTokens.PARAMS, request.Params);

-              reqArray.Add(requestEntry);

-            }

-          _params.Add(reqArray);

-          return _params;

-        }

-      }

-  }

-}

diff --git a/Common/XmlRpcCS/XmlRpcClientProxy.cs b/Common/XmlRpcCS/XmlRpcClientProxy.cs
deleted file mode 100644
index f52273a..0000000
--- a/Common/XmlRpcCS/XmlRpcClientProxy.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-namespace Nwc.XmlRpc

-{

-  using System;

-  using System.Runtime.Remoting.Proxies;

-  using System.Runtime.Remoting.Messaging;

-

-  /// <summary>This class provides support for creating local proxies of XML-RPC remote objects</summary>

-  /// <remarks>

-  /// To create a local proxy you need to create a local C# interface and then, via <i>createProxy</i>

-  /// associate that interface with a remote object at a given URL.

-  /// </remarks>

-public class XmlRpcClientProxy : RealProxy

-{

-  private String _remoteObjectName;

-  private String _url;

-  private XmlRpcRequest _client = new XmlRpcRequest();

-

-  /// <summary>Factory method to create proxies.</summary>

-  /// <remarks>

-  /// To create a local proxy you need to create a local C# interface with methods that mirror those of the server object.

-  /// Next, pass that interface into <c>createProxy</c> along with the object name and URL of the remote object and 

-  /// cast the resulting object to the specifice interface.

-  /// </remarks>

-  /// <param name="remoteObjectName"><c>String</c> The name of the remote object.</param>

-  /// <param name="url"><c>String</c> The URL of the remote object.</param>

-  /// <param name="anInterface"><c>Type</c> The typeof() of a C# interface.</param>

-  /// <returns><c>Object</c> A proxy for your specified interface. Cast to appropriate type.</returns>

-  public static Object createProxy(String remoteObjectName, String url, Type anInterface)

-    {

-      return new XmlRpcClientProxy(remoteObjectName, url, anInterface).GetTransparentProxy();

-    }

-

-  private XmlRpcClientProxy(String remoteObjectName, String url, Type t) : base(t)

-    {

-      _remoteObjectName = remoteObjectName;

-      _url = url;

-    }

-

-  /// <summary>The local method dispatcher - do not invoke.</summary>

-  override public IMessage Invoke(IMessage msg)

-    {

-      IMethodCallMessage methodMessage = (IMethodCallMessage)msg;

-

-      _client.MethodName = _remoteObjectName + "." + methodMessage.MethodName;

-      _client.Params.Clear();

-      foreach (Object o in methodMessage.Args)

-        _client.Params.Add(o);

-

-      try

-        {

-          Object ret = _client.Invoke(_url);

-          return new ReturnMessage(ret,null,0,

-                                   methodMessage.LogicalCallContext, methodMessage);

-        }

-      catch (Exception e)

-        {

-          return new ReturnMessage(e, methodMessage);

-        }

-    }

-}

-}

diff --git a/Common/XmlRpcCS/XmlRpcDeserializer.cs b/Common/XmlRpcCS/XmlRpcDeserializer.cs
deleted file mode 100644
index bd736c0..0000000
--- a/Common/XmlRpcCS/XmlRpcDeserializer.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.IO;

-    using System.Xml;

-    using System.Globalization;

-

-    /// <summary>Parser context, we maintain contexts in a stack to avoiding recursion. </summary>

-    struct Context

-    {

-        public String Name;

-        public Object Container;

-    }

-

-    /// <summary>Basic XML-RPC data deserializer.</summary>

-    /// <remarks>Uses <c>XmlTextReader</c> to parse the XML data. This level of the class 

-    /// only handles the tokens common to both Requests and Responses. This class is not useful in and of itself

-    /// but is designed to be subclassed.</remarks>

-    public class XmlRpcDeserializer : XmlRpcXmlTokens

-    {

-        private static DateTimeFormatInfo _dateFormat = new DateTimeFormatInfo();

-

-        private Object _container;

-        private Stack _containerStack;

-

-        /// <summary>Protected reference to last text.</summary>

-        protected String _text;

-        /// <summary>Protected reference to last deserialized value.</summary>

-        protected Object _value;

-        /// <summary>Protected reference to last name field.</summary>

-        protected String _name;

-

-

-        /// <summary>Basic constructor.</summary>

-        public XmlRpcDeserializer()

-        {

-            Reset();

-            _dateFormat.FullDateTimePattern = ISO_DATETIME;

-        }

-

-        /// <summary>Static method that parses XML data into a response using the Singleton.</summary>

-        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC response.</param>

-        /// <returns><c>Object</c> object resulting from the deserialization.</returns>

-        virtual public Object Deserialize(TextReader xmlData)

-        {

-            return null;

-        }

-

-        /// <summary>Protected method to parse a node in an XML-RPC XML stream.</summary>

-        /// <remarks>Method deals with elements common to all XML-RPC data, subclasses of 

-        /// this object deal with request/response spefic elements.</remarks>

-        /// <param name="reader"><c>XmlTextReader</c> of the in progress parsing data stream.</param>

-        protected void DeserializeNode(XmlTextReader reader)

-        {

-            switch (reader.NodeType)

-            {

-                case XmlNodeType.Element:

-                    if (Logger.Delegate != null)

-                        Logger.WriteEntry("START " + reader.Name, LogLevel.Information);

-                    switch (reader.Name)

-                    {

-                        case VALUE:

-                            _value = null;

-                            _text = null;

-                            break;

-                        case STRUCT:

-                            PushContext();

-                            _container = new Hashtable();

-                            break;

-                        case ARRAY:

-                            PushContext();

-                            _container = new ArrayList();

-                            break;

-                    }

-                    break;

-                case XmlNodeType.EndElement:

-                    if (Logger.Delegate != null)

-                        Logger.WriteEntry("END " + reader.Name, LogLevel.Information);

-                    switch (reader.Name)

-                    {

-                        case BASE64:

-                            _value = Convert.FromBase64String(_text);

-                            break;

-                        case BOOLEAN:

-                            int val = Int16.Parse(_text);

-                            if (val == 0)

-                                _value = false;

-                            else if (val == 1)

-                                _value = true;

-                            break;

-                        case STRING:

-                            _value = _text;

-                            break;

-                        case DOUBLE:

-                            _value = Double.Parse(_text);

-                            break;

-                        case INT:

-                        case ALT_INT:

-                            _value = Int32.Parse(_text);

-                            break;

-                        case DATETIME:

-#if __MONO__

-                    _value = DateParse(_text);

-#else

-                            _value = DateTime.ParseExact(_text, "F", _dateFormat);

-#endif

-                            break;

-                        case NAME:

-                            _name = _text;

-                            break;

-                        case VALUE:

-                            if (_value == null)

-                                _value = _text; // some kits don't use <string> tag, they just do <value>

-

-                            if ((_container != null) && (_container is IList)) // in an array?  If so add value to it.

-                                ((IList)_container).Add(_value);

-                            break;

-                        case MEMBER:

-                            if ((_container != null) && (_container is IDictionary)) // in an struct?  If so add value to it.

-                                ((IDictionary)_container).Add(_name, _value);

-                            break;

-                        case ARRAY:

-                        case STRUCT:

-                            _value = _container;

-                            PopContext();

-                            break;

-                    }

-                    break;

-                case XmlNodeType.Text:

-                    if (Logger.Delegate != null)

-                        Logger.WriteEntry("Text " + reader.Value, LogLevel.Information);

-                    _text = reader.Value;

-                    break;

-                default:

-                    break;

-            }

-        }

-

-        /// <summary>Static method that parses XML in a <c>String</c> into a 

-        /// request using the Singleton.</summary>

-        /// <param name="xmlData"><c>String</c> containing an XML-RPC request.</param>

-        /// <returns><c>XmlRpcRequest</c> object resulting from the parse.</returns>

-        public Object Deserialize(String xmlData)

-        {

-            StringReader sr = new StringReader(xmlData);

-            return Deserialize(sr);

-        }

-

-        /// <summary>Pop a Context of the stack, an Array or Struct has closed.</summary>

-        private void PopContext()

-        {

-            Context c = (Context)_containerStack.Pop();

-            _container = c.Container;

-            _name = c.Name;

-        }

-

-        /// <summary>Push a Context on the stack, an Array or Struct has opened.</summary>

-        private void PushContext()

-        {

-            Context context;

-

-            context.Container = _container;

-            context.Name = _name;

-

-            _containerStack.Push(context);

-        }

-

-        /// <summary>Reset the internal state of the deserializer.</summary>

-        protected void Reset()

-        {

-            _text = null;

-            _value = null;

-            _name = null;

-            _container = null;

-            _containerStack = new Stack();

-        }

-

-#if __MONO__

-    private DateTime DateParse(String str)

-      {

-        int year = Int32.Parse(str.Substring(0,4));

-        int month = Int32.Parse(str.Substring(4,2));

-        int day = Int32.Parse(str.Substring(6,2));

-        int hour = Int32.Parse(str.Substring(9,2));

-        int min = Int32.Parse(str.Substring(12,2));

-        int sec = Int32.Parse(str.Substring(15,2));

-        return new DateTime(year,month,day,hour,min,sec);

-      }

-#endif

-

-    }

-}

-

-

diff --git a/Common/XmlRpcCS/XmlRpcErrorCodes.cs b/Common/XmlRpcCS/XmlRpcErrorCodes.cs
deleted file mode 100644
index 6dec57d..0000000
--- a/Common/XmlRpcCS/XmlRpcErrorCodes.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-

-    /// <summary>Standard XML-RPC error codes.</summary>

-    public class XmlRpcErrorCodes

-    {

-        /// <summary></summary>

-        public const int PARSE_ERROR_MALFORMED = -32700;

-        /// <summary></summary>

-        public const String PARSE_ERROR_MALFORMED_MSG = "Parse Error, not well formed";

-

-        /// <summary></summary>

-        public const int PARSE_ERROR_ENCODING = -32701;

-        /// <summary></summary>

-        public const String PARSE_ERROR_ENCODING_MSG = "Parse Error, unsupported encoding";

-

-        //

-        // -32702 ---> parse error. invalid character for encoding

-        // -32600 ---> server error. invalid xml-rpc. not conforming to spec.

-        //

-

-        /// <summary></summary>

-        public const int SERVER_ERROR_METHOD = -32601;

-        /// <summary></summary>

-        public const String SERVER_ERROR_METHOD_MSG = "Server Error, requested method not found";

-

-        /// <summary></summary>

-        public const int SERVER_ERROR_PARAMS = -32602;

-        /// <summary></summary>

-        public const String SERVER_ERROR_PARAMS_MSG = "Server Error, invalid method parameters";

-

-        //

-        // -32603 ---> server error. internal xml-rpc error

-        //

-

-        /// <summary></summary>

-        public const int APPLICATION_ERROR = -32500;

-        /// <summary></summary>

-        public const String APPLICATION_ERROR_MSG = "Application Error";

-

-        //

-        // -32400 ---> system error

-        //

-

-        /// <summary></summary>

-        public const int TRANSPORT_ERROR = -32300;

-        /// <summary></summary>

-        public const String TRANSPORT_ERROR_MSG = "Transport Layer Error";

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcException.cs b/Common/XmlRpcCS/XmlRpcException.cs
deleted file mode 100644
index fd1f4ae..0000000
--- a/Common/XmlRpcCS/XmlRpcException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-

-    /// <summary>An XML-RPC Exception.</summary>

-    /// <remarks>Maps a C# exception to an XML-RPC fault. Normal exceptions

-    /// include a message so this adds the code needed by XML-RPC.</remarks>

-    public class XmlRpcException : Exception

-    {

-        private int _code;

-

-        /// <summary>Instantiate an <c>XmlRpcException</c> with a code and message.</summary>

-        /// <param name="code"><c>Int</c> faultCode associated with this exception.</param>

-        /// <param name="message"><c>String</c> faultMessage associated with this exception.</param>

-        public XmlRpcException(int code, String message)

-            : base(message)

-        {

-            _code = code;

-        }

-

-        /// <summary>The value of the faults message, i.e. the faultString.</summary>

-        public String FaultString

-        {

-            get { return Message; }

-        }

-

-        /// <summary>The value of the faults code, i.e. the faultCode.</summary>

-        public int FaultCode

-        {

-            get { return _code; }

-        }

-

-        /// <summary>Format the message to include the code.</summary>

-        override public String ToString()

-        {

-            return "Code: " + FaultCode + " Message: " + base.ToString();

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs b/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
deleted file mode 100644
index 67b27ae..0000000
--- a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Reflection;

-

-    /// <summary>

-    /// Simple tagging attribute to indicate participation is XML-RPC exposure.

-    /// </summary>

-    /// <remarks>

-    /// If present at the class level it indicates that this class does explicitly 

-    /// expose methods. If present at the method level it denotes that the method

-    /// is exposed.

-    /// </remarks>

-    [AttributeUsage(

-          AttributeTargets.Class | AttributeTargets.Method,

-          AllowMultiple = false,

-          Inherited = true

-      )]

-    public class XmlRpcExposedAttribute : Attribute

-    {

-        /// <summary>Check if <paramref>obj</paramref> is an object utilizing the XML-RPC exposed Attribute.</summary>

-        /// <param name="obj"><c>Object</c> of a class or method to check for attribute.</param>

-        /// <returns><c>Boolean</c> true if attribute present.</returns>

-        public static Boolean ExposedObject(Object obj)

-        {

-            return IsExposed(obj.GetType());

-        }

-

-        /// <summary>Check if <paramref>obj</paramref>.<paramref>methodName</paramref> is an XML-RPC exposed method.</summary>

-        /// <remarks>A method is considered to be exposed if it exists and, either, the object does not use the XmlRpcExposed attribute,

-        /// or the object does use the XmlRpcExposed attribute and the method has the XmlRpcExposed attribute as well.</remarks>

-        /// <returns><c>Boolean</c> true if the  method is exposed.</returns>

-        public static Boolean ExposedMethod(Object obj, String methodName)

-        {

-            Type type = obj.GetType();

-            MethodInfo method = type.GetMethod(methodName);

-

-            if (method == null)

-                throw new MissingMethodException("Method " + methodName + " not found.");

-

-            if (!IsExposed(type))

-                return true;

-

-            return IsExposed(method);

-        }

-

-        /// <summary>Check if <paramref>mi</paramref> is XML-RPC exposed.</summary>

-        /// <param name="mi"><c>MemberInfo</c> of a class or method to check for attribute.</param>

-        /// <returns><c>Boolean</c> true if attribute present.</returns>

-        public static Boolean IsExposed(MemberInfo mi)

-        {

-            foreach (Attribute attr in mi.GetCustomAttributes(true))

-            {

-                if (attr is XmlRpcExposedAttribute)

-                    return true;

-            }

-            return false;

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcRequest.cs b/Common/XmlRpcCS/XmlRpcRequest.cs
deleted file mode 100644
index 18d2182..0000000
--- a/Common/XmlRpcCS/XmlRpcRequest.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.IO;

-    using System.Xml;

-    using System.Net;

-    using System.Text;

-    using System.Reflection;

-    using System.Net.Security;

-    using System.Security.Cryptography.X509Certificates;

-

-    internal class AcceptAllCertificatePolicy : ICertificatePolicy

-    {

-        public AcceptAllCertificatePolicy()

-        {

-        }

-

-        public bool CheckValidationResult(ServicePoint sPoint,

-            System.Security.Cryptography.X509Certificates.X509Certificate cert,

-            WebRequest wRequest, int certProb)

-        {

-            // Always accept

-            return true;

-        }

-    }

-

-    /// <summary>Class supporting the request side of an XML-RPC transaction.</summary>

-    public class XmlRpcRequest

-    {

-        private String _methodName = null;

-        private Encoding _encoding = new ASCIIEncoding();

-        private XmlRpcRequestSerializer _serializer = new XmlRpcRequestSerializer();

-        private XmlRpcResponseDeserializer _deserializer = new XmlRpcResponseDeserializer();

-

-        /// <summary><c>ArrayList</c> containing the parameters.</summary>

-        protected IList _params = null;

-

-        /// <summary>Instantiate an <c>XmlRpcRequest</c></summary>

-        public XmlRpcRequest()

-        {

-            _params = new ArrayList();

-        }

-

-        /// <summary>Instantiate an <c>XmlRpcRequest</c> for a specified method and parameters.</summary>

-        /// <param name="methodName"><c>String</c> designating the <i>object.method</i> on the server the request

-        /// should be directed to.</param>

-        /// <param name="parameters"><c>ArrayList</c> of XML-RPC type parameters to invoke the request with.</param>

-        public XmlRpcRequest(String methodName, IList parameters)

-        {

-            MethodName = methodName;

-            _params = parameters;

-        }

-

-        /// <summary><c>ArrayList</c> conntaining the parameters for the request.</summary>

-        public virtual IList Params

-        {

-            get { return _params; }

-        }

-

-        /// <summary><c>String</c> conntaining the method name, both object and method, that the request will be sent to.</summary>

-        public virtual String MethodName

-        {

-            get { return _methodName; }

-            set { _methodName = value; }

-        }

-

-        /// <summary><c>String</c> object name portion of the method name.</summary>

-        public String MethodNameObject

-        {

-            get

-            {

-                int index = MethodName.IndexOf(".");

-

-                if (index == -1)

-                    return MethodName;

-

-                return MethodName.Substring(0, index);

-            }

-        }

-

-        /// <summary><c>String</c> method name portion of the object.method name.</summary>

-        public String MethodNameMethod

-        {

-            get

-            {

-                int index = MethodName.IndexOf(".");

-

-                if (index == -1)

-                    return MethodName;

-

-                return MethodName.Substring(index + 1, MethodName.Length - index - 1);

-            }

-        }

-

-        /// <summary>Invoke this request on the server.</summary>

-        /// <param name="url"><c>String</c> The url of the XML-RPC server.</param>

-        /// <returns><c>Object</c> The value returned from the method invocation on the server.</returns>

-        /// <exception cref="XmlRpcException">If an exception generated on the server side.</exception>

-        public Object Invoke(String url)

-        {

-            XmlRpcResponse res = Send(url, 10000);

-

-            if (res.IsFault)

-                throw new XmlRpcException(res.FaultCode, res.FaultString);

-

-            return res.Value;

-        }

-

-        /// <summary>Send the request to the server.</summary>

-        /// <param name="url"><c>String</c> The url of the XML-RPC server.</param>

-        /// <param name="timeout">Milliseconds before the connection times out.</param>

-        /// <returns><c>XmlRpcResponse</c> The response generated.</returns>

-        public XmlRpcResponse Send(String url, int timeout)

-        {

-            // Override SSL authentication mechanisms

-            ServicePointManager.CertificatePolicy = new AcceptAllCertificatePolicy();

-

-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);

-            if (request == null)

-                throw new XmlRpcException(XmlRpcErrorCodes.TRANSPORT_ERROR,

-                              XmlRpcErrorCodes.TRANSPORT_ERROR_MSG + ": Could not create request with " + url);

-            request.Method = "POST";

-            request.ContentType = "text/xml";

-            request.AllowWriteStreamBuffering = true;

-            request.Timeout = timeout;

-

-            Stream stream = request.GetRequestStream();

-            XmlTextWriter xml = new XmlTextWriter(stream, _encoding);

-            _serializer.Serialize(xml, this);

-            xml.Flush();

-            xml.Close();

-

-            HttpWebResponse response = (HttpWebResponse)request.GetResponse();

-            StreamReader input = new StreamReader(response.GetResponseStream());

-

-            XmlRpcResponse resp = (XmlRpcResponse)_deserializer.Deserialize(input);

-            input.Close();

-            response.Close();

-            return resp;

-        }

-

-        /// <summary>Produce <c>String</c> representation of the object.</summary>

-        /// <returns><c>String</c> representation of the object.</returns>

-        override public String ToString()

-        {

-            return _serializer.Serialize(this);

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
deleted file mode 100644
index 0770b7e..0000000
--- a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.Diagnostics;

-    using System.IO;

-    using System.Xml;

-

-    /// <summary>Class to deserialize XML data representing a request.</summary>

-    public class XmlRpcRequestDeserializer : XmlRpcDeserializer

-    {

-        static private XmlRpcRequestDeserializer _singleton;

-        /// <summary>A static singleton instance of this deserializer.</summary>

-        [Obsolete("This object is now thread safe, just use an instance.", false)]

-        static public XmlRpcRequestDeserializer Singleton

-        {

-            get

-            {

-                if (_singleton == null)

-                    _singleton = new XmlRpcRequestDeserializer();

-

-                return _singleton;

-            }

-        }

-

-        /// <summary>Static method that parses XML data into a request using the Singleton.</summary>

-        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC request.</param>

-        /// <returns><c>XmlRpcRequest</c> object resulting from the parse.</returns>

-        override public Object Deserialize(TextReader xmlData)

-        {

-            XmlTextReader reader = new XmlTextReader(xmlData);

-            XmlRpcRequest request = new XmlRpcRequest();

-            bool done = false;

-

-            lock (this)

-            {

-                Reset();

-                while (!done && reader.Read())

-                {

-                    DeserializeNode(reader); // Parent parse...

-                    switch (reader.NodeType)

-                    {

-                        case XmlNodeType.EndElement:

-                            switch (reader.Name)

-                            {

-                                case METHOD_NAME:

-                                    request.MethodName = _text;

-                                    break;

-                                case METHOD_CALL:

-                                    done = true;

-                                    break;

-                                case PARAM:

-                                    request.Params.Add(_value);

-                                    _text = null;

-                                    break;

-                            }

-                            break;

-                    }

-                }

-            }

-            return request;

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs b/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
deleted file mode 100644
index 8099bdb..0000000
--- a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.Xml;

-    using System.IO;

-

-    /// <summary>Class responsible for serializing an XML-RPC request.</summary>

-    /// <remarks>This class handles the request envelope, depending on <c>XmlRpcSerializer</c>

-    /// to serialize the payload.</remarks>

-    /// <seealso cref="XmlRpcSerializer"/>

-    public class XmlRpcRequestSerializer : XmlRpcSerializer

-    {

-        static private XmlRpcRequestSerializer _singleton;

-        /// <summary>A static singleton instance of this deserializer.</summary>

-        static public XmlRpcRequestSerializer Singleton

-        {

-            get

-            {

-                if (_singleton == null)

-                    _singleton = new XmlRpcRequestSerializer();

-

-                return _singleton;

-            }

-        }

-

-        /// <summary>Serialize the <c>XmlRpcRequest</c> to the output stream.</summary>

-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>

-        /// <param name="obj">An <c>XmlRpcRequest</c> to serialize.</param>

-        /// <seealso cref="XmlRpcRequest"/>

-        override public void Serialize(XmlTextWriter output, Object obj)

-        {

-            XmlRpcRequest request = (XmlRpcRequest)obj;

-            output.WriteStartDocument();

-            output.WriteStartElement(METHOD_CALL);

-            output.WriteElementString(METHOD_NAME, request.MethodName);

-            output.WriteStartElement(PARAMS);

-            foreach (Object param in request.Params)

-            {

-                output.WriteStartElement(PARAM);

-                output.WriteStartElement(VALUE);

-                SerializeObject(output, param);

-                output.WriteEndElement();

-                output.WriteEndElement();

-            }

-

-            output.WriteEndElement();

-            output.WriteEndElement();

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcResponder.cs b/Common/XmlRpcCS/XmlRpcResponder.cs
deleted file mode 100644
index 0412568..0000000
--- a/Common/XmlRpcCS/XmlRpcResponder.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Xml;

-    using System.Net.Sockets;

-

-    /// <summary>The class is a container of the context of an XML-RPC dialog on the server side.</summary>

-    /// <remarks>Instances of this class maintain the context for an individual XML-RPC server

-    /// side dialog. Namely they manage an inbound deserializer and an outbound serializer. </remarks>

-    public class XmlRpcResponder

-    {

-        private XmlRpcRequestDeserializer _deserializer = new XmlRpcRequestDeserializer();

-        private XmlRpcResponseSerializer _serializer = new XmlRpcResponseSerializer();

-        private XmlRpcServer _server;

-        private TcpClient _client;

-        private SimpleHttpRequest _httpReq;

-

-        /// <summary>The SimpleHttpRequest based on the TcpClient.</summary>

-        public SimpleHttpRequest HttpReq

-        {

-            get { return _httpReq; }

-        }

-

-        /// <summary>Basic constructor.</summary>

-        /// <param name="server">XmlRpcServer that this XmlRpcResponder services.</param>

-        /// <param name="client">TcpClient with the connection.</param>

-        public XmlRpcResponder(XmlRpcServer server, TcpClient client)

-        {

-            _server = server;

-            _client = client;

-            _httpReq = new SimpleHttpRequest(_client);

-        }

-

-        /// <summary>Call close to insure proper shutdown.</summary>

-        ~XmlRpcResponder()

-        {

-            Close();

-        }

-

-        ///<summary>Respond using this responders HttpReq.</summary>

-        public void Respond()

-        {

-            Respond(HttpReq);

-        }

-

-        /// <summary>Handle an HTTP request containing an XML-RPC request.</summary>

-        /// <remarks>This method deserializes the XML-RPC request, invokes the 

-        /// described method, serializes the response (or fault) and sends the XML-RPC response

-        /// back as a valid HTTP page.

-        /// </remarks>

-        /// <param name="httpReq"><c>SimpleHttpRequest</c> containing the request.</param>

-        public void Respond(SimpleHttpRequest httpReq)

-        {

-            XmlRpcRequest xmlRpcReq = (XmlRpcRequest)_deserializer.Deserialize(httpReq.Input);

-            XmlRpcResponse xmlRpcResp = new XmlRpcResponse();

-

-            try

-            {

-                xmlRpcResp.Value = _server.Invoke(xmlRpcReq);

-            }

-            catch (XmlRpcException e)

-            {

-                xmlRpcResp.SetFault(e.FaultCode, e.FaultString);

-            }

-            catch (Exception e2)

-            {

-                xmlRpcResp.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,

-                      XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);

-            }

-

-            if (Logger.Delegate != null)

-                Logger.WriteEntry(xmlRpcResp.ToString(), LogLevel.Information);

-

-            XmlRpcServer.HttpHeader(httpReq.Protocol, "text/xml", 0, " 200 OK", httpReq.Output);

-            httpReq.Output.Flush();

-            XmlTextWriter xml = new XmlTextWriter(httpReq.Output);

-            _serializer.Serialize(xml, xmlRpcResp);

-            xml.Flush();

-            httpReq.Output.Flush();

-        }

-

-        ///<summary>Close all contained resources, both the HttpReq and client.</summary>

-        public void Close()

-        {

-            if (_httpReq != null)

-            {

-                _httpReq.Close();

-                _httpReq = null;

-            }

-

-            if (_client != null)

-            {

-                _client.Close();

-                _client = null;

-            }

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcResponse.cs b/Common/XmlRpcCS/XmlRpcResponse.cs
deleted file mode 100644
index 8ff8354..0000000
--- a/Common/XmlRpcCS/XmlRpcResponse.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.IO;

-    using System.Xml;

-

-    /// <summary>Class designed to represent an XML-RPC response.</summary>

-    public class XmlRpcResponse

-    {

-        private Object _value;

-        /// <summary><c>bool</c> indicating if this response represents a fault.</summary>

-        public bool IsFault;

-

-        /// <summary>Basic constructor</summary>

-        public XmlRpcResponse()

-        {

-            Value = null;

-            IsFault = false;

-        }

-

-        /// <summary>Constructor for a fault.</summary>

-        /// <param name="code"><c>int</c> the numeric faultCode value.</param>

-        /// <param name="message"><c>String</c> the faultString value.</param>

-        public XmlRpcResponse(int code, String message)

-            : this()

-        {

-            SetFault(code, message);

-        }

-

-        /// <summary>The data value of the response, may be fault data.</summary>

-        public Object Value

-        {

-            get { return _value; }

-            set

-            {

-                IsFault = false;

-                _value = value;

-            }

-        }

-

-        /// <summary>The faultCode if this is a fault.</summary>

-        public int FaultCode

-        {

-            get

-            {

-                if (!IsFault)

-                    return 0;

-                else

-                    return (int)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_CODE];

-            }

-        }

-

-        /// <summary>The faultString if this is a fault.</summary>

-        public String FaultString

-        {

-            get

-            {

-                if (!IsFault)

-                    return "";

-                else

-                    return (String)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_STRING];

-            }

-        }

-

-        /// <summary>Set this response to be a fault.</summary>

-        /// <param name="code"><c>int</c> the numeric faultCode value.</param>

-        /// <param name="message"><c>String</c> the faultString value.</param>

-        public void SetFault(int code, String message)

-        {

-            Hashtable fault = new Hashtable();

-            fault.Add("faultCode", code);

-            fault.Add("faultString", message);

-            Value = fault;

-            IsFault = true;

-        }

-

-        /// <summary>Form a useful string representation of the object, in this case the XML response.</summary>

-        /// <returns><c>String</c> The XML serialized XML-RPC response.</returns>

-        override public String ToString()

-        {

-            return XmlRpcResponseSerializer.Singleton.Serialize(this);

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
deleted file mode 100644
index 032d8a3..0000000
--- a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.IO;

-    using System.Xml;

-

-    /// <summary>Class to deserialize XML data representing a response.</summary>

-    public class XmlRpcResponseDeserializer : XmlRpcDeserializer

-    {

-        static private XmlRpcResponseDeserializer _singleton;

-        /// <summary>A static singleton instance of this deserializer.</summary>

-        [Obsolete("This object is now thread safe, just use an instance.", false)]

-        static public XmlRpcResponseDeserializer Singleton

-        {

-            get

-            {

-                if (_singleton == null)

-                    _singleton = new XmlRpcResponseDeserializer();

-

-                return _singleton;

-            }

-        }

-

-        /// <summary>Static method that parses XML data into a response using the Singleton.</summary>

-        /// <param name="xmlData"><c>StreamReader</c> containing an XML-RPC response.</param>

-        /// <returns><c>XmlRpcResponse</c> object resulting from the parse.</returns>

-        override public Object Deserialize(TextReader xmlData)

-        {

-            XmlTextReader reader = new XmlTextReader(xmlData);

-            XmlRpcResponse response = new XmlRpcResponse();

-            bool done = false;

-

-            lock (this)

-            {

-                Reset();

-

-                while (!done && reader.Read())

-                {

-                    DeserializeNode(reader); // Parent parse...

-                    switch (reader.NodeType)

-                    {

-                        case XmlNodeType.EndElement:

-                            switch (reader.Name)

-                            {

-                                case FAULT:

-                                    response.Value = _value;

-                                    response.IsFault = true;

-                                    break;

-                                case PARAM:

-                                    response.Value = _value;

-                                    _value = null;

-                                    _text = null;

-                                    break;

-                            }

-                            break;

-                        default:

-                            break;

-                    }

-                }

-            }

-            return response;

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs b/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
deleted file mode 100644
index 72ca568..0000000
--- a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.Xml;

-

-    /// <summary>Class responsible for serializing an XML-RPC response.</summary>

-    /// <remarks>This class handles the response envelope, depending on XmlRpcSerializer

-    /// to serialize the payload.</remarks>

-    /// <seealso cref="XmlRpcSerializer"/>

-    public class XmlRpcResponseSerializer : XmlRpcSerializer

-    {

-        static private XmlRpcResponseSerializer _singleton;

-        /// <summary>A static singleton instance of this deserializer.</summary>

-        static public XmlRpcResponseSerializer Singleton

-        {

-            get

-            {

-                if (_singleton == null)

-                    _singleton = new XmlRpcResponseSerializer();

-

-                return _singleton;

-            }

-        }

-

-        /// <summary>Serialize the <c>XmlRpcResponse</c> to the output stream.</summary>

-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>

-        /// <param name="obj">An <c>Object</c> to serialize.</param>

-        /// <seealso cref="XmlRpcResponse"/>

-        override public void Serialize(XmlTextWriter output, Object obj)

-        {

-            XmlRpcResponse response = (XmlRpcResponse)obj;

-

-            output.WriteStartDocument();

-            output.WriteStartElement(METHOD_RESPONSE);

-

-            if (response.IsFault)

-                output.WriteStartElement(FAULT);

-            else

-            {

-                output.WriteStartElement(PARAMS);

-                output.WriteStartElement(PARAM);

-            }

-

-            output.WriteStartElement(VALUE);

-

-            SerializeObject(output, response.Value);

-

-            output.WriteEndElement();

-

-            output.WriteEndElement();

-            if (!response.IsFault)

-                output.WriteEndElement();

-            output.WriteEndElement();

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcSerializer.cs b/Common/XmlRpcCS/XmlRpcSerializer.cs
deleted file mode 100644
index 0643d38..0000000
--- a/Common/XmlRpcCS/XmlRpcSerializer.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.IO;

-    using System.Xml;

-

-    /// <summary>Base class of classes serializing data to XML-RPC's XML format.</summary>

-    /// <remarks>This class handles the basic type conversions like Integer to &lt;i4&gt;. </remarks>

-    /// <seealso cref="XmlRpcXmlTokens"/>

-    public class XmlRpcSerializer : XmlRpcXmlTokens

-    {

-

-        /// <summary>Serialize the <c>XmlRpcRequest</c> to the output stream.</summary>

-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>

-        /// <param name="obj">An <c>Object</c> to serialize.</param>

-        /// <seealso cref="XmlRpcRequest"/>

-        virtual public void Serialize(XmlTextWriter output, Object obj)

-        {

-        }

-

-        /// <summary>Serialize the <c>XmlRpcRequest</c> to a String.</summary>

-        /// <remarks>Note this may represent a real memory hog for a large request.</remarks>

-        /// <param name="obj">An <c>Object</c> to serialize.</param>

-        /// <returns><c>String</c> containing XML-RPC representation of the request.</returns>

-        /// <seealso cref="XmlRpcRequest"/>

-        public String Serialize(Object obj)

-        {

-            StringWriter strBuf = new StringWriter();

-            XmlTextWriter xml = new XmlTextWriter(strBuf);

-            xml.Formatting = Formatting.Indented;

-            xml.Indentation = 4;

-            Serialize(xml, obj);

-            xml.Flush();

-            String returns = strBuf.ToString();

-            xml.Close();

-            return returns;

-        }

-

-        /// <remarks>Serialize the object to the output stream.</remarks>

-        /// <param name="output">An <c>XmlTextWriter</c> stream to write data to.</param>

-        /// <param name="obj">An <c>Object</c> to serialize.</param>

-        public void SerializeObject(XmlTextWriter output, Object obj)

-        {

-            if (obj == null)

-                return;

-

-            if (obj is byte[])

-            {

-                byte[] ba = (byte[])obj;

-                output.WriteStartElement(BASE64);

-                output.WriteBase64(ba, 0, ba.Length);

-                output.WriteEndElement();

-            }

-            else if (obj is String)

-            {

-                output.WriteElementString(STRING, obj.ToString());

-            }

-            else if (obj is Int32)

-            {

-                output.WriteElementString(INT, obj.ToString());

-            }

-            else if (obj is DateTime)

-            {

-                output.WriteElementString(DATETIME, ((DateTime)obj).ToString(ISO_DATETIME));

-            }

-            else if (obj is Double)

-            {

-                output.WriteElementString(DOUBLE, obj.ToString());

-            }

-            else if (obj is Boolean)

-            {

-                output.WriteElementString(BOOLEAN, ((((Boolean)obj) == true) ? "1" : "0"));

-            }

-            else if (obj is IList)

-            {

-                output.WriteStartElement(ARRAY);

-                output.WriteStartElement(DATA);

-                if (((ArrayList)obj).Count > 0)

-                {

-                    foreach (Object member in ((IList)obj))

-                    {

-                        output.WriteStartElement(VALUE);

-                        SerializeObject(output, member);

-                        output.WriteEndElement();

-                    }

-                }

-                output.WriteEndElement();

-                output.WriteEndElement();

-            }

-            else if (obj is IDictionary)

-            {

-                IDictionary h = (IDictionary)obj;

-                output.WriteStartElement(STRUCT);

-                foreach (String key in h.Keys)

-                {

-                    output.WriteStartElement(MEMBER);

-                    output.WriteElementString(NAME, key);

-                    output.WriteStartElement(VALUE);

-                    SerializeObject(output, h[key]);

-                    output.WriteEndElement();

-                    output.WriteEndElement();

-                }

-                output.WriteEndElement();

-            }

-

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcServer.cs b/Common/XmlRpcCS/XmlRpcServer.cs
deleted file mode 100644
index 1c226c1..0000000
--- a/Common/XmlRpcCS/XmlRpcServer.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.IO;

-    using System.Net;

-    using System.Net.Sockets;

-    using System.Text;

-    using System.Threading;

-    using System.Xml;

-

-    /// <summary>A restricted HTTP server for use with XML-RPC.</summary>

-    /// <remarks>It only handles POST requests, and only POSTs representing XML-RPC calls.

-    /// In addition to dispatching requests it also provides a registry for request handlers. 

-    /// </remarks>

-    public class XmlRpcServer : IEnumerable

-    {

-#pragma warning disable 0414 // disable "private field assigned but not used"

-        const int RESPONDER_COUNT = 10;

-        private TcpListener _myListener;

-        private int _port;

-        private IPAddress _address;

-        private IDictionary _handlers;

-        private XmlRpcSystemObject _system;

-        private WaitCallback _wc;

-#pragma warning restore 0414

-

-        ///<summary>Constructor with port and address.</summary>

-        ///<remarks>This constructor sets up a TcpListener listening on the

-        ///given port and address. It also calls a Thread on the method StartListen().</remarks>

-        ///<param name="address"><c>IPAddress</c> value of the address to listen on.</param>

-        ///<param name="port"><c>Int</c> value of the port to listen on.</param>

-        public XmlRpcServer(IPAddress address, int port)

-        {

-            _port = port;

-            _address = address;

-            _handlers = new Hashtable();

-            _system = new XmlRpcSystemObject(this);

-            _wc = new WaitCallback(WaitCallback);

-        }

-

-        ///<summary>Basic constructor.</summary>

-        ///<remarks>This constructor sets up a TcpListener listening on the

-        ///given port. It also calls a Thread on the method StartListen(). IPAddress.Any

-        ///is assumed as the address here.</remarks>

-        ///<param name="port"><c>Int</c> value of the port to listen on.</param>

-        public XmlRpcServer(int port) : this(IPAddress.Any, port) { }

-

-        /// <summary>Start the server.</summary>

-        public void Start()

-        {

-            try

-            {

-                Stop();

-                //start listing on the given port

-                //          IPAddress addr = IPAddress.Parse("127.0.0.1");

-                lock (this)

-                {

-                    _myListener = new TcpListener(IPAddress.Any, _port);

-                    _myListener.Start();

-                    //start the thread which calls the method 'StartListen'

-                    Thread th = new Thread(new ThreadStart(StartListen));

-                    th.Start();

-                }

-            }

-            catch (Exception e)

-            {

-                Logger.WriteEntry("An Exception Occurred while Listening :" + e.ToString(), LogLevel.Error);

-            }

-        }

-

-        /// <summary>Stop the server.</summary>

-        public void Stop()

-        {

-            try

-            {

-                if (_myListener != null)

-                {

-                    lock (this)

-                    {

-                        _myListener.Stop();

-                        _myListener = null;

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                Logger.WriteEntry("An Exception Occurred while stopping :" +

-                      e.ToString(), LogLevel.Error);

-            }

-        }

-

-        /// <summary>Get an enumeration of my XML-RPC handlers.</summary>

-        /// <returns><c>IEnumerable</c> the handler enumeration.</returns>

-        public IEnumerator GetEnumerator()

-        {

-            return _handlers.GetEnumerator();

-        }

-

-        /// <summary>Retrieve a handler by name.</summary>

-        /// <param name="name"><c>String</c> naming a handler</param>

-        /// <returns><c>Object</c> that is the handler.</returns>

-        public Object this[String name]

-        {

-            get { return _handlers[name]; }

-        }

-

-        ///<summary>

-        ///This method Accepts new connections and dispatches them when appropriate.

-        ///</summary>

-        public void StartListen()

-        {

-            while (true && _myListener != null)

-            {

-                //Accept a new connection

-                XmlRpcResponder responder = new XmlRpcResponder(this, _myListener.AcceptTcpClient());

-                ThreadPool.QueueUserWorkItem(_wc, responder);

-            }

-        }

-

-

-        ///<summary>

-        ///Add an XML-RPC handler object by name.

-        ///</summary>

-        ///<param name="name"><c>String</c> XML-RPC dispatch name of this object.</param>

-        ///<param name="obj"><c>Object</c> The object that is the XML-RPC handler.</param>

-        public void Add(String name, Object obj)

-        {

-            _handlers.Add(name, obj);

-        }

-

-        ///<summary>Return a C# object.method name for and XML-RPC object.method name pair.</summary>

-        ///<param name="methodName">The XML-RPC object.method.</param>

-        ///<returns><c>String</c> of form object.method for the underlying C# method.</returns>

-        public String MethodName(String methodName)

-        {

-            int dotAt = methodName.LastIndexOf('.');

-

-            if (dotAt == -1)

-            {

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,

-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Bad method name " + methodName);

-            }

-

-            String objectName = methodName.Substring(0, dotAt);

-            Object target = _handlers[objectName];

-

-            if (target == null)

-            {

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,

-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");

-            }

-

-            return target.GetType().FullName + "." + methodName.Substring(dotAt + 1);

-        }

-

-        ///<summary>Invoke a method described in a request.</summary>

-        ///<param name="req"><c>XmlRpcRequest</c> containing a method descriptions.</param>

-        /// <seealso cref="XmlRpcSystemObject.Invoke"/>

-        /// <seealso cref="XmlRpcServer.Invoke(String,String,IList)"/>

-        public Object Invoke(XmlRpcRequest req)

-        {

-            return Invoke(req.MethodNameObject, req.MethodNameMethod, req.Params);

-        }

-

-        ///<summary>Invoke a method on a named handler.</summary>

-        ///<param name="objectName"><c>String</c> The name of the handler.</param>

-        ///<param name="methodName"><c>String</c> The name of the method to invoke on the handler.</param>

-        ///<param name="parameters"><c>IList</c> The parameters to invoke the method with.</param>

-        /// <seealso cref="XmlRpcSystemObject.Invoke"/>

-        public Object Invoke(String objectName, String methodName, IList parameters)

-        {

-            Object target = _handlers[objectName];

-

-            if (target == null)

-            {

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,

-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");

-            }

-

-            return XmlRpcSystemObject.Invoke(target, methodName, parameters);

-        }

-

-        /// <summary>The method the thread pool invokes when a thread is available to handle an HTTP request.</summary>

-        /// <param name="responder">TcpClient from the socket accept.</param>

-        public void WaitCallback(object responder)

-        {

-            XmlRpcResponder resp = (XmlRpcResponder)responder;

-

-            if (resp.HttpReq.HttpMethod == "POST")

-            {

-                try

-                {

-                    resp.Respond();

-                }

-                catch (Exception e)

-                {

-                    Logger.WriteEntry("Failed on post: " + e, LogLevel.Error);

-                }

-            }

-            else

-            {

-                Logger.WriteEntry("Only POST methods are supported: " + resp.HttpReq.HttpMethod +

-                          " ignored", LogLevel.Error);

-            }

-

-            resp.Close();

-        }

-

-        /// <summary>

-        /// This function send the Header Information to the client (Browser)

-        /// </summary>

-        /// <param name="sHttpVersion">HTTP Version</param>

-        /// <param name="sMIMEHeader">Mime Type</param>

-        /// <param name="iTotBytes">Total Bytes to be sent in the body</param>

-        /// <param name="sStatusCode"></param>

-        /// <param name="output">Socket reference</param>

-        static public void HttpHeader(string sHttpVersion, string sMIMEHeader, long iTotBytes, string sStatusCode, TextWriter output)

-        {

-            String sBuffer = "";

-

-            // if Mime type is not provided set default to text/html

-            if (sMIMEHeader.Length == 0)

-            {

-                sMIMEHeader = "text/html";  // Default Mime Type is text/html

-            }

-

-            sBuffer += sHttpVersion + sStatusCode + "\r\n";

-            sBuffer += "Connection: close\r\n";

-            if (iTotBytes > 0)

-                sBuffer += "Content-Length: " + iTotBytes + "\r\n";

-            sBuffer += "Server: XmlRpcServer \r\n";

-            sBuffer += "Content-Type: " + sMIMEHeader + "\r\n";

-            sBuffer += "\r\n";

-

-            output.Write(sBuffer);

-        }

-    }

-}

diff --git a/Common/XmlRpcCS/XmlRpcSystemObject.cs b/Common/XmlRpcCS/XmlRpcSystemObject.cs
deleted file mode 100644
index 5f79951..0000000
--- a/Common/XmlRpcCS/XmlRpcSystemObject.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-    using System.Collections;

-    using System.Reflection;

-

-    /// <summary> XML-RPC System object implementation of extended specifications.</summary>

-    [XmlRpcExposed]

-    public class XmlRpcSystemObject

-    {

-        private XmlRpcServer _server;

-        static private IDictionary _methodHelp = new Hashtable();

-

-        /// <summary>Static <c>IDictionary</c> to hold mappings of method name to associated documentation String</summary>

-        static public IDictionary MethodHelp

-        {

-            get { return _methodHelp; }

-        }

-

-        /// <summary>Constructor.</summary>

-        /// <param name="server"><c>XmlRpcServer</c> server to be the system object for.</param>

-        public XmlRpcSystemObject(XmlRpcServer server)

-        {

-            _server = server;

-            server.Add("system", this);

-            _methodHelp.Add(this.GetType().FullName + ".methodHelp", "Return a string description.");

-        }

-

-        /// <summary>Invoke a method on a given object.</summary>

-        /// <remarks>Using reflection, and respecting the <c>XmlRpcExposed</c> attribute,

-        /// invoke the <paramref>methodName</paramref> method on the <paramref>target</paramref>

-        /// instance with the <paramref>parameters</paramref> provided. All this packages other <c>Invoke</c> methods 

-        /// end up calling this.</remarks>

-        /// <returns><c>Object</c> the value the invoked method returns.</returns>

-        /// <exception cref="XmlRpcException">If method does not exist, is not exposed, parameters invalid, or invocation

-        /// results in an exception. Note, the <c>XmlRpcException.Code</c> will indicate cause.</exception>

-        static public Object Invoke(Object target, String methodName, IList parameters)

-        {

-            if (target == null)

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,

-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Invalid target object.");

-

-            Type type = target.GetType();

-            MethodInfo method = type.GetMethod(methodName);

-

-            try

-            {

-                if (!XmlRpcExposedAttribute.ExposedMethod(target, methodName))

-                    throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,

-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Method " + methodName + " is not exposed.");

-            }

-            catch (MissingMethodException me)

-            {

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,

-                              XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": " + me.Message);

-            }

-

-            Object[] args = new Object[parameters.Count];

-

-            int index = 0;

-            foreach (Object arg in parameters)

-            {

-                args[index] = arg;

-                index++;

-            }

-

-            try

-            {

-                Object retValue = method.Invoke(target, args);

-                if (retValue == null)

-                    throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,

-                              XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": Method returned NULL.");

-                return retValue;

-            }

-            catch (XmlRpcException e)

-            {

-                throw e;

-            }

-            catch (ArgumentException ae)

-            {

-                Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + ae.Message,

-                          LogLevel.Information);

-                String call = methodName + "( ";

-                foreach (Object o in args)

-                {

-                    call += o.GetType().Name;

-                    call += " ";

-                }

-                call += ")";

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,

-                              XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement type mismatch invoking " + call);

-            }

-            catch (TargetParameterCountException tpce)

-            {

-                Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + tpce.Message,

-                          LogLevel.Information);

-                throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,

-                              XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement count mismatch invoking " + methodName);

-            }

-            catch (TargetInvocationException tie)

-            {

-                throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,

-                              XmlRpcErrorCodes.APPLICATION_ERROR_MSG + " Invoked method " + methodName + ": " + tie.Message);

-            }

-        }

-

-        /// <summary>List methods available on all handlers of this server.</summary>

-        /// <returns><c>IList</c> An array of <c>Strings</c>, each <c>String</c> will have form "object.method".</returns>

-        [XmlRpcExposed]

-        public IList listMethods()

-        {

-            IList methods = new ArrayList();

-            Boolean considerExposure;

-

-            foreach (DictionaryEntry handlerEntry in _server)

-            {

-                considerExposure = XmlRpcExposedAttribute.IsExposed(handlerEntry.Value.GetType());

-

-                foreach (MemberInfo mi in handlerEntry.Value.GetType().GetMembers())

-                {

-                    if (mi.MemberType != MemberTypes.Method)

-                        continue;

-

-                    if (!((MethodInfo)mi).IsPublic)

-                        continue;

-

-                    if (considerExposure && !XmlRpcExposedAttribute.IsExposed(mi))

-                        continue;

-

-                    methods.Add(handlerEntry.Key + "." + mi.Name);

-                }

-            }

-

-            return methods;

-        }

-

-        /// <summary>Given a method name return the possible signatures for it.</summary>

-        /// <param name="name"><c>String</c> The object.method name to look up.</param>

-        /// <returns><c>IList</c> Of arrays of signatures.</returns>

-        [XmlRpcExposed]

-        public IList methodSignature(String name)

-        {

-            IList signatures = new ArrayList();

-            int index = name.IndexOf('.');

-

-            if (index < 0)

-                return signatures;

-

-            String oName = name.Substring(0, index);

-            Object obj = _server[oName];

-

-            if (obj == null)

-                return signatures;

-

-            MemberInfo[] mi = obj.GetType().GetMember(name.Substring(index + 1));

-

-            if (mi == null || mi.Length != 1) // for now we want a single signature

-                return signatures;

-

-            MethodInfo method;

-

-            try

-            {

-                method = (MethodInfo)mi[0];

-            }

-            catch (Exception e)

-            {

-                Logger.WriteEntry("Attempted methodSignature call on " + mi[0] + " caused: " + e,

-                          LogLevel.Information);

-                return signatures;

-            }

-

-            if (!method.IsPublic)

-                return signatures;

-

-            IList signature = new ArrayList();

-            signature.Add(method.ReturnType.Name);

-

-            foreach (ParameterInfo param in method.GetParameters())

-            {

-                signature.Add(param.ParameterType.Name);

-            }

-

-

-            signatures.Add(signature);

-

-            return signatures;

-        }

-

-        /// <summary>Help for given method signature. Not implemented yet.</summary>

-        /// <param name="name"><c>String</c> The object.method name to look up.</param>

-        /// <returns><c>String</c> help text. Rich HTML text.</returns>

-        [XmlRpcExposed]

-        public String methodHelp(String name)

-        {

-            String help = null;

-

-            try

-            {

-                help = (String)_methodHelp[_server.MethodName(name)];

-            }

-            catch (XmlRpcException e)

-            {

-                throw e;

-            }

-            catch (Exception) { /* ignored */ };

-

-            if (help == null)

-                help = "No help available for: " + name;

-

-            return help;

-        }

-

-        /// <summary>Boxcarring support method.</summary>

-        /// <param name="calls"><c>IList</c> of calls</param>

-        /// <returns><c>ArrayList</c> of results/faults.</returns>

-        [XmlRpcExposed]

-        public IList multiCall(IList calls)

-        {

-            IList responses = new ArrayList();

-            XmlRpcResponse fault = new XmlRpcResponse();

-

-            foreach (IDictionary call in calls)

-            {

-                try

-                {

-                    XmlRpcRequest req = new XmlRpcRequest((String)call[XmlRpcXmlTokens.METHOD_NAME],

-                                          (ArrayList)call[XmlRpcXmlTokens.PARAMS]);

-                    Object results = _server.Invoke(req);

-                    IList response = new ArrayList();

-                    response.Add(results);

-                    responses.Add(response);

-                }

-                catch (XmlRpcException e)

-                {

-                    fault.SetFault(e.FaultCode, e.FaultString);

-                    responses.Add(fault.Value);

-                }

-                catch (Exception e2)

-                {

-                    fault.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,

-                               XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);

-                    responses.Add(fault.Value);

-                }

-            }

-

-            return responses;

-        }

-

-    }

-}

-

diff --git a/Common/XmlRpcCS/XmlRpcXmlTokens.cs b/Common/XmlRpcCS/XmlRpcXmlTokens.cs
deleted file mode 100644
index 50788bd..0000000
--- a/Common/XmlRpcCS/XmlRpcXmlTokens.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace Nwc.XmlRpc

-{

-    using System;

-

-    /// <summary>Class collecting <c>String</c> tokens that are part of XML-RPC files.</summary>

-    public class XmlRpcXmlTokens

-    {

-        /// <summary>C# formatting string to describe an ISO 8601 date.</summary>

-        public const String ISO_DATETIME = "yyyyMMdd\\THH\\:mm\\:ss";

-        /// <summary>Base64 field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;base64&gt; tag.</remarks>

-        public const String BASE64 = "base64";

-        /// <summary>String field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;string&gt; tag.</remarks>

-        public const String STRING = "string";

-        /// <summary>Integer field integer.</summary>

-        /// <remarks>Corresponds to the &lt;i4&gt; tag.</remarks>

-        public const String INT = "i4";

-        /// <summary>Alternate integer field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;int&gt; tag.</remarks>

-        public const String ALT_INT = "int";

-        /// <summary>Date field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;dateTime.iso8601&gt; tag.</remarks>

-        public const String DATETIME = "dateTime.iso8601";

-        /// <summary>Boolean field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;boolean&gt; tag.</remarks>

-        public const String BOOLEAN = "boolean";

-        /// <summary>Value token.</summary>

-        /// <remarks>Corresponds to the &lt;value&gt; tag.</remarks>

-        public const String VALUE = "value";

-        /// <summary>Name token.</summary>

-        /// <remarks>Corresponds to the &lt;name&gt; tag.</remarks>

-        public const String NAME = "name";

-        /// <summary>Array field indicator..</summary>

-        /// <remarks>Corresponds to the &lt;array&gt; tag.</remarks>

-        public const String ARRAY = "array";

-        /// <summary>Data token.</summary>

-        /// <remarks>Corresponds to the &lt;data&gt; tag.</remarks>

-        public const String DATA = "data";

-        /// <summary>Member token.</summary>

-        /// <remarks>Corresponds to the &lt;member&gt; tag.</remarks>

-        public const String MEMBER = "member";

-        /// <summary>Stuct field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;struct&gt; tag.</remarks>

-        public const String STRUCT = "struct";

-        /// <summary>Double field indicator.</summary>

-        /// <remarks>Corresponds to the &lt;double&gt; tag.</remarks>

-        public const String DOUBLE = "double";

-        /// <summary>Param token.</summary>

-        /// <remarks>Corresponds to the &lt;param&gt; tag.</remarks>

-        public const String PARAM = "param";

-        /// <summary>Params token.</summary>

-        /// <remarks>Corresponds to the &lt;params&gt; tag.</remarks>

-        public const String PARAMS = "params";

-        /// <summary>MethodCall token.</summary>

-        /// <remarks>Corresponds to the &lt;methodCall&gt; tag.</remarks>

-        public const String METHOD_CALL = "methodCall";

-        /// <summary>MethodName token.</summary>

-        /// <remarks>Corresponds to the &lt;methodName&gt; tag.</remarks>

-        public const String METHOD_NAME = "methodName";

-        /// <summary>MethodResponse token</summary>

-        /// <remarks>Corresponds to the &lt;methodResponse&gt; tag.</remarks>

-        public const String METHOD_RESPONSE = "methodResponse";

-        /// <summary>Fault response token.</summary>

-        /// <remarks>Corresponds to the &lt;fault&gt; tag.</remarks>

-        public const String FAULT = "fault";

-        /// <summary>FaultCode token.</summary>

-        /// <remarks>Corresponds to the &lt;faultCode&gt; tag.</remarks>

-        public const String FAULT_CODE = "faultCode";

-        /// <summary>FaultString token.</summary>

-        /// <remarks>Corresponds to the &lt;faultString&gt; tag.</remarks>

-        public const String FAULT_STRING = "faultString";

-    }

-}

-

-

diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 8d8a647..b17b37b 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -30,11 +30,13 @@ using System.Collections;
 using System.Collections.Generic;

 using System.Text;

 using OpenSim.Framework;

+using OpenSim.Framework.Data;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using libsecondlife;

+using libsecondlife.Packets;

 

-namespace OpenGrid.Framework.Communications

+namespace OpenSim.Framework.Communications

 {

  

     public class CommunicationsManager

@@ -43,9 +45,26 @@ namespace OpenGrid.Framework.Communications
         public IGridServices GridServer;

         public IInterRegionCommunications InterRegion;

 

+        public NetworkServersInfo ServersInfo;

         public CommunicationsManager(NetworkServersInfo serversInfo)

         {

+            ServersInfo = serversInfo;

+        }

+

+        #region Packet Handlers

+        public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)

+        {

+            UserProfileData profileData = this.UserServer.GetUserProfile(uuid);

+            if (profileData != null)

+            {

+                UUIDNameReplyPacket packet = new UUIDNameReplyPacket();

+                packet.UUIDNameBlock[0].ID = profileData.UUID;

+                packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username);

+                packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname);

+                remote_client.OutPacket((Packet)packet);

+            }

             

         }

+        #endregion

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index d3b7c07..a4812fb 100644
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -32,7 +32,7 @@ using System.Text;
 using OpenSim.Framework.Types;

 using OpenSim.Framework;

 

-namespace OpenGrid.Framework.Communications

+namespace OpenSim.Framework.Communications

 {

     public class GridInfo

     {

diff --git a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 4cb8a38..7b0d340 100644
--- a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -31,7 +31,7 @@ using System.Text;
 using OpenSim.Framework.Types;

 using OpenSim.Framework;

 

-namespace OpenGrid.Framework.Communications

+namespace OpenSim.Framework.Communications

 {

     public  interface IInterRegionCommunications

     {

diff --git a/Common/OpenGrid.Framework.Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index 3d8e791..37f4942 100644
--- a/Common/OpenGrid.Framework.Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -30,15 +30,18 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 

-namespace OpenGrid.Framework.Communications

+namespace OpenSim.Framework.Communications

 {

     public interface IUserServices

     {

         UserProfileData GetUserProfile(string firstName, string lastName);

         UserProfileData GetUserProfile(string name);

         UserProfileData GetUserProfile(LLUUID avatarID);

-        

+

+        UserProfileData SetupMasterUser(string firstName, string lastName);

+        UserProfileData SetupMasterUser(string firstName, string lastName, string password);

+

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 9a9568c..31ab172 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{CB52B7E7-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Communications</AssemblyName>

+    <AssemblyName>OpenSim.Framework.Communications</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Communications</RootNamespace>

+    <RootNamespace>OpenSim.Framework.Communications</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,7 +59,7 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

@@ -72,15 +72,15 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\General\OpenSim.Framework.csproj">

+      <Name>OpenSim.Framework</Name>

+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

-      <Name>OpenSim.Framework</Name>

-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">

+      <Name>OpenSim.Framework.Data</Name>

+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 392220b..52d29f6 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenGrid.Framework.Communications" default="build">

+<project name="OpenSim.Framework.Communications" default="build">

     <target name="build">

         <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

         <mkdir dir="${project::get-base-directory()}/${build.dir}" />

@@ -8,7 +8,7 @@
             </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="OpenGrid.Framework.Communications" dynamicprefix="true" >

+            <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

                 <include name="CommunicationsManager.cs" />

@@ -22,16 +22,16 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

+                <include name="../../../bin/OpenSim.Framework.dll" />

+                <include name="../../../bin/OpenSim.Framework.Data.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.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/">

+        <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"/>

diff --git a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index 83e7dd4..83e7dd4 100644
--- a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework.Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 8f715d2..8f715d2 100644
--- a/Common/OpenSim.Framework.Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
index e3847be..e3847be 100644
--- a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
diff --git a/Common/OpenSim.Framework.Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 1a92d8e..1a92d8e 100644
--- a/Common/OpenSim.Framework.Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
diff --git a/Common/OpenSim.Framework.Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs
index d7f945e..d7f945e 100644
--- a/Common/OpenSim.Framework.Console/MainLog.cs
+++ b/OpenSim/Framework/Console/MainLog.cs
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index af6c396..f3dcec5 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index 7ebdba1..eb40c0d 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -24,9 +24,9 @@
                 <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/">

+        <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"/>

diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 0e73ab2..dc8488e 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -29,11 +29,11 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using libsecondlife;

 

 

-namespace OpenGrid.Framework.Data.DB4o

+namespace OpenSim.Framework.Data.DB4o

 {

     /// <summary>

     /// A grid server storage mechanism employing the DB4o database system

diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 356a49c..3870a8c 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -29,10 +29,10 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using Db4objects.Db4o;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data.DB4o

+namespace OpenSim.Framework.Data.DB4o

 {

     /// <summary>

     /// A Database manager for Db4o

diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 315f48d..8caa75d 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -28,10 +28,10 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data.DB4o

+namespace OpenSim.Framework.Data.DB4o

 {

     /// <summary>

     /// A User storage interface for the DB4o database system

diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index 82d4f5f..b09cecf 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{FD2D303D-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>

+    <AssemblyName>OpenSim.Framework.Data.DB4o</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>

+    <RootNamespace>OpenSim.Framework.Data.DB4o</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -58,31 +58,31 @@
     <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

+    <Reference Include="Db4objects.Db4o.dll" >

+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

+    <Reference Include="libsecondlife.dll" >

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+    <Reference Include="System.Data" >

+      <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

+    <Reference Include="System.Xml" >

+      <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">

+      <Name>OpenSim.Framework.Data</Name>

+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

diff --git a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..68395a1 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

-[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]

+[assembly: AssemblyTitle("OpenSim.Framework.Data.DB4o")]

 [assembly: AssemblyDescription("")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]

+[assembly: AssemblyProduct("OpenSim.Framework.Data.DB4o")]

 [assembly: AssemblyCopyright("Copyright ©  2007")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

diff --git a/Common/OpenGrid.Framework.Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
index b2cce78..7f8fdaf 100644
--- a/Common/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     public enum DataResponse

     {

diff --git a/Common/OpenGrid.Framework.Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs
index 2ac0bfe..ccb3b84 100644
--- a/Common/OpenGrid.Framework.Data/ILogData.cs
+++ b/OpenSim/Framework/Data/ILogData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     /// <summary>

     /// The severity of an individual log message

diff --git a/Common/OpenGrid.Framework.Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
index d17afac..2f002c1 100644
--- a/Common/OpenGrid.Framework.Data/IniConfig.cs
+++ b/OpenSim/Framework/Data/IniConfig.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
  http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html

  */

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     /// <summary>

     /// Parse settings from ini-like files

diff --git a/Common/OpenGrid.Framework.Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index 12f559b..8a3a664 100644
--- a/Common/OpenGrid.Framework.Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     /// <summary>

     /// Inventory Item - contains all the properties associated with an individual inventory piece.

diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 048722a..dcafbcd 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data</AssemblyName>

+    <AssemblyName>OpenSim.Framework.Data</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data</RootNamespace>

+    <RootNamespace>OpenSim.Framework.Data</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,7 +59,7 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index 764e871..aefb02b 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenGrid.Framework.Data" default="build">

+<project name="OpenSim.Framework.Data" default="build">

     <target name="build">

         <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

         <mkdir dir="${project::get-base-directory()}/${build.dir}" />

@@ -8,7 +8,7 @@
             </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="OpenGrid.Framework.Data" dynamicprefix="true" >

+            <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

                 <include name="GridData.cs" />

@@ -26,15 +26,15 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

                 <include name="System.dll" />

                 <include name="System.Data.dll" />

                 <include name="System.Xml.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/">

+        <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"/>

diff --git a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 1446673..7d749d5 100644
--- a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

-[assembly: AssemblyTitle("OpenGrid.Framework.Data")]

+[assembly: AssemblyTitle("OpenSim.Framework.Data")]

 [assembly: AssemblyDescription("")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenGrid.Framework.Data")]

+[assembly: AssemblyProduct("OpenSim.Framework.Data")]

 [assembly: AssemblyCopyright("Copyright ©  2007")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

diff --git a/Common/OpenGrid.Framework.Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index 89c6105..f404ebd 100644
--- a/Common/OpenGrid.Framework.Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -31,7 +31,7 @@ using System.Text;
 

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     public class ReservationData

     {

diff --git a/Common/OpenGrid.Framework.Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index a3e7cb7..201aa01 100644
--- a/Common/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     /// <summary>

     /// A class which contains information known to the grid server about a region

diff --git a/Common/OpenGrid.Framework.Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
index c2d5a72..2e15b47 100644
--- a/Common/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenSim/Framework/Data/UserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     /// <summary>

     /// An interface for connecting to user storage servers.

diff --git a/Common/OpenGrid.Framework.Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
index 82633e1..00d422d 100644
--- a/Common/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data

+namespace OpenSim.Framework.Data

 {

     /// <summary>

     /// Information about a particular user known to the userserver

diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index fbf4d23..fbf4d23 100644
--- a/Common/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
diff --git a/Common/OpenSim.Framework/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
index 73dd3e2..73dd3e2 100644
--- a/Common/OpenSim.Framework/AuthenticateSessionBase.cs
+++ b/OpenSim/Framework/General/AuthenticateSessionBase.cs
diff --git a/Common/OpenSim.Framework/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
index 667b8d8..667b8d8 100644
--- a/Common/OpenSim.Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/General/BlockingQueue.cs
diff --git a/Common/OpenSim.Framework/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 0e80941..0e80941 100644
--- a/Common/OpenSim.Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
diff --git a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
index 462e2c5..462e2c5 100644
--- a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
+++ b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
index 13980fe..13980fe 100644
--- a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
index 0fafe1a..0fafe1a 100644
--- a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
index 2f4b340..2f4b340 100644
--- a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index 826392d..826392d 100644
--- a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 009648c..4e8ac1a 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces
 

     public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);

 

+    public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);

+

     public interface IClientAPI

     {

         event ChatFromViewer OnChatFromViewer;

@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces
         event NewAvatar OnNewAvatar;

         event GenericCall6 OnRemoveAvatar;

 

+        event UUIDNameRequest OnNameFromUUIDRequest;

+

         event ParcelPropertiesRequest OnParcelPropertiesRequest;

         event ParcelDivideRequest OnParcelDivideRequest;

         event ParcelJoinRequest OnParcelJoinRequest;

diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index 4987d10..4987d10 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
index c6e2223..c6e2223 100644
--- a/Common/OpenSim.Framework/Interfaces/IUserServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserServer.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
index 4857417..4857417 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/OpenSim/Framework/General/Interfaces/IWorld.cs
diff --git a/Common/OpenSim.Framework/Logger.cs b/OpenSim/Framework/General/Logger.cs
index e7eaa03..e7eaa03 100644
--- a/Common/OpenSim.Framework/Logger.cs
+++ b/OpenSim/Framework/General/Logger.cs
diff --git a/Common/OpenSim.Framework/LoginService.cs b/OpenSim/Framework/General/LoginService.cs
index f14754f..f14754f 100644
--- a/Common/OpenSim.Framework/LoginService.cs
+++ b/OpenSim/Framework/General/LoginService.cs
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 7ebe0ee..48db634 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.Framework</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,18 +28,16 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,49 +46,45 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Db4objects.Db4o.dll">

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

+    <Reference Include="Db4objects.Db4o.dll" >

+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll">

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+    <Reference Include="libsecondlife.dll" >

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="XMLRPC.dll" >

+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

+    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

-    </ProjectReference>

-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

-      <Name>XMLRPC</Name>

-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -109,9 +100,6 @@
     <Compile Include="IRegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDHelpers.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Logger.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -160,12 +148,6 @@
     <Compile Include="Interfaces\Config\IUserConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -219,4 +201,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index afe1aea..a18838b 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -15,15 +15,12 @@
                 <include name="AuthenticateSessionBase.cs" />

                 <include name="BlockingQueue.cs" />

                 <include name="IRegionCommsListener.cs" />

-                <include name="LLSDHelpers.cs" />

                 <include name="Logger.cs" />

                 <include name="LoginService.cs" />

                 <include name="RegionCommsListener.cs" />

                 <include name="Remoting.cs" />

                 <include name="SimProfile.cs" />

                 <include name="UserProfile.cs" />

-                <include name="UserProfileManager.cs" />

-                <include name="UserProfileManagerBase.cs" />

                 <include name="Util.cs" />

                 <include name="Interfaces/AuthenticateResponse.cs" />

                 <include name="Interfaces/IAssetServer.cs" />

@@ -34,8 +31,6 @@
                 <include name="Interfaces/Config/IGenericConfig.cs" />

                 <include name="Interfaces/Config/IGridConfig.cs" />

                 <include name="Interfaces/Config/IUserConfig.cs" />

-                <include name="Interfaces/Scripting/IScriptAPI.cs" />

-                <include name="Interfaces/Scripting/IScriptEngine.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

                 <include name="Types/AgentCiruitData.cs" />

                 <include name="Types/AgentWearable.cs" />

@@ -57,17 +52,17 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../../bin/Db4objects.Db4o.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

+                <include name="../../../bin/OpenSim.Framework.Console.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../bin/XMLRPC.dll" />

+                <include name="../../../bin/XMLRPC.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/">

+        <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"/>

diff --git a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
index 86f5cdb..86f5cdb 100644
--- a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index bba928f..5fa2f58 100644
--- a/Common/OpenSim.Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework
         {

             if(OnExpectUser != null)

             {

+                

                 OnExpectUser(regionHandle, agent);

                 return true;

             }

diff --git a/Common/OpenSim.Framework/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
index e6fdf70..e6fdf70 100644
--- a/Common/OpenSim.Framework/Remoting.cs
+++ b/OpenSim/Framework/General/Remoting.cs
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
index cfa5e50..cfa5e50 100644
--- a/Common/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim/Framework/General/SimProfile.cs
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
index a650343..a650343 100644
--- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs
+++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 4c93da7..4c93da7 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index 86586a6..86586a6 100644
--- a/Common/OpenSim.Framework/Types/AssetBase.cs
+++ b/OpenSim/Framework/General/Types/AssetBase.cs
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
index 8a10b70..8a10b70 100644
--- a/Common/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/OpenSim/Framework/General/Types/AssetLandmark.cs
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
index 8cac23a..8cac23a 100644
--- a/Common/OpenSim.Framework/Types/AssetStorage.cs
+++ b/OpenSim/Framework/General/Types/AssetStorage.cs
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 778c893..778c893 100644
--- a/Common/OpenSim.Framework/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index 3180a16..3180a16 100644
--- a/Common/OpenSim.Framework/Types/Login.cs
+++ b/OpenSim/Framework/General/Types/Login.cs
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
index 2e6f56e..2e6f56e 100644
--- a/Common/OpenSim.Framework/Types/MapBlockData.cs
+++ b/OpenSim/Framework/General/Types/MapBlockData.cs
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
index 310fd1c..310fd1c 100644
--- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d7811..c6b81a7 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
                         this.GridRecvKey = attri;

                     }

 

+                    //Grid Server 

+                    attri = "";

+                    attri = configData.GetAttribute("UserServerURL");

+                    if (attri == "")

+                    {

+                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");

+                        configData.SetAttribute("UserServerURL", this.UserURL);

+                    }

+                    else

+                    {

+                        this.UserURL = attri;

+                    }

+

+                    //Grid Send Key

+                    attri = "";

+                    attri = configData.GetAttribute("UserSendKey");

+                    if (attri == "")

+                    {

+                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");

+                        configData.SetAttribute("UserSendKey", this.UserSendKey);

+                    }

+                    else

+                    {

+                        this.UserSendKey = attri;

+                    }

+

+                    //Grid Receive Key

+                    attri = "";

+                    attri = configData.GetAttribute("UserRecvKey");

+                    if (attri == "")

+                    {

+                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");

+                        configData.SetAttribute("GridRecvKey", this.UserRecvKey);

+                    }

+                    else

+                    {

+                        this.UserRecvKey = attri;

+                    }

+

                     attri = "";

                     attri = configData.GetAttribute("AssetServerURL");

                     if (attri == "")

diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 40f128a..40f128a 100644
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
index f84ae3e..f84ae3e 100644
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ b/OpenSim/Framework/General/Types/PrimData.cs
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 1271d04..1271d04 100644
--- a/Common/OpenSim.Framework/Types/RegionHandle.cs
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 48e6922..0fba6ca 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationX");

                 if (attri == "")

                 {

-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");

+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");

                     configData.SetAttribute("SimLocationX", location);

                     this.RegionLocX = (uint)Convert.ToUInt32(location);

                 }

@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationY");

                 if (attri == "")

                 {

-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");

+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");

                     configData.SetAttribute("SimLocationY", location);

                     this.RegionLocY = (uint)Convert.ToUInt32(location);

                 }

diff --git a/Common/OpenSim.Framework/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 04ff20b..263dba2 100644
--- a/Common/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
         {

             Circuits = new Dictionary<LLUUID, uint>();

             Inventory = new AgentInventory();

-            homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));

+            homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));

             homepos = new LLVector3();

             homelookat = new LLVector3();

         }

diff --git a/Common/OpenSim.Framework/Util.cs b/OpenSim/Framework/General/Util.cs
index 8c34c9b..8c34c9b 100644
--- a/Common/OpenSim.Framework/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
index df68722..aae8cd2 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{E88EF749-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{C74E4A30-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenSim.GenericConfig.Xml</AssemblyName>

+    <AssemblyName>OpenSim.Framework.GenericConfig.Xml</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenSim.GenericConfig.Xml</RootNamespace>

+    <RootNamespace>OpenSim.Framework.GenericConfig.Xml</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -68,7 +68,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">

+    <ProjectReference Include="..\..\General\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

diff --git a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
index de5f48d..de5f48d 100644
--- a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
index c526aec..c526aec 100644
--- a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index e55e33c..8c8204a 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -31,12 +31,11 @@ using System.Net;
 using System.Text;

 using System.Text.RegularExpressions;

 using System.Threading;

-//using OpenSim.CAPS;

 using Nwc.XmlRpc;

 using System.Collections;

 using OpenSim.Framework.Console;

 

-namespace OpenSim.Servers

+namespace OpenSim.Framework.Servers

 {

     public class BaseHttpServer

     {

@@ -171,7 +170,7 @@ namespace OpenSim.Servers
         protected virtual string ParseLLSDXML(string requestBody)

         {

             // dummy function for now - IMPLEMENT ME!

-            Console.WriteLine("LLSD request "+requestBody);

+            //Console.WriteLine("LLSD request "+requestBody);

             string resp = "";

             if (firstcaps)

             {

@@ -195,7 +194,7 @@ namespace OpenSim.Servers
             }

             catch (Exception e)

             {

-                Console.WriteLine(e.ToString());

+                //Console.WriteLine(e.ToString());

             }

             return responseString;

         }

@@ -273,7 +272,7 @@ namespace OpenSim.Servers
             }

             catch (Exception e)

             {

-                Console.WriteLine(e.ToString());

+                //Console.WriteLine(e.ToString());

             }

         }

 

diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index a359205..6aeb58c 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -40,7 +40,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Console;

 

 

-namespace OpenSim.Servers

+namespace OpenSim.Framework.Servers

 {

 /*    public class CheckSumServer : UDPServerBase

     {

diff --git a/Common/OpenSim.Servers/IRestHandler.cs b/OpenSim/Framework/Servers/IRestHandler.cs
index 3aa508c..a2b6bf0 100644
--- a/Common/OpenSim.Servers/IRestHandler.cs
+++ b/OpenSim/Framework/Servers/IRestHandler.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Servers

+namespace OpenSim.Framework.Servers

 {

     public delegate string RestMethod( string request, string path, string param );

 }

diff --git a/Common/OpenSim.Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index b472c97..610d23b 100644
--- a/Common/OpenSim.Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -38,7 +38,7 @@ using System.Collections.Generic;
 using libsecondlife;

 using libsecondlife.Packets;

 

-namespace OpenSim.Servers

+namespace OpenSim.Framework.Servers

 {

     public class UDPServerBase

     {

diff --git a/Common/OpenSim.Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
index 05cbf2e..51b3303 100644
--- a/Common/OpenSim.Servers/XmlRpcMethod.cs
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -28,7 +28,7 @@
 using System;

 using Nwc.XmlRpc;

 

-namespace OpenSim.Servers

+namespace OpenSim.Framework.Servers

 {

     public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    

 }

diff --git a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 514ebef..d1cd8cf 100644
--- a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -9,7 +9,7 @@ using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Interfaces;

 using Nwc.XmlRpc;

 

-namespace OpenGrid.Framework.UserManagement

+namespace OpenSim.Framework.UserManagement

 {

 

     /// <summary>

@@ -124,7 +124,7 @@ namespace OpenGrid.Framework.UserManagement
                 this.ErrorReason = "key";

                 this.welcomeMessage = "Welcome to OpenSim!";

                 this.seedCapability = "";

-                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";

+                this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";

                 this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";

                 this.RegionX = (uint)255232;

                 this.RegionY = (uint)254976;

@@ -227,6 +227,7 @@ namespace OpenGrid.Framework.UserManagement
 

                 responseData["sim_port"] =(Int32) this.SimPort;

                 responseData["sim_ip"] = this.SimAddress;

+                Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);

                 responseData["agent_id"] = this.AgentID.ToStringHyphenated();

                 responseData["session_id"] = this.SessionID.ToStringHyphenated();

                 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 9a3cdba..02aa3f3 100644
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{DA9A7391-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{586E2916-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.UserManagement</AssemblyName>

+    <AssemblyName>OpenSim.Framework.UserManagement</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.UserManagement</RootNamespace>

+    <RootNamespace>OpenSim.Framework.UserManagement</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,11 +59,11 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="OpenSim.Framework" >

@@ -74,12 +74,12 @@
       <HintPath>OpenSim.Framework.Console.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.GenericConfig.Xml" >

-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>

+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >

+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.Servers" >

-      <HintPath>OpenSim.Servers.dll</HintPath>

+    <Reference Include="OpenSim.Framework.Servers" >

+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

@@ -94,15 +94,15 @@
       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="XMLRPC" >

-      <HintPath>XMLRPC.dll</HintPath>

+    <Reference Include="XMLRPC.dll" >

+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">

+      <Name>OpenSim.Framework.Data</Name>

+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 01fbf3a..d06059e 100644
--- a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using libsecondlife;

 using System.Reflection;

 

@@ -41,7 +41,7 @@ using OpenSim.Framework.Utilities;
 

 using System.Security.Cryptography;

 

-namespace OpenGrid.Framework.UserManagement

+namespace OpenSim.Framework.UserManagement

 {

     public class UserManagerBase

     {

@@ -468,17 +468,16 @@ namespace OpenGrid.Framework.UserManagement
                     }

                     catch (Exception e)

                     {

-                        Console.WriteLine(e.ToString());

+                        System.Console.WriteLine(e.ToString());

                         return logResponse.CreateDeadRegionResponse();

                     }

                     CommitAgent(ref TheUser);

-

                     return logResponse.ToXmlRpcResponse();

 

                 }

                 catch (Exception E)

                 {

-                    Console.WriteLine(E.ToString());

+                    System.Console.WriteLine(E.ToString());

                 }

                 //}

             }

@@ -537,27 +536,15 @@ namespace OpenGrid.Framework.UserManagement
         /// Returns an error message that the user could not be found in the database

         /// </summary>

         /// <returns>XML string consisting of a error element containing individual error(s)</returns>

-        public string CreateUnknownUserErrorResponse()

+        public XmlRpcResponse CreateUnknownUserErrorResponse()

         {

-            System.IO.StringWriter sw = new System.IO.StringWriter();

-            XmlTextWriter xw = new XmlTextWriter(sw);

-

-            // Header

-            xw.Formatting = Formatting.Indented;

-            xw.WriteStartDocument();

-            xw.WriteDocType("error", null, null, null);

-            xw.WriteComment("An error occured");

-            xw.WriteStartElement("error");

-

-            // User

-            xw.WriteElementString("unknownuser", "Unable to find a user with that name");

-

-            // Footer

-            xw.WriteEndElement();

-            xw.Flush();

-            xw.Close();

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable responseData = new Hashtable();

+            responseData["error_type"] = "unknown_user";

+            responseData["error_desc"] = "The user requested is not in the database";

 

-            return sw.ToString();

+            response.Value = responseData;

+            return response;

         }

 

         /// <summary>

@@ -565,75 +552,81 @@ namespace OpenGrid.Framework.UserManagement
         /// </summary>

         /// <param name="profile">The user profile</param>

         /// <returns>A string containing an XML Document of the user profile</returns>

-        public string ProfileToXml(UserProfileData profile)

+        public XmlRpcResponse ProfileToXmlRPCResponse(UserProfileData profile)

         {

-            System.IO.StringWriter sw = new System.IO.StringWriter();

-            XmlTextWriter xw = new XmlTextWriter(sw);

-

-            // Header

-            xw.Formatting = Formatting.Indented;

-            xw.WriteStartDocument();

-            xw.WriteDocType("userprofile", null, null, null);

-            xw.WriteComment("Found user profiles matching the request");

-            xw.WriteStartElement("users");

-

-            // User

-            xw.WriteStartElement("user");

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable responseData = new Hashtable();

+

             // Account information

-            xw.WriteAttributeString("firstname", profile.username);

-            xw.WriteAttributeString("lastname", profile.surname);

-            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());

+            responseData["firstname"] = profile.username;

+            responseData["lastname"]  = profile.surname;

+            responseData["uuid"]  = profile.UUID.ToStringHyphenated();

             // Server Information

-            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);

-            xw.WriteAttributeString("server_asset", profile.userAssetURI);

+            responseData["server_inventory"]  = profile.userInventoryURI;

+            responseData["server_asset"]  = profile.userAssetURI;

             // Profile Information

-            xw.WriteAttributeString("profile_about", profile.profileAboutText);

-            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);

-            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());

-            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());

-            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());

-            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());

-            xw.WriteAttributeString("profile_created",profile.created.ToString());

-            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());

+            responseData["profile_about"]  = profile.profileAboutText;

+            responseData["profile_firstlife_about"]  = profile.profileFirstText;

+            responseData["profile_firstlife_image"]  = profile.profileFirstImage.ToStringHyphenated();

+            responseData["profile_can_do"]  = profile.profileCanDoMask.ToString();

+            responseData["profile_want_do"]  = profile.profileWantDoMask.ToString();

+            responseData["profile_image"]  = profile.profileImage.ToStringHyphenated();

+            responseData["profile_created"] = profile.created.ToString();

+            responseData["profile_lastlogin"] = profile.lastLogin.ToString();

             // Home region information

-            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());

-            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());

-            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());

-

-            xw.WriteEndElement();

+            responseData["home_coordinates"]  = profile.homeLocation.ToString();

+            responseData["home_region"]  = profile.homeRegion.ToString();

+            responseData["home_look"]  = profile.homeLookAt.ToString();

 

-            // Footer

-            xw.WriteEndElement();

-            xw.Flush();

-            xw.Close();

-

-            return sw.ToString();

+            response.Value = responseData;

+            return response;

         }

 

-        #region REST Methods 

+        #region XMLRPC User Methods 

         //should most likely move out of here and into the grid's userserver sub class

-        public string RestGetUserMethodName(string request, string path, string param)

+        public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request)

         {

-            UserProfileData userProfile = getUserProfile(param.Trim());

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable requestData = (Hashtable)request.Params[0];

+            UserProfileData userProfile;

 

-            if (userProfile == null)

+            if (requestData.Contains("avatar_name"))

+            {

+                userProfile = getUserProfile((string)requestData["avatar_name"]);

+                if (userProfile == null)

+                {

+                    return CreateUnknownUserErrorResponse();

+                }

+            }

+            else

             {

                 return CreateUnknownUserErrorResponse();

             }

+            

 

-            return ProfileToXml(userProfile);

+            return ProfileToXmlRPCResponse(userProfile);

         }

 

-        public string RestGetUserMethodUUID(string request, string path, string param)

+        public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request)

         {

-            UserProfileData userProfile = getUserProfile(new LLUUID(param));

-

-            if (userProfile == null)

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable requestData = (Hashtable)request.Params[0];

+            UserProfileData userProfile;

+            if (requestData.Contains("avatar_uuid"))

+            {

+                userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);

+                if (userProfile == null)

+                {

+                    return CreateUnknownUserErrorResponse();

+                }

+            }

+            else

             {

                 return CreateUnknownUserErrorResponse();

             }

 

-            return ProfileToXml(userProfile);

+

+            return ProfileToXmlRPCResponse(userProfile);

         }

         #endregion

 

diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
index 075ea7f..3ca89e8 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenSim.GenericConfig.Xml" default="build">

+<project name="OpenSim.Region.Caches" default="build">

     <target name="build">

         <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

         <mkdir dir="${project::get-base-directory()}/${build.dir}" />

@@ -8,10 +8,10 @@
             </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.GenericConfig.Xml" dynamicprefix="true" >

+            <resources prefix="OpenSim.Region.Caches" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="XmlConfig.cs" />

+                <include name="AssetCache.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -19,6 +19,7 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />

diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
index ca50be0..d47d25c 100644
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
+++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
@@ -29,13 +29,17 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Framework.Interfaces

+namespace OpenSim.Region.Capabilities

 {

-    public interface IScriptEngine

+    [LLSDType("MAP")]

+    public class LLSDCapEvent

     {

-        bool Init(IScriptAPI api);

-        string GetName();

-        void LoadScript(string script, string scriptName, uint entityID);

-        void OnFrame();

+        public int id = 0;

+        public LLSDArray events = new LLSDArray();

+

+        public LLSDCapEvent()

+        {

+

+        }

     }

 }

diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
index 051520c..76d9345 100644
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -1,3 +1,30 @@
+/*

+* Copyright (c) Contributors, http://www.openmetaverse.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

+*

+* 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 OpenSim Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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;

 using System.Collections;

 using System.Collections.Generic;

@@ -6,7 +33,7 @@ using System.IO;
 using System.Xml;

 using libsecondlife;

 

-namespace OpenSim.Framework

+namespace OpenSim.Region.Capabilities

 {

     public class LLSDHelpers

     {

@@ -46,7 +73,6 @@ namespace OpenSim.Framework
                             }

                             else

                             {

-                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());

                                 writer.WriteStartElement(String.Empty, "key", String.Empty);

                                 writer.WriteString(fields[i].Name);

                                 writer.WriteEndElement();

@@ -59,12 +85,15 @@ namespace OpenSim.Framework
                         // LLSDArray arrayObject = obj as LLSDArray;

                         // ArrayList a = arrayObject.Array;

                         ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);

-                        writer.WriteStartElement(String.Empty, "array", String.Empty);

-                        foreach (object item in a)

+                        if (a != null)

                         {

-                            SerializeLLSDType(writer, item);

+                            writer.WriteStartElement(String.Empty, "array", String.Empty);

+                            foreach (object item in a)

+                            {

+                                SerializeLLSDType(writer, item);

+                            }

+                            writer.WriteEndElement();

                         }

-                        writer.WriteEndElement();

                         break;

                 }

             }

@@ -115,132 +144,22 @@ namespace OpenSim.Framework
         }

     }

 

-    [LLSDType("MAP")]

-    public class LLSDMapLayerResponse

-    {

-        public LLSDMapRequest AgentData = new LLSDMapRequest();

-        public LLSDArray LayerData = new LLSDArray();

-

-        public LLSDMapLayerResponse()

-        {

-

-        }

-    }

-

-    [LLSDType("MAP")]

-    public class LLSDCapsDetails

-    {

-        public string MapLayer = "";

-        public string NewFileAgentInventory = "";

-        //public string EventQueueGet = "";

-

-        public LLSDCapsDetails()

-        {

-

-        }

-    }

-

-    [LLSDType("MAP")]

-    public class LLSDMapLayer

-    {

-        public int Left = 0;

-        public int Right = 0;

-        public int Top = 0;

-        public int Bottom = 0;

-        public LLUUID ImageID = LLUUID.Zero;

+    

 

-        public LLSDMapLayer()

-        {

-           

-        }

-    }

+    

 

-    [LLSDType("ARRAY")]

-    public class LLSDArray

-    {

-        public ArrayList Array = new ArrayList();

+   

 

-        public LLSDArray()

-        {

+    

 

-        }

-    }

+    

 

-    [LLSDType("MAP")]

-    public class LLSDMapRequest

-    {

-        public int Flags = 0;

+    

 

-        public LLSDMapRequest()

-        {

-

-        }

-    }

+    

 

-    [LLSDType("MAP")]

-    public class LLSDUploadReply

-    {

-        public string new_asset = "";

-        public LLUUID new_inventory_item = LLUUID.Zero;

-        public string state = "";

+    

 

-        public LLSDUploadReply()

-        {

 

-        }

-    }

-

-    [LLSDType("MAP")]

-    public class LLSDCapEvent

-    {

-        public int id = 0;

-        public LLSDArray events = new LLSDArray();

-

-        public LLSDCapEvent()

-        {

-

-        }

-    }

-

-    [LLSDType("MAP")]

-    public class LLSDEmpty

-    {

-        public LLSDEmpty()

-        {

-

-        }

-    }

-

-    [LLSDType("MAP")]

-    public class LLSDTest

-    {

-        public int Test1 = 20;

-        public int Test2 = 10;

-

-        public LLSDTest()

-        {

-

-        }

-    }

-

-

-    [AttributeUsage(AttributeTargets.Class)]

-    public class LLSDType : Attribute

-    {

-        private string myType;

-

-        public LLSDType(string type)

-        {

-            myType = type;

-

-        }

-

-        public string ObjectType

-        {

-            get

-            {

-                return myType;

-            }

-        }

-    }

+    

 }

diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
index 0c1627b..83cf166 100644
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
+++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
@@ -28,15 +28,20 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.Framework.Types;

 

 using libsecondlife;

-namespace OpenSim.Framework.Interfaces

+namespace OpenSim.Region.Capabilities

 {

-    public interface IScriptAPI

+    [LLSDType("MAP")]

+    public class LLSDUploadReply

     {

-        LLVector3 GetEntityPosition(uint localID);

-        void SetEntityPosition(uint localID, float x, float y, float z);

-        uint GetRandomAvatarID();

+        public string new_asset = "";

+        public LLUUID new_inventory_item = LLUUID.Zero;

+        public string state = "";

+

+        public LLSDUploadReply()

+        {

+

+        }

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index db64f0c..5f0c80c 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -6,15 +6,15 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;

 using System.Runtime.Remoting.Channels.Tcp;

 

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using OpenSim.Framework;

 using OpenSim.Framework.Types;

-using OpenGrid.Framework.Communications;

+using OpenSim.Framework.Communications;

 

 using Nwc.XmlRpc;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Communications.OGS1

+namespace OpenSim.Region.Communications.OGS1

 {

     public class OGS1GridServices : IGridServices, IInterRegionCommunications

     {

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 3d74e2f..51b33e9 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using OpenSim.Framework.Types;

-using OpenGrid.Framework.Communications;

-namespace OpenGrid.Framework.Communications.OGS1

+using OpenSim.Framework.Communications;

+namespace OpenSim.Region.Communications.OGS1

 {

     public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);

     public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 804ddba..d6abd13 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>

+    <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>

+    <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,7 +59,7 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

@@ -78,56 +78,54 @@
       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="XMLRPC.dll" >

+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">

-      <Name>OpenGrid.Framework.Communications</Name>

-      <Project>{683344D5-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

-    </ProjectReference>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">

+      <Name>OpenSim.Framework</Name>

+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

-      <Name>OpenSim.Framework</Name>

-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">

+      <Name>OpenSim.Framework.Communications</Name>

+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">

-      <Name>OpenSim.Servers</Name>

-      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">

+      <Name>OpenSim.Framework.Data</Name>

+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

-      <Name>XMLRPC</Name>

-      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">

+      <Name>OpenSim.Framework.Servers</Name>

+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="GridCommsManager.cs">

+    <Compile Include="CommunicationsOGS1.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="OGS1GridServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGSInterSimComms.cs">

+    <Compile Include="OGS1InterSimComms.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGSUserServices.cs">

+    <Compile Include="OGS1UserServices.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 0c6f965..0c6f965 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
index d82d751..9d12c33 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenGrid.Framework.Data.DB4o" default="build">

+<project name="OpenSim.Region.Storage.LocalStorageSQLite" default="build">

     <target name="build">

         <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

         <mkdir dir="${project::get-base-directory()}/${build.dir}" />

@@ -8,12 +8,10 @@
             </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="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >

+            <resources prefix="OpenSim.Region.Storage.LocalStorageSQLite" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="DB4oGridData.cs" />

-                <include name="DB4oManager.cs" />

-                <include name="DB4oUserData.cs" />

+                <include name="SQLiteLocalStorage.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -21,17 +19,18 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../../../bin/libsecondlife.dll" />

+                <include name="../../../../bin/OpenSim.Framework.dll" />

+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />

                 <include name="System.dll" />

                 <include name="System.Data.dll" />

+                <include name="../../../../bin/System.Data.SQLite.dll" />

                 <include name="System.Xml.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/">

+        <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"/>