Another rebuild of the build files! :O

More XML config stuff in ServiceManager

4 files changed, 20 insertions, 8 deletions

diff --git a/OpenGridServices/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs
index 2491f39..1de9475 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.cs
+++ b/OpenGridServices/ServiceManager/ServiceManager.cs
@@ -5,16 +5,17 @@ using System.ServiceProcess;
 using System.Xml;
 using System.IO;
 using libsecondlife;
+using OpenSim.GenericConfig;
 
 public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
 
         private Thread ServiceWorkerThread;
-        private static string GridURL;
-        private static string SimSendKey;
-        private static string SimRecvKey;
-        private static string AssetURL;
-        private static string UserSendKey;
-        private static string UserRecvKey;
+        private static string GridURL;          // URL of grid server
+        private static string GridSimKey;       // key sent from Grid>Sim
+        private static string SimGridKey;       // key sent Sim>Grid
+        private static string AssetURL;         // URL of asset server
+        private static string UserSendKey;      // key sent from user>sim
+        private static string UserRecvKey;      // key sent from sim>user
 
         public OpenGridMasterService()
         {
@@ -83,8 +84,13 @@ public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
                         p.StartInfo.Arguments = "-dumpxmlconf";
                         p.Start();
 
-                        StreamReader reader=new  StreamReader("opengrid-cfgdump.xml");
-                        string configxml = reader.ReadToEnd();
+                        XmlConfig GridConf = new XmlConfig("opengrid-cfg.xml");
+                        GridConf.LoadData();
+                        GridURL="http://" + GridConf.GetAttribute("ListenAddr") + ":" + GridConf.GetAttribute("ListenPort") + "/";
+
+                        StreamReader reader=new  StreamReader("opengrid-cfg.xml");
+                        string configxml = reader.ReadToEnd();
+        
                         return configxml;
                 } catch(Exception e) {
                         Console.WriteLine("An error occurred while running the grid server, please rectify it and try again");
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
index a35e2c1..8d6a135 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ b/OpenGridServices/ServiceManager/ServiceManager.csproj
@@ -74,6 +74,10 @@
       <HintPath>..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.GenericConfig.Xml" >
+      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
index e62e204..f88a01a 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build
@@ -22,6 +22,7 @@
                 <include name="System.ServiceProcess.dll" />
                 <include name="System.Xml.dll" />
                 <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/prebuild.xml b/prebuild.xml
index fd50e5e..1253a08 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -675,6 +675,7 @@
      <Reference name="System.ServiceProcess" localCopy="false"/>

      <Reference name="System.Xml" localCopy="false"/>

      <Reference name="libsecondlife.dll"/>

+     <Reference name="OpenSim.GenericConfig.Xml"/>

 

      <Files>

        <Match pattern="*.cs" recurse="true"/>