diff options
Renamed sandBoxManager to LocalBackEndServices
Diffstat (limited to 'Common')
-rw-r--r-- | Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs | 4 | ||||
-rw-r--r-- | Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs | 4 | ||||
-rw-r--r-- | Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs (renamed from Common/OpenGrid.Framework.Communications/SandBoxManager.cs) | 6 | ||||
-rw-r--r-- | Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj | 35 | ||||
-rw-r--r-- | Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build | 2 | ||||
-rw-r--r-- | Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs | 2 |
6 files changed, 30 insertions, 23 deletions
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs index bf7d5b9..54c62d6 100644 --- a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs +++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs | |||
@@ -11,9 +11,9 @@ namespace OpenGrid.Framework.Communications.GridServer | |||
11 | { | 11 | { |
12 | public class GridCommsManagerLocal : GridCommsManagerBase | 12 | public class GridCommsManagerLocal : GridCommsManagerBase |
13 | { | 13 | { |
14 | private SandBoxManager sandBoxManager; | 14 | private LocalBackEndServices sandBoxManager; |
15 | 15 | ||
16 | public GridCommsManagerLocal(SandBoxManager sandManager) | 16 | public GridCommsManagerLocal(LocalBackEndServices sandManager) |
17 | { | 17 | { |
18 | sandBoxManager = sandManager; | 18 | sandBoxManager = sandManager; |
19 | } | 19 | } |
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs index bce146f..a56e1f0 100644 --- a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs +++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs | |||
@@ -8,9 +8,9 @@ namespace OpenGrid.Framework.Communications | |||
8 | { | 8 | { |
9 | public class InterSimsCommsLocal : InterSimsCommsBase | 9 | public class InterSimsCommsLocal : InterSimsCommsBase |
10 | { | 10 | { |
11 | private SandBoxManager sandBoxManager; | 11 | private LocalBackEndServices sandBoxManager; |
12 | 12 | ||
13 | public InterSimsCommsLocal(SandBoxManager sandManager) | 13 | public InterSimsCommsLocal(LocalBackEndServices sandManager) |
14 | { | 14 | { |
15 | sandBoxManager = sandManager; | 15 | sandBoxManager = sandManager; |
16 | } | 16 | } |
diff --git a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs b/Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs index dc2c3cb..b213213 100644 --- a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs +++ b/Common/OpenGrid.Framework.Communications/LocalBackEndServices.cs | |||
@@ -8,18 +8,18 @@ using libsecondlife; | |||
8 | 8 | ||
9 | namespace OpenGrid.Framework.Communications | 9 | namespace OpenGrid.Framework.Communications |
10 | { | 10 | { |
11 | public class SandBoxManager | 11 | public class LocalBackEndServices |
12 | { | 12 | { |
13 | protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>(); | 13 | protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>(); |
14 | protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>(); | 14 | protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>(); |
15 | 15 | ||
16 | public SandBoxManager() | 16 | public LocalBackEndServices() |
17 | { | 17 | { |
18 | 18 | ||
19 | } | 19 | } |
20 | 20 | ||
21 | /// <summary> | 21 | /// <summary> |
22 | /// Register a region method with the SandBoxManager. | 22 | /// Register a region method with the BackEnd Services. |
23 | /// </summary> | 23 | /// </summary> |
24 | /// <param name="regionInfo"></param> | 24 | /// <param name="regionInfo"></param> |
25 | /// <returns></returns> | 25 | /// <returns></returns> |
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index e8f10f0..dcf09d9 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,7 +6,8 @@ | |||
6 | <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon> |
10 | </ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | 11 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 12 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenGrid.Framework.Communications</AssemblyName> | 13 | <AssemblyName>OpenGrid.Framework.Communications</AssemblyName> |
@@ -15,9 +16,11 @@ | |||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 17 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 18 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 19 | <AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
19 | <RootNamespace>OpenGrid.Framework.Communications</RootNamespace> | 21 | <RootNamespace>OpenGrid.Framework.Communications</RootNamespace> |
20 | <StartupObject></StartupObject> | 22 | <StartupObject> |
23 | </StartupObject> | ||
21 | <FileUpgradeFlags> | 24 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 25 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 26 | </PropertyGroup> |
@@ -28,7 +31,8 @@ | |||
28 | <ConfigurationOverrideFile> | 31 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 32 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 33 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 34 | <DocumentationFile> |
35 | </DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | 36 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 37 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 38 | <Optimize>False</Optimize> |
@@ -37,7 +41,8 @@ | |||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 43 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 44 | <NoWarn> |
45 | </NoWarn> | ||
41 | </PropertyGroup> | 46 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -46,7 +51,8 @@ | |||
46 | <ConfigurationOverrideFile> | 51 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 52 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 53 | <DefineConstants>TRACE</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 54 | <DocumentationFile> |
55 | </DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | 56 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 57 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 58 | <Optimize>True</Optimize> |
@@ -55,18 +61,19 @@ | |||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 63 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 64 | <NoWarn> |
65 | </NoWarn> | ||
59 | </PropertyGroup> | 66 | </PropertyGroup> |
60 | <ItemGroup> | 67 | <ItemGroup> |
61 | <Reference Include="System" > | 68 | <Reference Include="System"> |
62 | <HintPath>System.dll</HintPath> | 69 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 70 | <Private>False</Private> |
64 | </Reference> | 71 | </Reference> |
65 | <Reference Include="System.Xml" > | 72 | <Reference Include="System.Xml"> |
66 | <HintPath>System.Xml.dll</HintPath> | 73 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 74 | <Private>False</Private> |
68 | </Reference> | 75 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 76 | <Reference Include="libsecondlife.dll"> |
70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 77 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 78 | <Private>False</Private> |
72 | </Reference> | 79 | </Reference> |
@@ -76,7 +83,7 @@ | |||
76 | <Name>OpenSim.Framework</Name> | 83 | <Name>OpenSim.Framework</Name> |
77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 84 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 85 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 86 | <Private>False</Private> |
80 | </ProjectReference> | 87 | </ProjectReference> |
81 | </ItemGroup> | 88 | </ItemGroup> |
82 | <ItemGroup> | 89 | <ItemGroup> |
@@ -89,7 +96,7 @@ | |||
89 | <Compile Include="RegionServerCommsOGS.cs"> | 96 | <Compile Include="RegionServerCommsOGS.cs"> |
90 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
91 | </Compile> | 98 | </Compile> |
92 | <Compile Include="SandBoxManager.cs"> | 99 | <Compile Include="LocalBackEndServices.cs"> |
93 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
94 | </Compile> | 101 | </Compile> |
95 | <Compile Include="GridServer\GridCommsManagerBase.cs"> | 102 | <Compile Include="GridServer\GridCommsManagerBase.cs"> |
@@ -130,4 +137,4 @@ | |||
130 | <PostBuildEvent> | 137 | <PostBuildEvent> |
131 | </PostBuildEvent> | 138 | </PostBuildEvent> |
132 | </PropertyGroup> | 139 | </PropertyGroup> |
133 | </Project> | 140 | </Project> \ No newline at end of file |
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build index 069983c..4036747 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build | |||
@@ -11,10 +11,10 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LocalBackEndServices.cs" /> | ||
14 | <include name="RegionServerCommsLocal.cs" /> | 15 | <include name="RegionServerCommsLocal.cs" /> |
15 | <include name="RegionServerCommsManager.cs" /> | 16 | <include name="RegionServerCommsManager.cs" /> |
16 | <include name="RegionServerCommsOGS.cs" /> | 17 | <include name="RegionServerCommsOGS.cs" /> |
17 | <include name="SandBoxManager.cs" /> | ||
18 | <include name="GridServer/GridCommsManagerBase.cs" /> | 18 | <include name="GridServer/GridCommsManagerBase.cs" /> |
19 | <include name="GridServer/GridCommsManagerLocal.cs" /> | 19 | <include name="GridServer/GridCommsManagerLocal.cs" /> |
20 | <include name="GridServer/GridCommsManagerOGS.cs" /> | 20 | <include name="GridServer/GridCommsManagerOGS.cs" /> |
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs index aeaeb7b..02ac43b 100644 --- a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs +++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs | |||
@@ -11,7 +11,7 @@ namespace OpenGrid.Framework.Communications | |||
11 | { | 11 | { |
12 | public class RegionServerCommsLocal : RegionServerCommsManager | 12 | public class RegionServerCommsLocal : RegionServerCommsManager |
13 | { | 13 | { |
14 | public SandBoxManager SandManager = new SandBoxManager(); | 14 | public LocalBackEndServices SandManager = new LocalBackEndServices(); |
15 | public RegionServerCommsLocal() | 15 | public RegionServerCommsLocal() |
16 | { | 16 | { |
17 | UserServer = new UserServer.UserCommsManagerLocal(); //Local User Server | 17 | UserServer = new UserServer.UserCommsManagerLocal(); //Local User Server |