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, 55 insertions, 0 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 5c902ec..7bb2ab9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -46,6 +46,61 @@ namespace OpenSim.Framework.Communications.Cache
         protected Thread m_localAssetServerThread;
         protected IAssetDataPlugin m_assetProvider;
 
+        #region IPlugin
+ 
+        /// <summary> 
+        /// The methods and properties in this region are needed to implement
+        /// the IPlugin interface and its local extensions.
+        /// These can all be overridden as appropriate by a derived class.
+        /// These methods are only applicable when a class is loaded by the
+        /// IPlugin mechanism.
+        ///
+        /// Note that in the case of AssetServerBase, all initialization is
+        /// performed by the default constructor, so nothing additional is
+        /// required here. A derived class may wish to do more.
+        /// </summary>
+
+        public virtual string Name
+        {
+            // get { return "OpenSim.Framework.Communications.Cache.AssetServerBase"; }
+            get { return "AssetServerBase"; }
+        }
+
+        public virtual string Version
+        {
+            get { return "1.0"; }
+        }
+
+        public virtual void Initialise()
+        {
+            m_log.Debug("[ASSET SERVER]: IPlugin null initialization");
+        }
+
+        public virtual void Initialise(ConfigSettings settings)
+        {
+            m_log.Debug("[ASSET SERVER]: IPlugin null configured initialization(1)");
+            m_log.InfoFormat("[ASSET SERVER]: Initializing client [{0}/{1}", Name, Version);
+        }
+
+        public virtual void Initialise(ConfigSettings settings, string p_url)
+        {
+            m_log.Debug("[ASSET SERVER]: IPlugin null configured initialization(2)");
+            m_log.InfoFormat("[ASSET SERVER]: Initializing client [{0}/{1}", Name, Version);
+        }
+
+        public virtual void Initialise(ConfigSettings settings, string p_url, string p_dir, bool p_t)
+        {
+            m_log.Debug("[ASSET SERVER]: IPlugin null configured initialization(3)");
+            m_log.InfoFormat("[ASSET SERVER]: Initializing client [{0}/{1}", Name, Version);
+        }
+
+        public virtual void Dispose()
+        {
+            m_log.Debug("[ASSET SERVER]: dispose");
+        }
+
+        #endregion
+
         public IAssetDataPlugin AssetProviderPlugin
         {
             get { return m_assetProvider; }