From: Alan Webb <awebb@linux.vnet.ibm.com>

The change makes two principal implementation changes:

[1] It removes the hard coded set of possible asset server client
implementations, allowing any arbitrary implementation that has been
identified to the PluginLoader as an appropriate extension. The
extension point for asset server client extension
is /OpenSim/AssetServerClient. All of the old configuration rules have
been preserved, and any of the legacy configuration values will still
work as they did before, except the implementation is now loaded as a
plug-in, rather than as a hard-coded instantiation of a specific class.
The re-hashing of IAssetServer as an extension of IPlugin made upgrading
of the implementation classes a necessity.

Caveat: I have not been able to meaningfully test the crypto-grid
clients. I believe they should work correctly, but the refactoring
necessary to handle plug-in based initialization (vs constructor-based
initialisation) admits the possibility of a problem.

[2] The asset cache implementation, previously introduce as a hard-code
class instantiation is now implemented as an IPlugin. Once again the
previous (configurationless) behavior has been preserved. But now it is
possible for those interested in experimenting with cache technologies
to do so simply by introducing a new extension for the asset cache
extension point (/OpenSim/AssetCache).

I've tested all of the configuration settings, after applying the patch
to a newly extracted tree, and they seem to work OK.

1 files changed, 58 insertions, 1 deletions

diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index d2f5ce7..0d9afe9 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
@@ -32,8 +32,11 @@ namespace OpenSim.Framework
     /// <summary>
     /// Description of IAssetServer.
     /// </summary>
-    public interface IAssetServer
+    public interface IAssetServer : IPlugin
     {
+        void Initialise(ConfigSettings settings);
+        void Initialise(ConfigSettings settings, string url, string dir, bool test);
+        void Initialise(ConfigSettings settings, string url);
         void SetReceiver(IAssetReceiver receiver);
         void RequestAsset(UUID assetID, bool isTexture);
         void StoreAsset(AssetBase asset);
@@ -62,8 +65,62 @@ namespace OpenSim.Framework
         void AssetNotFound(UUID assetID, bool IsTexture);
     }
 
+    public class AssetServerClientPluginInitialiser : PluginInitialiserBase
+    {
+        private ConfigSettings config;
+
+        public AssetServerClientPluginInitialiser (ConfigSettings p_sv)
+        {
+            config = p_sv;
+        }
+        public override void Initialise (IPlugin plugin)
+        {
+            IAssetServer p = plugin as IAssetServer;
+            p.Initialise (config);
+        }
+    }
+
+    public class LegacyAssetServerClientPluginInitialiser : PluginInitialiserBase
+    {
+        private ConfigSettings config;
+        private string assetURL;
+
+        public LegacyAssetServerClientPluginInitialiser (ConfigSettings p_sv, string p_url)
+        {
+            config   = p_sv;
+            assetURL = p_url;
+        }
+        public override void Initialise (IPlugin plugin)
+        {
+            IAssetServer p = plugin as IAssetServer;
+            p.Initialise (config, assetURL);
+        }
+    }
+
+    public class CryptoAssetServerClientPluginInitialiser : PluginInitialiserBase
+    {
+        private ConfigSettings config;
+        private string assetURL;
+        private string currdir;
+        private bool   test;
+
+        public CryptoAssetServerClientPluginInitialiser (ConfigSettings p_sv, string p_url, string p_dir, bool p_test)
+        {
+            config   = p_sv;
+            assetURL = p_url;
+            currdir  = p_dir;
+            test     = p_test;
+        }
+        public override void Initialise (IPlugin plugin)
+        {
+            IAssetServer p = plugin as IAssetServer;
+            p.Initialise (config, assetURL, currdir, test);
+        }
+    }
+
     public interface IAssetPlugin
     {
         IAssetServer GetAssetServer();
     }
+
 }