diff options
Diffstat (limited to 'Common/OpenGrid.Framework.Communications.OGS1')
6 files changed, 0 insertions, 540 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 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.Framework.Types; | ||
5 | using OpenGrid.Framework.Communications; | ||
6 | namespace OpenGrid.Framework.Communications.OGS1 | ||
7 | { | ||
8 | public class GridCommsManager : CommunicationsManager | ||
9 | { | ||
10 | private OGS1GridServices gridInterComms = new OGS1GridServices(); | ||
11 | public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo) | ||
12 | { | ||
13 | GridServer = gridInterComms; | ||
14 | InterRegion = gridInterComms; | ||
15 | UserServer = new OGSUserServices(); | ||
16 | } | ||
17 | } | ||
18 | } | ||
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs deleted file mode 100644 index db64f0c..0000000 --- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs +++ /dev/null | |||
@@ -1,248 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Collections; | ||
4 | using System.Text; | ||
5 | using System.Runtime.Remoting; | ||
6 | using System.Runtime.Remoting.Channels; | ||
7 | using System.Runtime.Remoting.Channels.Tcp; | ||
8 | |||
9 | using OpenSim.Servers; | ||
10 | using OpenSim.Framework; | ||
11 | using OpenSim.Framework.Types; | ||
12 | using OpenGrid.Framework.Communications; | ||
13 | |||
14 | using Nwc.XmlRpc; | ||
15 | using libsecondlife; | ||
16 | |||
17 | namespace OpenGrid.Framework.Communications.OGS1 | ||
18 | { | ||
19 | public class OGS1GridServices : IGridServices, IInterRegionCommunications | ||
20 | { | ||
21 | public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>(); | ||
22 | public GridInfo grid; | ||
23 | public BaseHttpServer httpListener; | ||
24 | private bool initialised = false; | ||
25 | |||
26 | public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo) | ||
27 | { | ||
28 | Hashtable GridParams = new Hashtable(); | ||
29 | |||
30 | grid = gridInfo; | ||
31 | |||
32 | // Login / Authentication | ||
33 | GridParams["authkey"] = gridInfo.GridServerSendKey; | ||
34 | GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated(); | ||
35 | GridParams["sim_ip"] = regionInfo.CommsExternalAddress; | ||
36 | GridParams["sim_port"] = regionInfo.CommsIPListenPort.ToString(); | ||
37 | |||
38 | // Package into an XMLRPC Request | ||
39 | ArrayList SendParams = new ArrayList(); | ||
40 | SendParams.Add(GridParams); | ||
41 | |||
42 | // Send Request | ||
43 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); | ||
44 | XmlRpcResponse GridResp = GridReq.Send(gridInfo.GridServerURI, 3000); | ||
45 | Hashtable GridRespData = (Hashtable)GridResp.Value; | ||
46 | Hashtable griddatahash = GridRespData; | ||
47 | |||
48 | // Process Response | ||
49 | if (GridRespData.ContainsKey("error")) | ||
50 | { | ||
51 | string errorstring = (string)GridRespData["error"]; | ||
52 | OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring); | ||
53 | return null; | ||
54 | } | ||
55 | |||
56 | if (!this.listeners.ContainsKey(regionInfo.RegionHandle)) | ||
57 | { | ||
58 | // initialised = true; | ||
59 | httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort); | ||
60 | httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser); | ||
61 | httpListener.Start(); | ||
62 | } | ||
63 | |||
64 | // Initialise the background listeners | ||
65 | listeners[regionInfo.RegionHandle] = new RegionCommsListener(); | ||
66 | |||
67 | return listeners[regionInfo.RegionHandle]; | ||
68 | } | ||
69 | |||
70 | public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo) | ||
71 | { | ||
72 | Hashtable respData = MapBlockQuery((int)regionInfo.RegionLocX - 1, (int)regionInfo.RegionLocY - 1, (int)regionInfo.RegionLocX + 1, (int)regionInfo.RegionLocY + 1); | ||
73 | |||
74 | List<RegionInfo> neighbours = new List<RegionInfo>(); | ||
75 | |||
76 | foreach (Hashtable n in (Hashtable)respData.Values) | ||
77 | { | ||
78 | RegionInfo neighbour = new RegionInfo(); | ||
79 | |||
80 | //OGS1 | ||
81 | neighbour.RegionHandle = (ulong)n["regionhandle"]; | ||
82 | neighbour.RegionLocX = (uint)n["x"]; | ||
83 | neighbour.RegionLocY = (uint)n["y"]; | ||
84 | neighbour.RegionName = (string)n["name"]; | ||
85 | |||
86 | //OGS1+ | ||
87 | neighbour.CommsIPListenAddr = (string)n["sim_ip"]; | ||
88 | neighbour.CommsIPListenPort = (int)n["sim_port"]; | ||
89 | neighbour.CommsExternalAddress = (string)n["sim_uri"]; | ||
90 | neighbour.SimUUID = (string)n["uuid"]; | ||
91 | |||
92 | neighbours.Add(neighbour); | ||
93 | } | ||
94 | |||
95 | return neighbours; | ||
96 | } | ||
97 | |||
98 | public RegionInfo RequestNeighbourInfo(ulong regionHandle) | ||
99 | { | ||
100 | OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()"); | ||
101 | return null; | ||
102 | } | ||
103 | |||
104 | public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY) | ||
105 | { | ||
106 | Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY); | ||
107 | |||
108 | List<MapBlockData> neighbours = new List<MapBlockData>(); | ||
109 | |||
110 | foreach (Hashtable n in (Hashtable)respData.Values) | ||
111 | { | ||
112 | MapBlockData neighbour = new MapBlockData(); | ||
113 | |||
114 | neighbour.X = (ushort)n["x"]; | ||
115 | neighbour.Y = (ushort)n["y"]; | ||
116 | |||
117 | neighbour.Name = (string)n["name"]; | ||
118 | neighbour.Access = (byte)n["access"]; | ||
119 | neighbour.RegionFlags = (uint)n["region-flags"]; | ||
120 | neighbour.WaterHeight = (byte)n["water-height"]; | ||
121 | neighbour.MapImageId = (string)n["map-image-id"]; | ||
122 | |||
123 | neighbours.Add(neighbour); | ||
124 | } | ||
125 | |||
126 | return neighbours; | ||
127 | } | ||
128 | |||
129 | /// <summary> | ||
130 | /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates | ||
131 | /// </summary> | ||
132 | /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks> | ||
133 | /// <param name="minX">Minimum X value</param> | ||
134 | /// <param name="minY">Minimum Y value</param> | ||
135 | /// <param name="maxX">Maximum X value</param> | ||
136 | /// <param name="maxY">Maximum Y value</param> | ||
137 | /// <returns>Hashtable of hashtables containing map data elements</returns> | ||
138 | private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY) | ||
139 | { | ||
140 | Hashtable param = new Hashtable(); | ||
141 | param["xmin"] = minX; | ||
142 | param["ymin"] = minY; | ||
143 | param["xmax"] = maxX; | ||
144 | param["ymax"] = maxY; | ||
145 | IList parameters = new ArrayList(); | ||
146 | parameters.Add(param); | ||
147 | XmlRpcRequest req = new XmlRpcRequest("map_block", parameters); | ||
148 | XmlRpcResponse resp = req.Send(grid.GridServerURI, 3000); | ||
149 | Hashtable respData = (Hashtable)resp.Value; | ||
150 | return respData; | ||
151 | } | ||
152 | |||
153 | // Grid Request Processing | ||
154 | public XmlRpcResponse ExpectUser(XmlRpcRequest request) | ||
155 | { | ||
156 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
157 | AgentCircuitData agentData = new AgentCircuitData(); | ||
158 | agentData.SessionID = new LLUUID((string)requestData["session_id"]); | ||
159 | agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]); | ||
160 | agentData.firstname = (string)requestData["firstname"]; | ||
161 | agentData.lastname = (string)requestData["lastname"]; | ||
162 | agentData.AgentID = new LLUUID((string)requestData["agent_id"]); | ||
163 | agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); | ||
164 | if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) | ||
165 | { | ||
166 | agentData.child = true; | ||
167 | } | ||
168 | else | ||
169 | { | ||
170 | agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"])); | ||
171 | agentData.child = false; | ||
172 | |||
173 | } | ||
174 | |||
175 | if (listeners.ContainsKey((ulong)requestData["regionhandle"])) | ||
176 | { | ||
177 | this.listeners[(ulong)requestData["regionhandle"]].TriggerExpectUser((ulong)requestData["regionhandle"], agentData); | ||
178 | } | ||
179 | else | ||
180 | { | ||
181 | OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString()); | ||
182 | } | ||
183 | |||
184 | return new XmlRpcResponse(); | ||
185 | } | ||
186 | |||
187 | #region InterRegion Comms | ||
188 | private void StartRemoting() | ||
189 | { | ||
190 | TcpChannel ch = new TcpChannel(8895); | ||
191 | ChannelServices.RegisterChannel(ch); | ||
192 | |||
193 | WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton); | ||
194 | RemotingConfiguration.RegisterWellKnownServiceType(wellType); | ||
195 | InterRegionSingleton.Instance.OnArrival += this.IncomingArrival; | ||
196 | InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent; | ||
197 | } | ||
198 | |||
199 | #region Methods called by regions in this instance | ||
200 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) | ||
201 | { | ||
202 | if (this.listeners.ContainsKey(regionHandle)) | ||
203 | { | ||
204 | this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData); | ||
205 | return true; | ||
206 | } | ||
207 | //TODO need to see if we know about where this region is and use .net remoting | ||
208 | // to inform it. | ||
209 | return false; | ||
210 | } | ||
211 | |||
212 | public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) | ||
213 | { | ||
214 | if (this.listeners.ContainsKey(regionHandle)) | ||
215 | { | ||
216 | this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position); | ||
217 | return true; | ||
218 | } | ||
219 | //TODO need to see if we know about where this region is and use .net remoting | ||
220 | // to inform it. | ||
221 | return false; | ||
222 | } | ||
223 | #endregion | ||
224 | |||
225 | #region Methods triggered by calls from external instances | ||
226 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) | ||
227 | { | ||
228 | if (this.listeners.ContainsKey(regionHandle)) | ||
229 | { | ||
230 | this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData); | ||
231 | return true; | ||
232 | } | ||
233 | return false; | ||
234 | } | ||
235 | |||
236 | public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) | ||
237 | { | ||
238 | if (this.listeners.ContainsKey(regionHandle)) | ||
239 | { | ||
240 | this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position); | ||
241 | return true; | ||
242 | } | ||
243 | return false; | ||
244 | } | ||
245 | #endregion | ||
246 | #endregion | ||
247 | } | ||
248 | } | ||
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs deleted file mode 100644 index 3d74e2f..0000000 --- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.Framework.Types; | ||
5 | using OpenGrid.Framework.Communications; | ||
6 | namespace OpenGrid.Framework.Communications.OGS1 | ||
7 | { | ||
8 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); | ||
9 | public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); | ||
10 | |||
11 | public sealed class InterRegionSingleton | ||
12 | { | ||
13 | static readonly InterRegionSingleton instance = new InterRegionSingleton(); | ||
14 | |||
15 | public event InformRegionChild OnChildAgent; | ||
16 | public event ExpectArrival OnArrival; | ||
17 | |||
18 | static InterRegionSingleton() | ||
19 | { | ||
20 | } | ||
21 | |||
22 | InterRegionSingleton() | ||
23 | { | ||
24 | } | ||
25 | |||
26 | public static InterRegionSingleton Instance | ||
27 | { | ||
28 | get | ||
29 | { | ||
30 | return instance; | ||
31 | } | ||
32 | } | ||
33 | |||
34 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) | ||
35 | { | ||
36 | if (OnChildAgent != null) | ||
37 | { | ||
38 | return OnChildAgent(regionHandle, agentData); | ||
39 | } | ||
40 | return false; | ||
41 | } | ||
42 | |||
43 | public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) | ||
44 | { | ||
45 | if (OnArrival != null) | ||
46 | { | ||
47 | return OnArrival(regionHandle, agentID, position); | ||
48 | } | ||
49 | return false; | ||
50 | } | ||
51 | } | ||
52 | |||
53 | public class OGS1InterRegionRemoting : MarshalByRefObject | ||
54 | { | ||
55 | |||
56 | public OGS1InterRegionRemoting() | ||
57 | { | ||
58 | } | ||
59 | |||
60 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) | ||
61 | { | ||
62 | return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); | ||
63 | } | ||
64 | |||
65 | public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) | ||
66 | { | ||
67 | return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position); | ||
68 | } | ||
69 | } | ||
70 | } | ||
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 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenGrid.Framework.Communications; | ||
5 | using OpenGrid.Framework.Data; | ||
6 | using libsecondlife; | ||
7 | |||
8 | namespace OpenGrid.Framework.Communications.OGS1 | ||
9 | { | ||
10 | public class OGSUserServices :IUserServices | ||
11 | { | ||
12 | public UserProfileData GetUserProfile(string firstName, string lastName) | ||
13 | { | ||
14 | return null; | ||
15 | } | ||
16 | public UserProfileData GetUserProfile(string name) | ||
17 | { | ||
18 | return null; | ||
19 | } | ||
20 | public UserProfileData GetUserProfile(LLUUID avatarID) | ||
21 | { | ||
22 | return null; | ||
23 | } | ||
24 | } | ||
25 | } | ||
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj deleted file mode 100644 index 804ddba..0000000 --- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj +++ /dev/null | |||
@@ -1,144 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <ProjectType>Local</ProjectType> | ||
4 | <ProductVersion>8.0.50727</ProductVersion> | ||
5 | <SchemaVersion>2.0</SchemaVersion> | ||
6 | <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid> | ||
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
9 | <ApplicationIcon></ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | ||
11 | </AssemblyKeyContainerName> | ||
12 | <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
17 | <OutputType>Library</OutputType> | ||
18 | <AppDesignerFolder></AppDesignerFolder> | ||
19 | <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace> | ||
20 | <StartupObject></StartupObject> | ||
21 | <FileUpgradeFlags> | ||
22 | </FileUpgradeFlags> | ||
23 | </PropertyGroup> | ||
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
26 | <BaseAddress>285212672</BaseAddress> | ||
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
28 | <ConfigurationOverrideFile> | ||
29 | </ConfigurationOverrideFile> | ||
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
31 | <DocumentationFile></DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | ||
33 | <FileAlignment>4096</FileAlignment> | ||
34 | <Optimize>False</Optimize> | ||
35 | <OutputPath>..\..\bin\</OutputPath> | ||
36 | <RegisterForComInterop>False</RegisterForComInterop> | ||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
39 | <WarningLevel>4</WarningLevel> | ||
40 | <NoWarn></NoWarn> | ||
41 | </PropertyGroup> | ||
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
44 | <BaseAddress>285212672</BaseAddress> | ||
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
46 | <ConfigurationOverrideFile> | ||
47 | </ConfigurationOverrideFile> | ||
48 | <DefineConstants>TRACE</DefineConstants> | ||
49 | <DocumentationFile></DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | ||
51 | <FileAlignment>4096</FileAlignment> | ||
52 | <Optimize>True</Optimize> | ||
53 | <OutputPath>..\..\bin\</OutputPath> | ||
54 | <RegisterForComInterop>False</RegisterForComInterop> | ||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
57 | <WarningLevel>4</WarningLevel> | ||
58 | <NoWarn></NoWarn> | ||
59 | </PropertyGroup> | ||
60 | <ItemGroup> | ||
61 | <Reference Include="libsecondlife.dll" > | ||
62 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System" > | ||
66 | <HintPath>System.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System.Data" > | ||
70 | <HintPath>System.Data.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="System.Runtime.Remoting" > | ||
74 | <HintPath>System.Runtime.Remoting.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="System.Xml" > | ||
78 | <HintPath>System.Xml.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | </ItemGroup> | ||
82 | <ItemGroup> | ||
83 | <ProjectReference Include="..\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | ||
84 | <Name>OpenGrid.Framework.Communications</Name> | ||
85 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | ||
90 | <Name>OpenGrid.Framework.Data</Name> | ||
91 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
96 | <Name>OpenSim.Framework</Name> | ||
97 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
99 | <Private>False</Private> | ||
100 | </ProjectReference> | ||
101 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
102 | <Name>OpenSim.Framework.Console</Name> | ||
103 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
105 | <Private>False</Private> | ||
106 | </ProjectReference> | ||
107 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
108 | <Name>OpenSim.Servers</Name> | ||
109 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
111 | <Private>False</Private> | ||
112 | </ProjectReference> | ||
113 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
114 | <Name>XMLRPC</Name> | ||
115 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
117 | <Private>False</Private> | ||
118 | </ProjectReference> | ||
119 | </ItemGroup> | ||
120 | <ItemGroup> | ||
121 | <Compile Include="GridCommsManager.cs"> | ||
122 | <SubType>Code</SubType> | ||
123 | </Compile> | ||
124 | <Compile Include="OGS1GridServices.cs"> | ||
125 | <SubType>Code</SubType> | ||
126 | </Compile> | ||
127 | <Compile Include="OGSInterSimComms.cs"> | ||
128 | <SubType>Code</SubType> | ||
129 | </Compile> | ||
130 | <Compile Include="OGSUserServices.cs"> | ||
131 | <SubType>Code</SubType> | ||
132 | </Compile> | ||
133 | <Compile Include="Properties\AssemblyInfo.cs"> | ||
134 | <SubType>Code</SubType> | ||
135 | </Compile> | ||
136 | </ItemGroup> | ||
137 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
138 | <PropertyGroup> | ||
139 | <PreBuildEvent> | ||
140 | </PreBuildEvent> | ||
141 | <PostBuildEvent> | ||
142 | </PostBuildEvent> | ||
143 | </PropertyGroup> | ||
144 | </Project> | ||
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs deleted file mode 100644 index 0c6f965..0000000 --- a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")] | ||
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | // You can specify all the values or you can default the Revision and Build Numbers | ||
33 | // by using the '*' as shown below: | ||
34 | [assembly: AssemblyVersion("1.0.0.0")] | ||
35 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||