aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-11-10 18:58:28 +0000
committerJustin Clark-Casey (justincc)2009-11-10 18:58:28 +0000
commit9cb0c7c86ec48225710fee940ad5347d48634e46 (patch)
treeeee7d483035fb86fbf6741ae0188abffb641fc58
parentUpdated HGUserServices with AuthenticateUserByPassword, so that iar works. (diff)
downloadopensim-SC-9cb0c7c86ec48225710fee940ad5347d48634e46.zip
opensim-SC-9cb0c7c86ec48225710fee940ad5347d48634e46.tar.gz
opensim-SC-9cb0c7c86ec48225710fee940ad5347d48634e46.tar.bz2
opensim-SC-9cb0c7c86ec48225710fee940ad5347d48634e46.tar.xz
Stop OpenSim.Grid.GridServer.exe from building to reduce user/developer confusion, since only the ROBUST grid service now works
GridServer dll still building for now due to unresolved dependencies with the remaining OpenSim.Grid.UserServer.exe
-rw-r--r--OpenSim/Grid/GridServer/Program.cs65
-rw-r--r--prebuild.xml2
2 files changed, 1 insertions, 66 deletions
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
deleted file mode 100644
index 741a01b..0000000
--- a/OpenSim/Grid/GridServer/Program.cs
+++ /dev/null
@@ -1,65 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using log4net.Config;
29using Nini.Config;
30
31namespace OpenSim.Grid.GridServer
32{
33 public class Program
34 {
35 public static void Main(string[] args)
36 {
37 ArgvConfigSource argvSource = new ArgvConfigSource(args);
38 argvSource.AddSwitch("Startup", "console", "c");
39 argvSource.AddSwitch("Startup", "xmlfile", "x");
40
41 XmlConfigurator.Configure();
42
43 GridServerBase app = new GridServerBase();
44
45 IConfig startupConfig = argvSource.Configs["Startup"];
46 if (startupConfig != null)
47 {
48 app.m_consoleType = startupConfig.GetString("console", "local");
49 app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
50 }
51
52 app.m_configSource = argvSource;
53
54// if (args.Length > 0 && args[0] == "-setuponly")
55// {
56// app.Config();
57// }
58// else
59// {
60 app.Startup();
61 app.Work();
62// }
63 }
64 }
65}
diff --git a/prebuild.xml b/prebuild.xml
index 33cb647..b7ce93c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -909,7 +909,7 @@
909 </Files> 909 </Files>
910 </Project> 910 </Project>
911 911
912 <Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe"> 912 <Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Library">
913 <Configuration name="Debug"> 913 <Configuration name="Debug">
914 <Options> 914 <Options>
915 <OutputPath>../../../bin/</OutputPath> 915 <OutputPath>../../../bin/</OutputPath>