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, 21 insertions, 1 deletions

diff --git a/OpenSim/Framework/IAssetCache.cs b/OpenSim/Framework/IAssetCache.cs
index b90dffc..22f5755 100644
--- a/OpenSim/Framework/IAssetCache.cs
+++ b/OpenSim/Framework/IAssetCache.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
 
     public delegate void AssetRequestCallback(UUID assetId, AssetBase asset);
 
-    public interface IAssetCache : IAssetReceiver
+    public interface IAssetCache : IAssetReceiver, IPlugin
     {
 
         IAssetServer AssetServer { get; }
@@ -47,5 +47,25 @@ namespace OpenSim.Framework
         void ExpireAsset(UUID assetID);
         void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest);
 
+        void Initialise(ConfigSettings cs, IAssetServer server);
+
+    }
+
+    public class AssetCachePluginInitialiser : PluginInitialiserBase
+    {
+        private ConfigSettings config;
+        private IAssetServer   server;
+
+        public AssetCachePluginInitialiser (ConfigSettings p_sv, IAssetServer p_as)
+        {
+            config = p_sv;
+            server = p_as;
+        }
+        public override void Initialise (IPlugin plugin)
+        {
+            IAssetCache p = plugin as IAssetCache;
+            p.Initialise (config, server);
+        }
     }
+
 }