4 files changed, 58 insertions, 14 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index dfc572a..3f5d7dd 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -27,12 +27,12 @@
 */

 using Nwc.XmlRpc;

 using OpenSim.Framework;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using System.Collections;

 using System.Collections.Generic;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Manager

+namespace OpenSim.Framework.Manager

 {

     /// <summary>

     /// Used to pass messages to the gridserver

@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
             Hashtable requestData = (Hashtable)request.Params[0];

             Hashtable responseData = new Hashtable();

 

-            // TODO: Switch this over to using OpenGrid.Framework.Data

+            // TODO: Switch this over to using OpenSim.Framework.Data

             if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))

             {

                 response.IsFault = false;

diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index e276556..d5eaf6f 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -33,7 +33,7 @@ using Nwc.XmlRpc;
 using System.Threading;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Manager {

+namespace OpenSim.Framework.Manager {

 

     /// <summary>

     /// A remote management system for the grid server

diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index e1c9f42..9a98ff4 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{7924FD35-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{4B7BFD1C-0000-0000-0000-000000000000}</ProjectGuid>

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

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

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

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

+    <AssemblyName>OpenSim.Grid.Framework.Manager</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

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

+    <RootNamespace>OpenSim.Grid.Framework.Manager</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,23 +59,23 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="libsecondlife.dll" >

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

+      <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.Servers" >

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

+    <Reference Include="OpenSim.Framework.Servers" >

+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

       <HintPath>System.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>

diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
new file mode 100644
index 0000000..119967d
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.Grid.Framework.Manager" 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.Grid.Framework.Manager" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

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

+                <include name="GridServerManager.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="OpenSim.Framework.dll" />

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

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