From 894f3045ed970cadcd421df2c3927f3e4160e91f Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Tue, 19 Aug 2008 09:24:12 +0000
Subject: Convert LoadBalancer and RegionProxy plugins to use XML manifests.
 Fixes "Plugin Error: Node 'Type' not allowed" messages during region server
 startup.

---
 ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs          | 14 ++++----------
 .../3Di/LoadBalancer/Resources/LoadBalancer.addin.xml      | 12 ++++++++++++
 ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs            | 10 +++-------
 ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml | 11 +++++++++++
 prebuild.xml                                               |  2 ++
 5 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 ThirdParty/3Di/LoadBalancer/Resources/LoadBalancer.addin.xml
 create mode 100644 ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml

diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 0d50f0e..cc0f2f5 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -45,14 +45,8 @@ using OpenSim.Region.Environment.Scenes;
 
 // TODO: remove LindenUDP dependency
 
-[assembly : Addin]
-[assembly : AddinDependency("OpenSim", "0.5")]
-[assembly : AddinDependency("RegionProxy", "0.1")]
-
 namespace OpenSim.ApplicationPlugins.LoadBalancer
 {
-    [Extension("/OpenSim/Startup")]
-    [ExtensionNode ("Plugin")]
     public class LoadBalancerPlugin : IApplicationPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -76,14 +70,14 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
 
         #region IApplicationPlugin Members
         // TODO: required by IPlugin, but likely not at all right
-        string m_name = "LoadBalancerPlugin";
-        string m_version = "0.0";
+        string m_name = "LoadBalancer";
+        string m_version = "0.1";
 
         public string Version { get { return m_version; } }
         public string Name { get { return m_name; } }
 
-        public void Initialise() 
-        { 
+        public void Initialise()
+        {
             m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!");
             throw new PluginNotInitialisedException (Name);
         }
diff --git a/ThirdParty/3Di/LoadBalancer/Resources/LoadBalancer.addin.xml b/ThirdParty/3Di/LoadBalancer/Resources/LoadBalancer.addin.xml
new file mode 100644
index 0000000..ac6ac15
--- /dev/null
+++ b/ThirdParty/3Di/LoadBalancer/Resources/LoadBalancer.addin.xml
@@ -0,0 +1,12 @@
+<Addin id="LoadBalancer" version="0.1">
+    <Runtime>
+        <Import assembly="OpenSim.ApplicationPlugins.LoadBalancer.dll" />
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim" version="0.5" />
+        <Addin id="RegionProxy" version="0.1" />
+    </Dependencies>
+    <Extension path="/OpenSim/Startup">
+        <Plugin id="LoadBalancer" type="OpenSim.ApplicationPlugins.LoadBalancer.LoadBalancerPlugin" />
+    </Extension>
+</Addin>
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
index 7eefcf5..e65e7e5 100644
--- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
+++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
@@ -37,9 +37,6 @@ using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 
-[assembly : Addin("RegionProxy", "0.1")]
-[assembly : AddinDependency("OpenSim", "0.5")]
-
 namespace OpenSim.ApplicationPlugins.RegionProxy
 {
     /* This module has an interface to OpenSim clients that is constant, and is responsible for relaying
@@ -60,7 +57,6 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
      * - UnblockClientMessages
      */
 
-    [Extension("/OpenSim/Startup")]
     public class RegionProxyPlugin : IApplicationPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -69,8 +65,8 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
 
         #region IApplicationPlugin Members
         // TODO: required by IPlugin, but likely not at all right
-        string m_name = "RegionProxyPlugin";
-        string m_version = "0.0";
+        string m_name = "RegionProxy";
+        string m_version = "0.1";
 
         public string Version { get { return m_version; } }
         public string Name { get { return m_name; } }
@@ -83,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
 
         public void Initialise(OpenSimBase openSim)
         {
-            m_log.Info("Starting proxy");
+            m_log.Info("[PROXY] Starting proxy");
             string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
             if (proxyURL.Length == 0) return;
 
diff --git a/ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml b/ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml
new file mode 100644
index 0000000..9fa6716
--- /dev/null
+++ b/ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml
@@ -0,0 +1,11 @@
+<Addin id="RegionProxy" version="0.1">
+    <Runtime>
+        <Import assembly="OpenSim.ApplicationPlugins.RegionProxy.dll" />
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim" version="0.5" />
+    </Dependencies>
+    <Extension path="/OpenSim/Startup">
+        <Plugin id="RegionProxy" type="OpenSim.ApplicationPlugins.RegionProxy.RegionProxyPlugin" />
+    </Extension>
+</Addin>
diff --git a/prebuild.xml b/prebuild.xml
index 4d27d48..dd4a173 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2122,6 +2122,7 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
@@ -2156,6 +2157,7 @@
       <Reference name="libsecondlife.dll"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
-- 
cgit v1.1