7 files changed, 52 insertions, 48 deletions

diff --git a/OpenSim/Framework/General/Configuration/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index e1f3816..e56c657 100644
--- a/OpenSim/Framework/General/Configuration/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -30,6 +30,7 @@ using System.IO;
 using System.Xml;

 

 using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Configuration.Interfaces;

 

 namespace OpenSim.Framework.Configuration

 {

@@ -41,9 +42,9 @@ namespace OpenSim.Framework.Configuration
         private string fileName;

         private bool createdFile = false;

 

-        public XmlConfiguration(string filename)

+        public void SetFileName(string file)

         {

-            fileName = filename;

+            fileName = file;

         }

 

         public void LoadData()

diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
index e93a576..4546683 100644
--- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
+++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs
@@ -1,4 +1,5 @@
 using System;

+using System.Reflection;

 using System.Collections;

 using System.Collections.Generic;

 using System.Text;

@@ -7,6 +8,7 @@ using System.Net;
 using libsecondlife;

 

 using OpenSim.Framework.Console;

+using OpenSim.Framework.Configuration.Interfaces;

 

 namespace OpenSim.Framework.Configuration

 {

@@ -22,12 +24,14 @@ namespace OpenSim.Framework.Configuration
         private ConfigurationOptionsLoad loadFunction;

         private ConfigurationOptionResult resultFunction;

 

+        private IGenericConfig configurationPlugin = null;

         public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)

         {

             this.configurationFilename = configuration_filename;

             this.configurationDescription = configuration_description;

             this.loadFunction = load_function;

             this.resultFunction = result_function;

+            this.configurationPlugin = this.LoadConfigDll("OpenSim.Framework.Configuration.XML.dll");

         }

 

         public void setConfigurationFilename(string filename)

@@ -91,18 +95,19 @@ namespace OpenSim.Framework.Configuration
             }

 

             bool useFile = true;

-            XmlConfiguration xmlConfig = null;

-            if (configurationFilename.Trim() != "")

+            if (configurationPlugin == null)

             {

-                xmlConfig = new XmlConfiguration(configurationFilename);

-                

+                MainLog.Instance.Error("Configuration Plugin NOT LOADED!");

+                return;

             }

 

-            if(xmlConfig != null)

+            if (configurationFilename.Trim() != "")

             {

-                xmlConfig.LoadData();

+                configurationPlugin.SetFileName(configurationFilename);

+                configurationPlugin.LoadData();

                 useFile = true;

             }

+

             else

             {

                 MainLog.Instance.Notice("XML Configuration Filename is not valid; will not save to the file.");

@@ -124,7 +129,7 @@ namespace OpenSim.Framework.Configuration
                     {

                         if (!ignoreNextFromConfig)

                         {

-                            attribute = xmlConfig.GetAttribute(configOption.configurationKey);

+                            attribute = configurationPlugin.GetAttribute(configOption.configurationKey);

                         }

                         else

                         {

@@ -304,7 +309,7 @@ namespace OpenSim.Framework.Configuration
                     {

                         if (useFile)

                         {

-                            xmlConfig.SetAttribute(configOption.configurationKey, console_result);

+                            configurationPlugin.SetAttribute(configOption.configurationKey, console_result);

                         }

 

 

@@ -333,9 +338,34 @@ namespace OpenSim.Framework.Configuration
 

             if(useFile)

             {

-                xmlConfig.Commit();

-                xmlConfig.Close();

+                configurationPlugin.Commit();

+                configurationPlugin.Close();

             }

-        }            

+        }

+

+        private IGenericConfig LoadConfigDll(string dllName)

+        {

+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);

+            IGenericConfig plug = null;

+

+            foreach (Type pluginType in pluginAssembly.GetTypes())

+            {

+                if (pluginType.IsPublic)

+                {

+                    if (!pluginType.IsAbstract)

+                    {

+                        Type typeInterface = pluginType.GetInterface("IGenericConfig", true);

+

+                        if (typeInterface != null)

+                        {

+                            plug = (IGenericConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

+                        }

+                    }

+                }

+            }

+

+            pluginAssembly = null;

+            return plug;

+        }

     }

 }

diff --git a/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs b/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs
index 2c379dd..5a5a20e 100644
--- a/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs
+++ b/OpenSim/Framework/General/Configuration/Interfaces/IGenericConfig.cs
@@ -25,10 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-namespace OpenSim.Framework.Interfaces

+namespace OpenSim.Framework.Configuration.Interfaces

 {

     public interface IGenericConfig

     {

+        void SetFileName(string fileName);

         void LoadData();

         string GetAttribute(string attributeName);

         bool SetAttribute(string attributeName, string attributeValue);

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index f29a540..5a8368c 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -291,34 +291,6 @@ namespace OpenSim.Grid.AssetServer
             //info.loaded=true;
         }
 
-        /*private GridConfig LoadConfigDll(string dllName)
-        {
-            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-            GridConfig config = null;
-
-            foreach (Type pluginType in pluginAssembly.GetTypes())
-            {
-                if (pluginType.IsPublic)
-                {
-                    if (!pluginType.IsAbstract)
-                    {
-                        Type typeInterface = pluginType.GetInterface("IGridConfig", true);
-
-                        if (typeInterface != null)
-                        {
-                            IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            config = plug.GetConfigObject();
-                            break;
-                        }
-
-                        typeInterface = null;
-                    }
-                }
-            }
-            pluginAssembly = null;
-            return config;
-        }*/
-
         public void CreateAsset(LLUUID assetId, byte[] assetData)
         {
             AssetBase asset = new AssetBase();
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 94ecbfc..c72948d 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Grid.GridServer
         {
         }
 
-        private void ConfigDB(IGenericConfig configData)
+        /*private void ConfigDB(IGenericConfig configData)
         {
             try
             {
@@ -218,6 +218,6 @@ namespace OpenSim.Grid.GridServer
             {
 
             }
-        }
+        }*/
     }
 }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index da53e11..99401fc 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.UserServer
             }
         }
 
-        private void ConfigDB(IGenericConfig configData)
+        /*private void ConfigDB(IGenericConfig configData)
         {
             try
             {
@@ -168,7 +168,7 @@ namespace OpenSim.Grid.UserServer
             {
 
             }
-        }
+        }*/
 
         public void Show(string ShowWhat)
         {
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 8a1e0f1..3c11b90 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -197,7 +197,7 @@ namespace OpenSim
 
         #endregion
 
-        private void SetupFromConfigFile(IGenericConfig configData)
+        /*private void SetupFromConfigFile(IGenericConfig configData)
         {
             // Log filename
             string attri = "";
@@ -295,7 +295,7 @@ namespace OpenSim
 
             configData.Commit();
 
-        }
+        }*/
 
         /// <summary>
         /// Performs any last-minute sanity checking and shuts down the region server