diff options
author | MW | 2007-06-08 16:49:24 +0000 |
---|---|---|
committer | MW | 2007-06-08 16:49:24 +0000 |
commit | a8cabbd600f2bf4e3ecd8b48d726f9c1036d9f93 (patch) | |
tree | d9c04b9241c67f892285bc2b9fb05b1e70e40576 /OpenGridServices/OpenGridServices.GridServer | |
parent | prebuild.xml should be fixed/updated. (diff) | |
download | opensim-SC-a8cabbd600f2bf4e3ecd8b48d726f9c1036d9f93.zip opensim-SC-a8cabbd600f2bf4e3ecd8b48d726f9c1036d9f93.tar.gz opensim-SC-a8cabbd600f2bf4e3ecd8b48d726f9c1036d9f93.tar.bz2 opensim-SC-a8cabbd600f2bf4e3ecd8b48d726f9c1036d9f93.tar.xz |
Deleted OpenGridServices folder as the easiest way to reimport the latest version from trunk
Diffstat (limited to '')
6 files changed, 0 insertions, 977 deletions
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs deleted file mode 100644 index 54e4bb7..0000000 --- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs +++ /dev/null | |||
@@ -1,474 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections; | ||
3 | using System.Collections.Generic; | ||
4 | using System.Text; | ||
5 | using System.Reflection; | ||
6 | using OpenGrid.Framework.Data; | ||
7 | using OpenSim.Framework.Utilities; | ||
8 | using OpenSim.Framework.Console; | ||
9 | using OpenSim.Framework.Sims; | ||
10 | using libsecondlife; | ||
11 | using Nwc.XmlRpc; | ||
12 | using System.Xml; | ||
13 | |||
14 | namespace OpenGridServices.GridServer | ||
15 | { | ||
16 | class GridManager | ||
17 | { | ||
18 | Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); | ||
19 | public OpenSim.Framework.Interfaces.GridConfig config; | ||
20 | |||
21 | /// <summary> | ||
22 | /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. | ||
23 | /// </summary> | ||
24 | /// <param name="FileName">The filename to the grid server plugin DLL</param> | ||
25 | public void AddPlugin(string FileName) | ||
26 | { | ||
27 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Attempting to load " + FileName); | ||
28 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | ||
29 | |||
30 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); | ||
31 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
32 | { | ||
33 | if (!pluginType.IsAbstract) | ||
34 | { | ||
35 | Type typeInterface = pluginType.GetInterface("IGridData", true); | ||
36 | |||
37 | if (typeInterface != null) | ||
38 | { | ||
39 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
40 | plug.Initialise(); | ||
41 | this._plugins.Add(plug.getName(), plug); | ||
42 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Added IGridData Interface"); | ||
43 | } | ||
44 | |||
45 | typeInterface = null; | ||
46 | } | ||
47 | } | ||
48 | |||
49 | pluginAssembly = null; | ||
50 | } | ||
51 | |||
52 | /// <summary> | ||
53 | /// Returns a region by argument | ||
54 | /// </summary> | ||
55 | /// <param name="uuid">A UUID key of the region to return</param> | ||
56 | /// <returns>A SimProfileData for the region</returns> | ||
57 | public SimProfileData getRegion(libsecondlife.LLUUID uuid) | ||
58 | { | ||
59 | foreach(KeyValuePair<string,IGridData> kvp in _plugins) { | ||
60 | try | ||
61 | { | ||
62 | return kvp.Value.GetProfileByLLUUID(uuid); | ||
63 | } | ||
64 | catch (Exception e) | ||
65 | { | ||
66 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); | ||
67 | } | ||
68 | } | ||
69 | return null; | ||
70 | } | ||
71 | |||
72 | /// <summary> | ||
73 | /// Returns a region by argument | ||
74 | /// </summary> | ||
75 | /// <param name="uuid">A regionHandle of the region to return</param> | ||
76 | /// <returns>A SimProfileData for the region</returns> | ||
77 | public SimProfileData getRegion(ulong handle) | ||
78 | { | ||
79 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | ||
80 | { | ||
81 | try | ||
82 | { | ||
83 | return kvp.Value.GetProfileByHandle(handle); | ||
84 | } | ||
85 | catch (Exception e) | ||
86 | { | ||
87 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); | ||
88 | } | ||
89 | } | ||
90 | return null; | ||
91 | } | ||
92 | |||
93 | public Dictionary<ulong, SimProfileData> getRegions(uint xmin, uint ymin, uint xmax, uint ymax) | ||
94 | { | ||
95 | Dictionary<ulong, SimProfileData> regions = new Dictionary<ulong, SimProfileData>(); | ||
96 | |||
97 | SimProfileData[] neighbours; | ||
98 | |||
99 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | ||
100 | { | ||
101 | try | ||
102 | { | ||
103 | neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax); | ||
104 | foreach (SimProfileData neighbour in neighbours) | ||
105 | { | ||
106 | regions[neighbour.regionHandle] = neighbour; | ||
107 | } | ||
108 | } | ||
109 | catch (Exception e) | ||
110 | { | ||
111 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: Unable to query regionblock via " + kvp.Key); | ||
112 | } | ||
113 | } | ||
114 | |||
115 | return regions; | ||
116 | } | ||
117 | |||
118 | /// <summary> | ||
119 | /// Returns a XML String containing a list of the neighbouring regions | ||
120 | /// </summary> | ||
121 | /// <param name="reqhandle">The regionhandle for the center sim</param> | ||
122 | /// <returns>An XML string containing neighbour entities</returns> | ||
123 | public string GetXMLNeighbours(ulong reqhandle) | ||
124 | { | ||
125 | string response = ""; | ||
126 | SimProfileData central_region = getRegion(reqhandle); | ||
127 | SimProfileData neighbour; | ||
128 | for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++) | ||
129 | { | ||
130 | if (getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256)) != null) | ||
131 | { | ||
132 | neighbour = getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256)); | ||
133 | response += "<neighbour>"; | ||
134 | response += "<sim_ip>" + neighbour.serverIP + "</sim_ip>"; | ||
135 | response += "<sim_port>" + neighbour.serverPort.ToString() + "</sim_port>"; | ||
136 | response += "<locx>" + neighbour.regionLocX.ToString() + "</locx>"; | ||
137 | response += "<locy>" + neighbour.regionLocY.ToString() + "</locy>"; | ||
138 | response += "<regionhandle>" + neighbour.regionHandle.ToString() + "</regionhandle>"; | ||
139 | response += "</neighbour>"; | ||
140 | |||
141 | } | ||
142 | } | ||
143 | return response; | ||
144 | } | ||
145 | |||
146 | /// <summary> | ||
147 | /// Performed when a region connects to the grid server initially. | ||
148 | /// </summary> | ||
149 | /// <param name="request">The XMLRPC Request</param> | ||
150 | /// <returns>Startup parameters</returns> | ||
151 | public XmlRpcResponse XmlRpcLoginToSimulatorMethod(XmlRpcRequest request) | ||
152 | { | ||
153 | XmlRpcResponse response = new XmlRpcResponse(); | ||
154 | Hashtable responseData = new Hashtable(); | ||
155 | response.Value = responseData; | ||
156 | |||
157 | SimProfileData TheSim = null; | ||
158 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
159 | |||
160 | if (requestData.ContainsKey("UUID")) | ||
161 | { | ||
162 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); | ||
163 | } | ||
164 | else if (requestData.ContainsKey("region_handle")) | ||
165 | { | ||
166 | TheSim = getRegion((ulong)Convert.ToUInt64(requestData["region_handle"])); | ||
167 | } | ||
168 | |||
169 | if (TheSim == null) | ||
170 | { | ||
171 | responseData["error"] = "sim not found"; | ||
172 | } | ||
173 | else | ||
174 | { | ||
175 | |||
176 | ArrayList SimNeighboursData = new ArrayList(); | ||
177 | |||
178 | SimProfileData neighbour; | ||
179 | Hashtable NeighbourBlock; | ||
180 | |||
181 | bool fastMode = false; // Only compatible with MySQL right now | ||
182 | |||
183 | if (fastMode) | ||
184 | { | ||
185 | Dictionary<ulong, SimProfileData> neighbours = getRegions(TheSim.regionLocX - 1, TheSim.regionLocY - 1, TheSim.regionLocX + 1, TheSim.regionLocY + 1); | ||
186 | |||
187 | foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) | ||
188 | { | ||
189 | NeighbourBlock = new Hashtable(); | ||
190 | NeighbourBlock["sim_ip"] = aSim.Value.serverIP.ToString(); | ||
191 | NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString(); | ||
192 | NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); | ||
193 | NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); | ||
194 | NeighbourBlock["UUID"] = aSim.Value.UUID.ToString(); | ||
195 | |||
196 | if (aSim.Value.UUID != TheSim.UUID) | ||
197 | SimNeighboursData.Add(NeighbourBlock); | ||
198 | } | ||
199 | } | ||
200 | else | ||
201 | { | ||
202 | for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++) | ||
203 | { | ||
204 | if (getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256)) != null) | ||
205 | { | ||
206 | neighbour = getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256)); | ||
207 | |||
208 | NeighbourBlock = new Hashtable(); | ||
209 | NeighbourBlock["sim_ip"] = neighbour.serverIP; | ||
210 | NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); | ||
211 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); | ||
212 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); | ||
213 | NeighbourBlock["UUID"] = neighbour.UUID.ToString(); | ||
214 | |||
215 | if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock); | ||
216 | } | ||
217 | } | ||
218 | } | ||
219 | |||
220 | responseData["UUID"] = TheSim.UUID.ToString(); | ||
221 | responseData["region_locx"] = TheSim.regionLocX.ToString(); | ||
222 | responseData["region_locy"] = TheSim.regionLocY.ToString(); | ||
223 | responseData["regionname"] = TheSim.regionName; | ||
224 | responseData["estate_id"] = "1"; | ||
225 | responseData["neighbours"] = SimNeighboursData; | ||
226 | |||
227 | responseData["sim_ip"] = TheSim.serverIP; | ||
228 | responseData["sim_port"] = TheSim.serverPort.ToString(); | ||
229 | responseData["asset_url"] = TheSim.regionAssetURI; | ||
230 | responseData["asset_sendkey"] = TheSim.regionAssetSendKey; | ||
231 | responseData["asset_recvkey"] = TheSim.regionAssetRecvKey; | ||
232 | responseData["user_url"] = TheSim.regionUserURI; | ||
233 | responseData["user_sendkey"] = TheSim.regionUserSendKey; | ||
234 | responseData["user_recvkey"] = TheSim.regionUserRecvKey; | ||
235 | responseData["authkey"] = TheSim.regionSecret; | ||
236 | |||
237 | // New! If set, use as URL to local sim storage (ie http://remotehost/region.yap) | ||
238 | responseData["data_uri"] = TheSim.regionDataURI; | ||
239 | } | ||
240 | |||
241 | return response; | ||
242 | } | ||
243 | |||
244 | public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request) | ||
245 | { | ||
246 | int xmin=980, ymin=980, xmax=1020, ymax=1020; | ||
247 | |||
248 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
249 | if (requestData.ContainsKey("xmin")) | ||
250 | { | ||
251 | xmin = (Int32)requestData["xmin"]; | ||
252 | } | ||
253 | if (requestData.ContainsKey("ymin")) | ||
254 | { | ||
255 | ymin = (Int32)requestData["ymin"]; | ||
256 | } | ||
257 | if (requestData.ContainsKey("xmax")) | ||
258 | { | ||
259 | xmax = (Int32)requestData["xmax"]; | ||
260 | } | ||
261 | if (requestData.ContainsKey("ymax")) | ||
262 | { | ||
263 | ymax = (Int32)requestData["ymax"]; | ||
264 | } | ||
265 | |||
266 | XmlRpcResponse response = new XmlRpcResponse(); | ||
267 | Hashtable responseData = new Hashtable(); | ||
268 | response.Value = responseData; | ||
269 | IList simProfileList = new ArrayList(); | ||
270 | |||
271 | SimProfileData simProfile; | ||
272 | for (int x = xmin; x < xmax; x++) | ||
273 | { | ||
274 | for (int y = ymin; y < ymax; y++) | ||
275 | { | ||
276 | simProfile = getRegion(Helpers.UIntsToLong((uint)(x * 256), (uint)(y * 256))); | ||
277 | if (simProfile != null) | ||
278 | { | ||
279 | Hashtable simProfileBlock = new Hashtable(); | ||
280 | simProfileBlock["x"] = x; | ||
281 | simProfileBlock["y"] = y; | ||
282 | simProfileBlock["name"] = simProfile.regionName; | ||
283 | simProfileBlock["access"] = 0; | ||
284 | simProfileBlock["region-flags"] = 0; | ||
285 | simProfileBlock["water-height"] = 20; | ||
286 | simProfileBlock["agents"] = 1; | ||
287 | simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString(); | ||
288 | |||
289 | simProfileList.Add(simProfileBlock); | ||
290 | } | ||
291 | } | ||
292 | } | ||
293 | |||
294 | responseData["sim-profiles"] = simProfileList; | ||
295 | |||
296 | return response; | ||
297 | } | ||
298 | |||
299 | |||
300 | |||
301 | /// <summary> | ||
302 | /// Performs a REST Get Operation | ||
303 | /// </summary> | ||
304 | /// <param name="request"></param> | ||
305 | /// <param name="path"></param> | ||
306 | /// <param name="param"></param> | ||
307 | /// <returns></returns> | ||
308 | public string RestGetRegionMethod(string request, string path, string param) | ||
309 | { | ||
310 | return RestGetSimMethod("", "/sims/", param); | ||
311 | } | ||
312 | |||
313 | /// <summary> | ||
314 | /// Performs a REST Set Operation | ||
315 | /// </summary> | ||
316 | /// <param name="request"></param> | ||
317 | /// <param name="path"></param> | ||
318 | /// <param name="param"></param> | ||
319 | /// <returns></returns> | ||
320 | public string RestSetRegionMethod(string request, string path, string param) | ||
321 | { | ||
322 | return RestSetSimMethod("", "/sims/", param); | ||
323 | } | ||
324 | |||
325 | /// <summary> | ||
326 | /// Returns information about a sim via a REST Request | ||
327 | /// </summary> | ||
328 | /// <param name="request"></param> | ||
329 | /// <param name="path"></param> | ||
330 | /// <param name="param"></param> | ||
331 | /// <returns>Information about the sim in XML</returns> | ||
332 | public string RestGetSimMethod(string request, string path, string param) | ||
333 | { | ||
334 | string respstring = String.Empty; | ||
335 | |||
336 | SimProfileData TheSim; | ||
337 | LLUUID UUID = new LLUUID(param); | ||
338 | TheSim = getRegion(UUID); | ||
339 | |||
340 | if (!(TheSim == null)) | ||
341 | { | ||
342 | respstring = "<Root>"; | ||
343 | respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>"; | ||
344 | respstring += "<sim>"; | ||
345 | respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; | ||
346 | respstring += "<regionname>" + TheSim.regionName + "</regionname>"; | ||
347 | respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>"; | ||
348 | respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; | ||
349 | respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; | ||
350 | respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; | ||
351 | respstring += "<estate_id>1</estate_id>"; | ||
352 | respstring += "</sim>"; | ||
353 | respstring += "</Root>"; | ||
354 | } | ||
355 | |||
356 | return respstring; | ||
357 | } | ||
358 | |||
359 | /// <summary> | ||
360 | /// Creates or updates a sim via a REST Method Request | ||
361 | /// BROKEN with SQL Update | ||
362 | /// </summary> | ||
363 | /// <param name="request"></param> | ||
364 | /// <param name="path"></param> | ||
365 | /// <param name="param"></param> | ||
366 | /// <returns>"OK" or an error</returns> | ||
367 | public string RestSetSimMethod(string request, string path, string param) | ||
368 | { | ||
369 | Console.WriteLine("SimProfiles.cs:RestSetSimMethod() - processing request......"); | ||
370 | SimProfileData TheSim; | ||
371 | TheSim = getRegion(new LLUUID(param)); | ||
372 | if ((TheSim) == null) | ||
373 | { | ||
374 | TheSim = new SimProfileData(); | ||
375 | LLUUID UUID = new LLUUID(param); | ||
376 | TheSim.UUID = UUID; | ||
377 | TheSim.regionRecvKey = config.SimRecvKey; | ||
378 | } | ||
379 | |||
380 | XmlDocument doc = new XmlDocument(); | ||
381 | doc.LoadXml(request); | ||
382 | XmlNode rootnode = doc.FirstChild; | ||
383 | XmlNode authkeynode = rootnode.ChildNodes[0]; | ||
384 | if (authkeynode.Name != "authkey") | ||
385 | { | ||
386 | return "ERROR! bad XML - expected authkey tag"; | ||
387 | } | ||
388 | |||
389 | XmlNode simnode = rootnode.ChildNodes[1]; | ||
390 | if (simnode.Name != "sim") | ||
391 | { | ||
392 | return "ERROR! bad XML - expected sim tag"; | ||
393 | } | ||
394 | |||
395 | if (authkeynode.InnerText != TheSim.regionRecvKey) | ||
396 | { | ||
397 | return "ERROR! invalid key"; | ||
398 | } | ||
399 | |||
400 | //TheSim.regionSendKey = Cfg; | ||
401 | TheSim.regionRecvKey = config.SimRecvKey; | ||
402 | TheSim.regionSendKey = config.SimSendKey; | ||
403 | TheSim.regionSecret = config.SimRecvKey; | ||
404 | TheSim.regionDataURI = ""; | ||
405 | TheSim.regionAssetURI = config.DefaultAssetServer; | ||
406 | TheSim.regionAssetRecvKey = config.AssetRecvKey; | ||
407 | TheSim.regionAssetSendKey = config.AssetSendKey; | ||
408 | TheSim.regionUserURI = config.DefaultUserServer; | ||
409 | TheSim.regionUserSendKey = config.UserSendKey; | ||
410 | TheSim.regionUserRecvKey = config.UserRecvKey; | ||
411 | |||
412 | |||
413 | for (int i = 0; i < simnode.ChildNodes.Count; i++) | ||
414 | { | ||
415 | switch (simnode.ChildNodes[i].Name) | ||
416 | { | ||
417 | case "regionname": | ||
418 | TheSim.regionName = simnode.ChildNodes[i].InnerText; | ||
419 | break; | ||
420 | |||
421 | case "sim_ip": | ||
422 | TheSim.serverIP = simnode.ChildNodes[i].InnerText; | ||
423 | break; | ||
424 | |||
425 | case "sim_port": | ||
426 | TheSim.serverPort = Convert.ToUInt32(simnode.ChildNodes[i].InnerText); | ||
427 | break; | ||
428 | |||
429 | case "region_locx": | ||
430 | TheSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); | ||
431 | TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); | ||
432 | break; | ||
433 | |||
434 | case "region_locy": | ||
435 | TheSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); | ||
436 | TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); | ||
437 | break; | ||
438 | } | ||
439 | } | ||
440 | |||
441 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; | ||
442 | |||
443 | bool requirePublic = false; | ||
444 | |||
445 | if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255."))) | ||
446 | { | ||
447 | return "ERROR! Servers must register with public addresses."; | ||
448 | } | ||
449 | |||
450 | try | ||
451 | { | ||
452 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Attempting to add a new region to the grid - " + _plugins.Count + " storage provider(s) registered."); | ||
453 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | ||
454 | { | ||
455 | try | ||
456 | { | ||
457 | kvp.Value.AddProfile(TheSim); | ||
458 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"New sim added to grid (" + TheSim.regionName + ")"); | ||
459 | } | ||
460 | catch (Exception e) | ||
461 | { | ||
462 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); | ||
463 | } | ||
464 | } | ||
465 | return "OK"; | ||
466 | } | ||
467 | catch (Exception e) | ||
468 | { | ||
469 | return "ERROR! Could not save to database! (" + e.ToString() + ")"; | ||
470 | } | ||
471 | } | ||
472 | |||
473 | } | ||
474 | } | ||
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs deleted file mode 100644 index 8baf293..0000000 --- a/OpenGridServices/OpenGridServices.GridServer/Main.cs +++ /dev/null | |||
@@ -1,272 +0,0 @@ | |||
1 | /* | ||
2 | Copyright (c) OpenSim project, http://osgrid.org/ | ||
3 | |||
4 | |||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions are met: | ||
9 | * * Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * * Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * * Neither the name of the <organization> nor the | ||
15 | * names of its contributors may be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY | ||
19 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
20 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
21 | * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY | ||
22 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
24 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
25 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | |||
30 | using System; | ||
31 | using System.IO; | ||
32 | using System.Text; | ||
33 | using System.Timers; | ||
34 | using System.Net; | ||
35 | using System.Threading; | ||
36 | using System.Reflection; | ||
37 | using libsecondlife; | ||
38 | using OpenGrid.Framework.Manager; | ||
39 | using OpenSim.Framework; | ||
40 | using OpenSim.Framework.Sims; | ||
41 | using OpenSim.Framework.Console; | ||
42 | using OpenSim.Framework.Interfaces; | ||
43 | using OpenSim.Servers; | ||
44 | using OpenSim.GenericConfig; | ||
45 | |||
46 | namespace OpenGridServices.GridServer | ||
47 | { | ||
48 | /// <summary> | ||
49 | /// </summary> | ||
50 | public class OpenGrid_Main : BaseServer, conscmd_callback | ||
51 | { | ||
52 | private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; | ||
53 | private string GridDll = "OpenGrid.Framework.Data.DB4o.dll"; | ||
54 | public GridConfig Cfg; | ||
55 | |||
56 | public static OpenGrid_Main thegrid; | ||
57 | protected IGenericConfig localXMLConfig; | ||
58 | |||
59 | public static bool setuponly; | ||
60 | |||
61 | //public LLUUID highestUUID; | ||
62 | |||
63 | // private SimProfileManager m_simProfileManager; | ||
64 | |||
65 | private GridManager m_gridManager; | ||
66 | |||
67 | private ConsoleBase m_console; | ||
68 | |||
69 | [STAThread] | ||
70 | public static void Main(string[] args) | ||
71 | { | ||
72 | if (args.Length > 0) | ||
73 | { | ||
74 | if (args[0] == "-setuponly") setuponly = true; | ||
75 | } | ||
76 | Console.WriteLine("Starting...\n"); | ||
77 | |||
78 | thegrid = new OpenGrid_Main(); | ||
79 | thegrid.Startup(); | ||
80 | |||
81 | thegrid.Work(); | ||
82 | } | ||
83 | |||
84 | private void Work() | ||
85 | { | ||
86 | while (true) | ||
87 | { | ||
88 | Thread.Sleep(5000); | ||
89 | // should flush the DB etc here | ||
90 | } | ||
91 | } | ||
92 | |||
93 | private OpenGrid_Main() | ||
94 | { | ||
95 | m_console = new ConsoleBase("opengrid-gridserver-console.log", "OpenGrid", this, false); | ||
96 | MainConsole.Instance = m_console; | ||
97 | |||
98 | |||
99 | } | ||
100 | |||
101 | public void managercallback(string cmd) | ||
102 | { | ||
103 | switch (cmd) | ||
104 | { | ||
105 | case "shutdown": | ||
106 | RunCmd("shutdown", new string[0]); | ||
107 | break; | ||
108 | } | ||
109 | } | ||
110 | |||
111 | |||
112 | public void Startup() | ||
113 | { | ||
114 | this.localXMLConfig = new XmlConfig("GridServerConfig.xml"); | ||
115 | this.localXMLConfig.LoadData(); | ||
116 | this.ConfigDB(this.localXMLConfig); | ||
117 | this.localXMLConfig.Close(); | ||
118 | |||
119 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration"); | ||
120 | Cfg = this.LoadConfigDll(this.ConfigDll); | ||
121 | Cfg.InitConfig(); | ||
122 | if (setuponly) Environment.Exit(0); | ||
123 | |||
124 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Connecting to Storage Server"); | ||
125 | m_gridManager = new GridManager(); | ||
126 | m_gridManager.AddPlugin(GridDll); // Made of win | ||
127 | m_gridManager.config = Cfg; | ||
128 | |||
129 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process"); | ||
130 | BaseHttpServer httpServer = new BaseHttpServer(8001); | ||
131 | GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); | ||
132 | |||
133 | httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod); | ||
134 | httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod); | ||
135 | |||
136 | httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod); | ||
137 | httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod); | ||
138 | httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod); | ||
139 | httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod); | ||
140 | |||
141 | |||
142 | // lbsa71 : This code snippet taken from old http server. | ||
143 | // I have no idea what this was supposed to do - looks like an infinite recursion to me. | ||
144 | // case "regions": | ||
145 | //// DIRTY HACK ALERT | ||
146 | //Console.WriteLine("/regions/ accessed"); | ||
147 | //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1])); | ||
148 | //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod); | ||
149 | //break; | ||
150 | |||
151 | // lbsa71 : I guess these were never used? | ||
152 | //Listener.Prefixes.Add("http://+:8001/gods/"); | ||
153 | //Listener.Prefixes.Add("http://+:8001/highestuuid/"); | ||
154 | //Listener.Prefixes.Add("http://+:8001/uuidblocks/"); | ||
155 | |||
156 | httpServer.Start(); | ||
157 | |||
158 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting sim status checker"); | ||
159 | |||
160 | System.Timers.Timer simCheckTimer = new System.Timers.Timer(300000); // 5 minutes | ||
161 | simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); | ||
162 | simCheckTimer.Enabled = true; | ||
163 | } | ||
164 | |||
165 | private GridConfig LoadConfigDll(string dllName) | ||
166 | { | ||
167 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | ||
168 | GridConfig config = null; | ||
169 | |||
170 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
171 | { | ||
172 | if (pluginType.IsPublic) | ||
173 | { | ||
174 | if (!pluginType.IsAbstract) | ||
175 | { | ||
176 | Type typeInterface = pluginType.GetInterface("IGridConfig", true); | ||
177 | |||
178 | if (typeInterface != null) | ||
179 | { | ||
180 | IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
181 | config = plug.GetConfigObject(); | ||
182 | break; | ||
183 | } | ||
184 | |||
185 | typeInterface = null; | ||
186 | } | ||
187 | } | ||
188 | } | ||
189 | pluginAssembly = null; | ||
190 | return config; | ||
191 | } | ||
192 | |||
193 | public void CheckSims(object sender, ElapsedEventArgs e) | ||
194 | { | ||
195 | /* | ||
196 | foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) | ||
197 | { | ||
198 | string SimResponse = ""; | ||
199 | try | ||
200 | { | ||
201 | WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); | ||
202 | CheckSim.Method = "GET"; | ||
203 | CheckSim.ContentType = "text/plaintext"; | ||
204 | CheckSim.ContentLength = 0; | ||
205 | |||
206 | StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); | ||
207 | stOut.Write(""); | ||
208 | stOut.Close(); | ||
209 | |||
210 | StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); | ||
211 | SimResponse = stIn.ReadToEnd(); | ||
212 | stIn.Close(); | ||
213 | } | ||
214 | catch | ||
215 | { | ||
216 | } | ||
217 | |||
218 | if (SimResponse == "OK") | ||
219 | { | ||
220 | m_simProfileManager.SimProfiles[sim.UUID].online = true; | ||
221 | } | ||
222 | else | ||
223 | { | ||
224 | m_simProfileManager.SimProfiles[sim.UUID].online = false; | ||
225 | } | ||
226 | } | ||
227 | */ | ||
228 | } | ||
229 | |||
230 | public void RunCmd(string cmd, string[] cmdparams) | ||
231 | { | ||
232 | switch (cmd) | ||
233 | { | ||
234 | case "help": | ||
235 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown the grid (USE CAUTION!)"); | ||
236 | break; | ||
237 | |||
238 | case "shutdown": | ||
239 | m_console.Close(); | ||
240 | Environment.Exit(0); | ||
241 | break; | ||
242 | } | ||
243 | } | ||
244 | |||
245 | public void Show(string ShowWhat) | ||
246 | { | ||
247 | } | ||
248 | |||
249 | private void ConfigDB(IGenericConfig configData) | ||
250 | { | ||
251 | try | ||
252 | { | ||
253 | string attri = ""; | ||
254 | attri = configData.GetAttribute("DataBaseProvider"); | ||
255 | if (attri == "") | ||
256 | { | ||
257 | GridDll = "OpenGrid.Framework.Data.DB4o.dll"; | ||
258 | configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll"); | ||
259 | } | ||
260 | else | ||
261 | { | ||
262 | GridDll = attri; | ||
263 | } | ||
264 | configData.Commit(); | ||
265 | } | ||
266 | catch (Exception e) | ||
267 | { | ||
268 | |||
269 | } | ||
270 | } | ||
271 | } | ||
272 | } | ||
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj deleted file mode 100644 index f4a6ca1..0000000 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ /dev/null | |||
@@ -1,134 +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>{21BFC8E2-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>OpenGridServices.GridServer</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
17 | <OutputType>Exe</OutputType> | ||
18 | <AppDesignerFolder></AppDesignerFolder> | ||
19 | <RootNamespace>OpenGridServices.GridServer</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="System" > | ||
62 | <HintPath>System.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System.Data" > | ||
66 | <HintPath>System.Data.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System.Xml" > | ||
70 | <HintPath>System.Xml.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="OpenSim.Framework" > | ||
74 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="OpenSim.Framework.Console" > | ||
78 | <HintPath>OpenSim.Framework.Console.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | <Reference Include="OpenSim.Servers" > | ||
82 | <HintPath>OpenSim.Servers.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
85 | <Reference Include="OpenSim.GenericConfig.Xml" > | ||
86 | <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath> | ||
87 | <Private>False</Private> | ||
88 | </Reference> | ||
89 | <Reference Include="libsecondlife.dll" > | ||
90 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | ||
91 | <Private>False</Private> | ||
92 | </Reference> | ||
93 | <Reference Include="Db4objects.Db4o.dll" > | ||
94 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | ||
95 | <Private>False</Private> | ||
96 | </Reference> | ||
97 | <Reference Include="XMLRPC" > | ||
98 | <HintPath>XMLRPC.dll</HintPath> | ||
99 | <Private>False</Private> | ||
100 | </Reference> | ||
101 | </ItemGroup> | ||
102 | <ItemGroup> | ||
103 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | ||
104 | <Name>OpenGrid.Framework.Data</Name> | ||
105 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | ||
106 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
107 | <Private>False</Private> | ||
108 | </ProjectReference> | ||
109 | <ProjectReference Include="..\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj"> | ||
110 | <Name>OpenGrid.Framework.Manager</Name> | ||
111 | <Project>{7924FD35-0000-0000-0000-000000000000}</Project> | ||
112 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
113 | <Private>False</Private> | ||
114 | </ProjectReference> | ||
115 | </ItemGroup> | ||
116 | <ItemGroup> | ||
117 | <Compile Include="GridManager.cs"> | ||
118 | <SubType>Code</SubType> | ||
119 | </Compile> | ||
120 | <Compile Include="Main.cs"> | ||
121 | <SubType>Code</SubType> | ||
122 | </Compile> | ||
123 | <Compile Include="Properties\AssemblyInfo.cs"> | ||
124 | <SubType>Code</SubType> | ||
125 | </Compile> | ||
126 | </ItemGroup> | ||
127 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
128 | <PropertyGroup> | ||
129 | <PreBuildEvent> | ||
130 | </PreBuildEvent> | ||
131 | <PostBuildEvent> | ||
132 | </PostBuildEvent> | ||
133 | </PropertyGroup> | ||
134 | </Project> | ||
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user deleted file mode 100644 index 9bfaf67..0000000 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> | ||
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | ||
7 | <ProjectView>ProjectFiles</ProjectView> | ||
8 | <ProjectTrust>0</ProjectTrust> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> | ||
11 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> | ||
12 | </Project> | ||
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build deleted file mode 100644 index 9d21edd..0000000 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenGridServices.GridServer" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | ||
11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="GridManager.cs" /> | ||
15 | <include name="Main.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="System.dll" /> | ||
24 | <include name="System.Data.dll" /> | ||
25 | <include name="System.Xml.dll" /> | ||
26 | <include name="../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | ||
28 | <include name="../../bin/OpenSim.Servers.dll" /> | ||
29 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | ||
30 | <include name="../../bin/OpenGrid.Framework.Manager.dll" /> | ||
31 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | ||
32 | <include name="../../bin/libsecondlife.dll" /> | ||
33 | <include name="../../bin/Db4objects.Db4o.dll" /> | ||
34 | <include name="../../bin/XMLRPC.dll" /> | ||
35 | </references> | ||
36 | </csc> | ||
37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | ||
38 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | ||
39 | <copy todir="${project::get-base-directory()}/../../bin/"> | ||
40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
41 | <include name="*.dll"/> | ||
42 | <include name="*.exe"/> | ||
43 | </fileset> | ||
44 | </copy> | ||
45 | </target> | ||
46 | <target name="clean"> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | </target> | ||
50 | <target name="doc" description="Creates documentation."> | ||
51 | </target> | ||
52 | </project> | ||
diff --git a/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs deleted file mode 100644 index 8471e6b..0000000 --- a/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,33 +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("OGS-GridServer")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("OGS-GridServer")] | ||
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("b541b244-3d1d-4625-9003-bc2a3a6a39a4")] | ||
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 | [assembly: AssemblyVersion("1.0.0.0")] | ||
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||