5 files changed, 66 insertions, 65 deletions

diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 01e0c59..89f39d3 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Console;

 using libsecondlife;

-using OpenSim.Region;

-using Avatar=OpenSim.Region.Scenes.ScenePresence;

-using OpenSim.Region.Scenes;

+using OpenSim.Region.Environment;

+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;

+using OpenSim.Region.Environment.Scenes;

 using OpenSim.Framework;

-using OpenSim.Caches;

-using OpenGrid.Framework.Communications;

-using OpenSim.Servers;

+using OpenSim.Region.Caches;

+using OpenSim.Framework.Communications;

+using OpenSim.Framework.Servers;

 

 namespace SimpleApp

 {

     public class MyWorld : Scene

     {

         private RegionInfo m_regionInfo;

-        private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;

+        private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;

 

         public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)

             : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)

@@ -76,7 +76,7 @@ namespace SimpleApp
 

             client.SendRegionHandshake(m_regionInfo);

 

-            OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );

+            OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );

             

         }

 

diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e1465d1..4060d68 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -2,17 +2,18 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using OpenSim;

-using OpenSim.GridInterfaces.Local;

+using OpenSim.Region.GridInterfaces.Local;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Console;

+using OpenSim.Framework.Servers;

 using OpenSim.Assets;

 using libsecondlife;

-using OpenSim.Servers;

 using OpenSim.Framework;

-using OpenSim.Caches;

-using OpenGrid.Framework.Communications;

-using OpenSim.LocalCommunications;

+using OpenSim.Region.Caches;

+using OpenSim.Framework.Communications;

+using OpenSim.Region.Communications.Local;

+using OpenSim.Region.ClientStack;

 

 namespace SimpleApp

 {

diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
index 0f9bf0f..0f9bf0f 100644
--- a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 00af44a..0a82172 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.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>

@@ -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" >

@@ -67,72 +67,70 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="System.Data.dll" >

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

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

       <Private>False</Private>

     </Reference>

     <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="..\..\..\Common\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="..\..\OpenSim.Caches\OpenSim.Caches.csproj">

-      <Name>OpenSim.Caches</Name>

-      <Project>{1938EB12-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="..\..\..\Common\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="..\..\..\Common\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.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">

-      <Name>OpenSim.GridInterfaces.Local</Name>

-      <Project>{546099CD-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>

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

-      <Name>OpenSim.LocalCommunications</Name>

-      <Project>{79CED992-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">

+      <Name>OpenSim.Region.Caches</Name>

+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>

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

                         <Private>False</Private>

     </ProjectReference>

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

-      <Name>OpenSim.Region</Name>

-      <Project>{196916AF-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">

+      <Name>OpenSim.Region.ClientStack</Name>

+      <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>

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

                         <Private>False</Private>

     </ProjectReference>

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

-      <Name>OpenSim.RegionServer</Name>

-      <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">

+      <Name>OpenSim.Region.Communications.Local</Name>

+      <Project>{BFB5D807-0000-0000-0000-000000000000}</Project>

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

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

-      <Name>OpenSim.Servers</Name>

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

+    <ProjectReference Include="..\..\Environment\OpenSim.Region.Environment.csproj">

+      <Name>OpenSim.Region.Environment</Name>

+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>

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

                         <Private>False</Private>

     </ProjectReference>

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

-      <Name>XMLRPC</Name>

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

+    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">

+      <Name>OpenSim.Region.GridInterfaces.Local</Name>

+      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>

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

                         <Private>False</Private>

     </ProjectReference>

diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index 60c0f85..f8896fa 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenGridServices.GridServer" default="build">

+<project name="SimpleApp" 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,11 +8,11 @@
             </fileset>

         </copy>

         <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">

-            <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >

+            <resources prefix="SimpleApp" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

+                <include name="MyWorld.cs" />

+                <include name="Program.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -20,23 +20,25 @@
                     <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/OpenGrid.Framework.Manager.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="../../../../bin/libsecondlife.dll" />

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

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

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

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

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

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

+                <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />

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

+                <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />

                 <include name="System.dll" />

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

+                <include name="System.Data.dll.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"/>